diff --git a/app/code/Magento/Authorizenet/Model/Source/Cctype.php b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
index 52ef75c3a3136..a6e173474ae86 100644
--- a/app/code/Magento/Authorizenet/Model/Source/Cctype.php
+++ b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
@@ -17,6 +17,6 @@ class Cctype extends PaymentCctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'OT', 'JCB', 'DN'];
+        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'DN'];
     }
 }
diff --git a/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
new file mode 100644
index 0000000000000..0af012352a2b8
--- /dev/null
+++ b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Block\Customer\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\AbstractTokenRenderer;
+
+/**
+ * Class VaultTokenRenderer
+ */
+class VaultTokenRenderer extends AbstractTokenRenderer
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config $config,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconUrl()
+    {
+        return $this->config->getPayPalIcon()['url'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconHeight()
+    {
+        return $this->config->getPayPalIcon()['height'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconWidth()
+    {
+        return $this->config->getPayPalIcon()['width'];
+    }
+
+    /**
+     * Can render specified token
+     *
+     * @param PaymentTokenInterface $token
+     * @return boolean
+     */
+    public function canRender(PaymentTokenInterface $token)
+    {
+        return $token->getPaymentMethodCode() === ConfigProvider::PAYPAL_CODE;
+    }
+
+    /**
+     * Get email of PayPal payer
+     * @return string
+     */
+    public function getPayerEmail()
+    {
+        return $this->getTokenDetails()['payerEmail'];
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
index 3119042b776e2..a03546b366045 100644
--- a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
+++ b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
@@ -166,16 +166,25 @@ private function isExpiredAuthorization(OrderPaymentInterface $payment)
      */
     private function isExistsCaptureTransaction(OrderPaymentInterface $payment)
     {
-        $filters[] = $this->filterBuilder->setField('payment_id')
-            ->setValue($payment->getId())
-            ->create();
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder
+                    ->setField('payment_id')
+                    ->setValue($payment->getId())
+                    ->create(),
+            ]
+        );
 
-        $filters[] = $this->filterBuilder->setField('txn_type')
-            ->setValue(TransactionInterface::TYPE_CAPTURE)
-            ->create();
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder
+                    ->setField('txn_type')
+                    ->setValue(TransactionInterface::TYPE_CAPTURE)
+                    ->create(),
+            ]
+        );
 
-        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)
-            ->create();
+        $searchCriteria = $this->searchCriteriaBuilder->create();
 
         $count = $this->transactionRepository->getList($searchCriteria)->getTotalCount();
         return (boolean) $count;
diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
index 4d612bf5e64f3..774b8e365368f 100644
--- a/app/code/Magento/Braintree/Gateway/Config/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/Config.php
@@ -30,6 +30,14 @@ class Config extends \Magento\Payment\Gateway\Config\Config
     const KEY_KOUNT_MERCHANT_ID = 'kount_id';
     const FRAUD_PROTECTION = 'fraudprotection';
 
+    /**
+     * Get list of available dynamic descriptors keys
+     * @var array
+     */
+    private static $dynamicDescriptorKeys = [
+        'name', 'phone', 'url'
+    ];
+
     /**
      * Return the country specific card type config
      *
@@ -170,6 +178,22 @@ public function isActive()
         return (bool) $this->getValue(self::KEY_ACTIVE);
     }
 
+    /**
+     * Get list of configured dynamic descriptors
+     * @return array
+     */
+    public function getDynamicDescriptors()
+    {
+        $values = [];
+        foreach (self::$dynamicDescriptorKeys as $key) {
+            $value = $this->getValue('descriptor_' . $key);
+            if (!empty($value)) {
+                $values[$key] = $value;
+            }
+        }
+        return $values;
+    }
+
     /**
      * Get Merchant account ID
      *
diff --git a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
index 06ff216acd49c..f94c6abfd773b 100644
--- a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Braintree\Gateway\Config\PayPal;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Payment\Model\CcConfig;
+
 /**
  * Class Config
  */
@@ -22,6 +25,26 @@ class Config extends \Magento\Payment\Gateway\Config\Config
 
     const KEY_REQUIRE_BILLING_ADDRESS = 'require_billing_address';
 
+    /**
+     * @var CcConfig
+     */
+    private $ccConfig;
+
+    /**
+     * @var array
+     */
+    private $icon = [];
+
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        CcConfig $ccConfig,
+        $methodCode = null,
+        $pathPattern = self::DEFAULT_PATH_PATTERN
+    ) {
+        parent::__construct($scopeConfig, $methodCode, $pathPattern);
+        $this->ccConfig = $ccConfig;
+    }
+
     /**
      * Get Payment configuration status
      *
@@ -79,4 +102,32 @@ public function getTitle()
     {
         return $this->getValue(self::KEY_TITLE);
     }
+
+    /**
+     * Is need to skip order review
+     * @return bool
+     */
+    public function isSkipOrderReview()
+    {
+        return (bool) $this->getValue('skip_order_review');
+    }
+
+    /**
+     * Get PayPal icon
+     * @return array
+     */
+    public function getPayPalIcon()
+    {
+        if (empty($this->icon)) {
+            $asset = $this->ccConfig->createAsset('Magento_Braintree::images/paypal.png');
+            list($width, $height) = getimagesize($asset->getSourceFile());
+            $this->icon = [
+                'url' => $asset->getUrl(),
+                'width' => $width,
+                'height' => $height
+            ];
+        }
+
+        return $this->icon;
+    }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php b/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
index c91abc49b2dd2..e5082a5df6fdd 100644
--- a/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
+++ b/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
@@ -83,7 +83,7 @@ public function readAmount(array $subject)
      */
     public function readCustomerId(array $subject)
     {
-        if (empty($subject['customer_id'])) {
+        if (!isset($subject['customer_id'])) {
             throw new \InvalidArgumentException('The "customerId" field does not exists');
         }
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
new file mode 100644
index 0000000000000..f2c5515eac712
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Braintree\Gateway\Config\Config;
+
+/**
+ * Class DescriptorDataBuilder
+ */
+class DescriptorDataBuilder implements BuilderInterface
+{
+    /**
+     * @var string
+     */
+    private static $descriptorKey = 'descriptor';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * DescriptorDataBuilder constructor.
+     * @param Config $config
+     */
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function build(array $buildSubject)
+    {
+        $values = $this->config->getDynamicDescriptors();
+        return !empty($values) ? [self::$descriptorKey => $values] : [];
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
new file mode 100644
index 0000000000000..bac5dc5fa0e0a
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request\PayPal;
+
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+
+/**
+ * Class DeviceDataBuilder
+ */
+class DeviceDataBuilder implements BuilderInterface
+{
+    /**
+     * @var string
+     */
+    private static $deviceDataKey = 'deviceData';
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * DeviceDataBuilder constructor.
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject)
+    {
+        $result = [];
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+
+        $payment = $paymentDO->getPayment();
+        $data = $payment->getAdditionalInformation();
+        if (!empty($data[DataAssignObserver::DEVICE_DATA])) {
+            $result[self::$deviceDataKey] = $data[DataAssignObserver::DEVICE_DATA];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
new file mode 100644
index 0000000000000..efffdbf5fef27
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request\PayPal;
+
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Vault\Model\Ui\VaultConfigProvider;
+
+/**
+ * Vault Data Builder
+ */
+class VaultDataBuilder implements BuilderInterface
+{
+    /**
+     * Additional options in request to gateway
+     */
+    private static $optionsKey = 'options';
+
+    /**
+     * The option that determines whether the payment method associated with
+     * the successful transaction should be stored in the Vault.
+     */
+    private static $storeInVaultOnSuccess = 'storeInVaultOnSuccess';
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * VaultDataBuilder constructor.
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject)
+    {
+        $result = [];
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+
+        $payment = $paymentDO->getPayment();
+        $data = $payment->getAdditionalInformation();
+        if (!empty($data[VaultConfigProvider::IS_ACTIVE_CODE])) {
+            $result[self::$optionsKey] = [
+                self::$storeInVaultOnSuccess => true
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/VaultDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VaultDataBuilder.php
index 728089d0cab73..3165b67cc5c49 100644
--- a/app/code/Magento/Braintree/Gateway/Request/VaultDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/VaultDataBuilder.php
@@ -18,9 +18,8 @@ class VaultDataBuilder implements BuilderInterface
     const OPTIONS = 'options';
 
     /**
-     * The option that determines whether the shipping address information
-     * provided with the transaction should be associated with the customer ID specified.
-     * When passed, the payment method will always be stored in the Vault.
+     * The option that determines whether the payment method associated with
+     * the successful transaction should be stored in the Vault.
      */
     const STORE_IN_VAULT_ON_SUCCESS = 'storeInVaultOnSuccess';
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
new file mode 100644
index 0000000000000..c43f68fc608f4
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Response\PayPal;
+
+use Braintree\Transaction;
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
+
+/**
+ * Vault Details Handler
+ */
+class VaultDetailsHandler implements HandlerInterface
+{
+    /**
+     * @var PaymentTokenInterfaceFactory
+     */
+    private $paymentTokenFactory;
+
+    /**
+     * @var OrderPaymentExtensionInterfaceFactory
+     */
+    private $paymentExtensionFactory;
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * Constructor
+     *
+     * @param PaymentTokenInterfaceFactory $paymentTokenFactory
+     * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
+     * @param SubjectReader $subjectReader
+     * @param DateTimeFactory $dateTimeFactory
+     */
+    public function __construct(
+        PaymentTokenInterfaceFactory $paymentTokenFactory,
+        OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
+        SubjectReader $subjectReader,
+        DateTimeFactory $dateTimeFactory
+    ) {
+        $this->paymentTokenFactory = $paymentTokenFactory;
+        $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->subjectReader = $subjectReader;
+        $this->dateTimeFactory = $dateTimeFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
+        $transaction = $this->subjectReader->readTransaction($response);
+        $payment = $paymentDO->getPayment();
+
+        // add vault payment token entity to extension attributes
+        $paymentToken = $this->getVaultPaymentToken($transaction);
+        if ($paymentToken !== null) {
+            $extensionAttributes = $this->getExtensionAttributes($payment);
+            $extensionAttributes->setVaultPaymentToken($paymentToken);
+        }
+    }
+
+    /**
+     * Get vault payment token entity
+     *
+     * @param \Braintree\Transaction $transaction
+     * @return PaymentTokenInterface|null
+     */
+    private function getVaultPaymentToken(Transaction $transaction)
+    {
+        // Check token existing in gateway response
+        $token = $transaction->paypalDetails->token;
+        if (empty($token)) {
+            return null;
+        }
+
+        /** @var PaymentTokenInterface $paymentToken */
+        $paymentToken = $this->paymentTokenFactory->create();
+        $paymentToken->setGatewayToken($token);
+        $paymentToken->setExpiresAt($this->getExpirationDate());
+        $details = json_encode([
+            'payerEmail' => $transaction->paypalDetails->payerEmail
+        ]);
+        $paymentToken->setTokenDetails($details);
+
+        return $paymentToken;
+    }
+
+    /**
+     * @return string
+     */
+    private function getExpirationDate()
+    {
+        $expDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $expDate->add(new \DateInterval('P1Y'));
+        return $expDate->format('Y-m-d 00:00:00');
+    }
+
+    /**
+     * Get payment extension attributes
+     * @param InfoInterface $payment
+     * @return OrderPaymentExtensionInterface
+     */
+    private function getExtensionAttributes(InfoInterface $payment)
+    {
+        $extensionAttributes = $payment->getExtensionAttributes();
+        if ($extensionAttributes === null) {
+            $extensionAttributes = $this->paymentExtensionFactory->create();
+            $payment->setExtensionAttributes($extensionAttributes);
+        }
+        return $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
index 46d415c97b7c6..6cadf252e7a3b 100644
--- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
@@ -24,6 +24,11 @@ class RiskDataHandler implements HandlerInterface
      */
     const RISK_DATA_DECISION = 'riskDataDecision';
 
+    /**
+     * Risk data Review status
+     */
+    private static $statusReview = 'Review';
+
     /**
      * @var SubjectReader
      */
@@ -62,5 +67,10 @@ public function handle(array $handlingSubject, array $response)
 
         $payment->setAdditionalInformation(self::RISK_DATA_ID, $transaction->riskData->id);
         $payment->setAdditionalInformation(self::RISK_DATA_DECISION, $transaction->riskData->decision);
+
+        // mark payment as fraud
+        if ($transaction->riskData->decision === self::$statusReview) {
+            $payment->setIsFraudDetected(true);
+        }
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
index d2add721c4bcf..346d43f3312e1 100644
--- a/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
+++ b/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
@@ -25,7 +25,8 @@ protected function getResponseValidators()
             [
                 function ($response) {
                     return [
-                        isset($response->transaction)
+                        $response instanceof Successful
+                        && isset($response->transaction)
                         && in_array(
                             $response->transaction->status,
                             [Transaction::AUTHORIZED, Transaction::SUBMITTED_FOR_SETTLEMENT, Transaction::SETTLING]
diff --git a/app/code/Magento/Braintree/Helper/Country.php b/app/code/Magento/Braintree/Helper/Country.php
index 3a3116b0d9ac0..e8660b8523b30 100644
--- a/app/code/Magento/Braintree/Helper/Country.php
+++ b/app/code/Magento/Braintree/Helper/Country.php
@@ -6,6 +6,7 @@
 namespace Magento\Braintree\Helper;
 
 use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
+use Magento\Braintree\Model\Adminhtml\System\Config\Country as CountryConfig;
 
 /**
  * Class Country
@@ -13,12 +14,12 @@
 class Country
 {
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
+     * @var CollectionFactory
      */
     private $collectionFactory;
 
     /**
-     * @var \Magento\Braintree\Model\Adminhtml\System\Config\Country
+     * @var CountryConfig
      */
     private $countryConfig;
 
@@ -28,13 +29,11 @@ class Country
     private $countries;
 
     /**
-     * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $factory
-     * @param \Magento\Braintree\Model\Adminhtml\System\Config\Country $countryConfig
+     * @param CollectionFactory $factory
+     * @param CountryConfig $countryConfig
      */
-    public function __construct(
-        \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $factory,
-        \Magento\Braintree\Model\Adminhtml\System\Config\Country $countryConfig
-    ) {
+    public function __construct(CollectionFactory $factory, CountryConfig $countryConfig)
+    {
         $this->collectionFactory = $factory;
         $this->countryConfig = $countryConfig;
     }
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
index ef6bfaccecdb6..4cfbf0f3a833f 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Braintree\Model\Paypal\Helper;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
-use Magento\Quote\Model\Quote\Payment;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Braintree\Model\Ui\ConfigProvider;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
 
 /**
  * Class QuoteUpdater
diff --git a/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php b/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
index 0abae8af89fbc..c914b21893e25 100644
--- a/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
+++ b/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
@@ -115,9 +115,13 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      */
     public function getCustomAttributes()
     {
+        $shouldBeLocalized = ['paymentInstrumentType', 'type', 'status'];
         $output = [];
         foreach ($this->getMappedValues() as $key => $value) {
             $attribute = $this->attributeValueFactory->create();
+            if(in_array($key, $shouldBeLocalized)) {
+                $value = __($value);
+            }
             $output[] = $attribute->setAttributeCode($key)->setValue($value);
         }
         return $output;
diff --git a/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php b/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
index f52f19c0ab6f0..7b177cff3af1d 100644
--- a/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
+++ b/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
@@ -6,6 +6,7 @@
 namespace Magento\Braintree\Model\Report;
 
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Report\Row\TransactionMap;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Data\Collection;
@@ -26,7 +27,7 @@ class TransactionsCollection extends Collection implements SearchResultInterface
      *
      * @var string
      */
-    protected $_itemObjectClass = 'Magento\Braintree\Model\Report\Row\TransactionMap';
+    protected $_itemObjectClass = TransactionMap::class;
 
     /**
      * @var array
diff --git a/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
new file mode 100644
index 0000000000000..fd94e18e2cd94
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Ui\Adminhtml\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
+/**
+ * Gets Ui component configuration for Braintree PayPal Vault
+ */
+class TokenUiComponentProvider implements TokenUiComponentProviderInterface
+{
+
+    /**
+     * @var TokenUiComponentInterfaceFactory
+     */
+    private $componentFactory;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param TokenUiComponentInterfaceFactory $componentFactory
+     * @param UrlInterface $urlBuilder
+     * @param Config $config
+     */
+    public function __construct(
+        TokenUiComponentInterfaceFactory $componentFactory,
+        UrlInterface $urlBuilder,
+        Config $config
+    ) {
+        $this->componentFactory = $componentFactory;
+        $this->urlBuilder = $urlBuilder;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getComponentForToken(PaymentTokenInterface $paymentToken)
+    {
+        $data = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
+        $data['icon'] = $this->config->getPayPalIcon();
+        $component = $this->componentFactory->create(
+            [
+                'config' => [
+                    'code' => PayPalConfigProvider::PAYPAL_VAULT_CODE,
+                    'nonceUrl' => $this->getNonceRetrieveUrl(),
+                    TokenUiComponentProviderInterface::COMPONENT_DETAILS => $data,
+                    TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash(),
+                    'template' => 'Magento_Braintree::form/paypal/vault.phtml'
+                ],
+                'name' => Template::class
+            ]
+        );
+
+        return $component;
+    }
+
+    /**
+     * Get url to retrieve payment method nonce
+     * @return string
+     */
+    private function getNonceRetrieveUrl()
+    {
+        return $this->urlBuilder->getUrl(ConfigProvider::CODE . '/payment/getnonce', ['_secure' => true]);
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
index 6cfc96ea23d0d..420b8365b3ea4 100644
--- a/app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
@@ -49,6 +49,7 @@ public function getComponentForToken(PaymentTokenInterface $paymentToken)
         $component = $this->componentFactory->create(
             [
                 'config' => [
+                    'code' => ConfigProvider::CC_VAULT_CODE,
                     'nonceUrl' => $this->getNonceRetrieveUrl(),
                     TokenUiComponentProviderInterface::COMPONENT_DETAILS => $data,
                     TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash(),
diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
index 3a7a773c33c46..9588c197b411a 100644
--- a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -19,25 +19,18 @@ final class ConfigProvider implements ConfigProviderInterface
 {
     const CODE = 'braintree';
 
+    /**
+     * @deprecated
+     */
     const PAYPAL_CODE = 'braintree_paypal';
 
     const CC_VAULT_CODE = 'braintree_cc_vault';
 
-    /**
-     * @var ResolverInterface
-     */
-    private $localeResolver;
-
     /**
      * @var Config
      */
     private $config;
 
-    /**
-     * @var PayPalConfig
-     */
-    private $payPalConfig;
-
     /**
      * @var BraintreeAdapter
      */
@@ -52,9 +45,10 @@ final class ConfigProvider implements ConfigProviderInterface
      * Constructor
      *
      * @param Config $config
-     * @param PayPalConfig $payPalConfig;
+     * @param PayPalConfig $payPalConfig No longer used by internal code and not recommended.
      * @param BraintreeAdapter $adapter
-     * @param ResolverInterface $localeResolver
+     * @param ResolverInterface $localeResolver No longer used by internal code and not recommended.
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Config $config,
@@ -63,9 +57,7 @@ public function __construct(
         ResolverInterface $localeResolver
     ) {
         $this->config = $config;
-        $this->payPalConfig = $payPalConfig;
         $this->adapter = $adapter;
-        $this->localeResolver = $localeResolver;
     }
 
     /**
@@ -75,7 +67,6 @@ public function __construct(
      */
     public function getConfig()
     {
-        $isPayPalActive = $this->payPalConfig->isActive();
         return [
             'payment' => [
                 self::CODE => [
@@ -90,22 +81,13 @@ public function getConfig()
                     'kountMerchantId' => $this->config->getKountMerchantId(),
                     'hasFraudProtection' => $this->config->hasFraudProtection(),
                     'merchantId' => $this->config->getMerchantId(),
-                    'ccVaultCode' => static::CC_VAULT_CODE
+                    'ccVaultCode' => self::CC_VAULT_CODE
                 ],
                 Config::CODE_3DSECURE => [
                     'enabled' => $this->config->isVerify3DSecure(),
                     'thresholdAmount' => $this->config->getThresholdAmount(),
                     'specificCountries' => $this->config->get3DSecureSpecificCountries()
                 ],
-                self::PAYPAL_CODE => [
-                    'isActive' => $isPayPalActive,
-                    'title' => $this->payPalConfig->getTitle(),
-                    'isAllowShippingAddressOverride' => $this->payPalConfig->isAllowToEditShippingAddress(),
-                    'merchantName' => $this->payPalConfig->getMerchantName(),
-                    'locale' => strtolower($this->localeResolver->getLocale()),
-                    'paymentAcceptanceMarkSrc' =>
-                        'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
-                ]
             ]
         ];
     }
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
new file mode 100644
index 0000000000000..65fb5370181db
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Ui\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Framework\Locale\ResolverInterface;
+
+/**
+ * Class ConfigProvider
+ */
+class ConfigProvider implements ConfigProviderInterface
+{
+    const PAYPAL_CODE = 'braintree_paypal';
+
+    const PAYPAL_VAULT_CODE = 'braintree_paypal_vault';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $resolver;
+
+    public function __construct(Config $config, ResolverInterface $resolver)
+    {
+        $this->config = $config;
+        $this->resolver = $resolver;
+    }
+
+    public function getConfig()
+    {
+        return [
+            'payment' => [
+                self::PAYPAL_CODE => [
+                    'isActive' => $this->config->isActive(),
+                    'title' => $this->config->getTitle(),
+                    'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
+                    'merchantName' => $this->config->getMerchantName(),
+                    'locale' => strtolower($this->resolver->getLocale()),
+                    'paymentAcceptanceMarkSrc' =>
+                        'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
+                    'vaultCode' => self::PAYPAL_VAULT_CODE,
+                    'skipOrderReview' => $this->config->isSkipOrderReview(),
+                    'paymentIcon' => $this->config->getPayPalIcon(),
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php
new file mode 100644
index 0000000000000..2f3e3db75cc34
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/TokenUiComponentProvider.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Ui\PayPal;
+
+use Magento\Braintree\Model\Ui\ConfigProvider as CommonConfigProvider;
+use Magento\Framework\UrlInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
+/**
+ * Class TokenUiComponentProvider
+ */
+class TokenUiComponentProvider implements TokenUiComponentProviderInterface
+{
+    /**
+     * @var TokenUiComponentInterfaceFactory
+     */
+    private $componentFactory;
+
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param TokenUiComponentInterfaceFactory $componentFactory
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(
+        TokenUiComponentInterfaceFactory $componentFactory,
+        UrlInterface $urlBuilder
+    ) {
+        $this->componentFactory = $componentFactory;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Get UI component for token
+     * @param PaymentTokenInterface $paymentToken
+     * @return TokenUiComponentInterface
+     */
+    public function getComponentForToken(PaymentTokenInterface $paymentToken)
+    {
+        $jsonDetails = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
+        $component = $this->componentFactory->create(
+            [
+                'config' => [
+                    'code' => ConfigProvider::PAYPAL_VAULT_CODE,
+                    'nonceUrl' => $this->getNonceRetrieveUrl(),
+                    TokenUiComponentProviderInterface::COMPONENT_DETAILS => $jsonDetails,
+                    TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash()
+                ],
+                'name' => 'Magento_Braintree/js/view/payment/method-renderer/paypal-vault'
+            ]
+        );
+
+        return $component;
+    }
+
+    /**
+     * Get url to retrieve payment method nonce
+     * @return string
+     */
+    private function getNonceRetrieveUrl()
+    {
+        return $this->urlBuilder->getUrl(CommonConfigProvider::CODE . '/payment/getnonce', ['_secure' => true]);
+    }
+}
diff --git a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
index bbf4b91ef474f..e5be5c2bab43c 100644
--- a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
+++ b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Braintree\Observer;
 
-use Magento\Framework\Event\Observer;
+use Magento\Braintree\Block\Paypal\Button;
 use Magento\Catalog\Block\ShortcutButtons;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
 /**
@@ -17,7 +18,7 @@ class AddPaypalShortcuts implements ObserverInterface
     /**
      * Block class
      */
-    const PAYPAL_SHORTCUT_BLOCK = 'Magento\Braintree\Block\Paypal\Button';
+    const PAYPAL_SHORTCUT_BLOCK = Button::class;
 
     /**
      * Add Braintree PayPal shortcut buttons
diff --git a/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php b/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
index f056ba0cefd36..e6c7ce59d0e29 100644
--- a/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
@@ -16,7 +16,6 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Model\VaultPaymentInterface;
-use OAuthTest\Mocks\Common\Service\Mock;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
index fda3e85d167c2..9665afa1f3655 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
@@ -374,7 +374,7 @@ private function buildSearchCriteria()
             ->willReturnSelf();
 
         $searchCriteria = new SearchCriteria();
-        $this->searchCriteriaBuilder->expects(static::once())
+        $this->searchCriteriaBuilder->expects(static::exactly(2))
             ->method('addFilters')
             ->willReturnSelf();
         $this->searchCriteriaBuilder->expects(static::once())
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
index 66f6c7dd78e79..e4dd13985fa9a 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
@@ -271,6 +271,68 @@ public function threeDSecureSpecificCountriesDataProvider()
         ];
     }
 
+    /**
+     * @covers \Magento\Braintree\Gateway\Config\Config::getDynamicDescriptors
+     * @param $name
+     * @param $phone
+     * @param $url
+     * @param array $expected
+     * @dataProvider descriptorsDataProvider
+     */
+    public function testGetDynamicDescriptors($name, $phone, $url, array $expected)
+    {
+        $this->scopeConfigMock->expects(static::at(0))
+            ->method('getValue')
+            ->with($this->getPath('descriptor_name'), ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($name);
+        $this->scopeConfigMock->expects(static::at(1))
+            ->method('getValue')
+            ->with($this->getPath('descriptor_phone'), ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($phone);
+        $this->scopeConfigMock->expects(static::at(2))
+            ->method('getValue')
+            ->with($this->getPath('descriptor_url'), ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($url);
+
+        $actual = $this->model->getDynamicDescriptors();
+        static::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get variations to test dynamic descriptors
+     * @return array
+     */
+    public function descriptorsDataProvider()
+    {
+        $name = 'company * product';
+        $phone = '333-22-22-333';
+        $url = 'https://test.url.mage.com';
+        return [
+            [
+                $name, $phone, $url,
+                'expected' => [
+                    'name' => $name, 'phone' => $phone, 'url' => $url
+                ]
+            ],
+            [
+                $name, null, null,
+                'expected' => [
+                    'name' => $name
+                ]
+            ],
+            [
+                null, null, $url,
+                'expected' => [
+                    'url' => $url
+                ]
+            ],
+            [
+                null, null, null,
+                'expected' => []
+            ]
+        ];
+    }
+
     /**
      * Return config path
      *
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
new file mode 100644
index 0000000000000..ffee329491795
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Request;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\Request\DescriptorDataBuilder;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class DescriptorDataBuilderTest
+ */
+class DescriptorDataBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var DescriptorDataBuilder
+     */
+    private $builder;
+
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getDynamicDescriptors'])
+            ->getMock();
+
+        $this->builder = new DescriptorDataBuilder($this->config);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\Request\DescriptorDataBuilder::build
+     * @param array $descriptors
+     * @param array $expected
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild(array $descriptors, array $expected)
+    {
+        $this->config->expects(static::once())
+            ->method('getDynamicDescriptors')
+            ->willReturn($descriptors);
+
+        $actual = $this->builder->build([]);
+        static::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get variations for build method testing
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        $name = 'company * product';
+        $phone = '333-22-22-333';
+        $url = 'https://test.url.mage.com';
+        return [
+            [
+                'descriptors' => [
+                    'name' => $name,
+                    'phone' => $phone,
+                    'url' => $url
+                ],
+                'expected' => [
+                    'descriptor' => [
+                        'name' => $name,
+                        'phone' => $phone,
+                        'url' => $url
+                    ]
+                ]
+            ],
+            [
+                'descriptors' => [
+                    'name' => $name,
+                    'phone' => $phone
+                ],
+                'expected' => [
+                    'descriptor' => [
+                        'name' => $name,
+                        'phone' => $phone
+                    ]
+                ]
+            ],
+            [
+                'descriptors' => [
+                    'name' => $name
+                ],
+                'expected' => [
+                    'descriptor' => [
+                        'name' => $name
+                    ]
+                ]
+            ],
+            [
+                'descriptors' => [],
+                'expected' => []
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
index c695ad24376b3..f1485fe192f23 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
@@ -84,7 +84,7 @@ public function testBuildReadPaymentException()
     public function testBuild()
     {
         $additionalData = [
-                DataAssignObserver::DEVICE_DATA => self::DEVICE_DATA
+            DataAssignObserver::DEVICE_DATA => self::DEVICE_DATA
         ];
 
         $expectedResult = [
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
new file mode 100644
index 0000000000000..268f1d6251109
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
+
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Payment\Model\InfoInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class DeviceDataBuilderTest
+ */
+class DeviceDataBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SubjectReader|MockObject
+     */
+    private $subjectReader;
+
+    /**
+     * @var PaymentDataObjectInterface|MockObject
+     */
+    private $paymentDataObject;
+
+    /**
+     * @var InfoInterface|MockObject
+     */
+    private $paymentInfo;
+
+    /**
+     * @var DeviceDataBuilder
+     */
+    private $builder;
+
+    protected function setUp()
+    {
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['readPayment'])
+            ->getMock();
+
+        $this->paymentDataObject = $this->getMock(PaymentDataObjectInterface::class);
+
+        $this->paymentInfo = $this->getMock(InfoInterface::class);
+        
+        $this->builder = new DeviceDataBuilder($this->subjectReader);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder::build
+     * @param array $paymentData
+     * @param array $expected
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild(array $paymentData, array $expected)
+    {
+        $subject = [
+            'payment' => $this->paymentDataObject
+        ];
+
+        $this->subjectReader->expects(static::once())
+            ->method('readPayment')
+            ->with($subject)
+            ->willReturn($this->paymentDataObject);
+
+        $this->paymentDataObject->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentInfo);
+
+        $this->paymentInfo->expects(static::once())
+            ->method('getAdditionalInformation')
+            ->willReturn($paymentData);
+
+        $actual = $this->builder->build($subject);
+        static::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get variations for build method testing
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            [
+                'paymentData' => [
+                    'device_data' => '{correlation_id: 12s3jf9as}'
+                ],
+                'expected' => [
+                    'deviceData' => '{correlation_id: 12s3jf9as}'
+                ]
+            ],
+            [
+                'paymentData' => [
+                    'device_data' => null,
+                ],
+                'expected' => []
+            ],
+            [
+                'paymentData' => [
+                    'deviceData' => '{correlation_id: 12s3jf9as}',
+                ],
+                'expected' => []
+            ],
+            [
+                'paymentData' => [],
+                'expected' => []
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
new file mode 100644
index 0000000000000..bee9ae2e06de1
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
+
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Vault\Model\Ui\VaultConfigProvider;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class VaultDataBuilderTest
+ */
+class VaultDataBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SubjectReader|MockObject
+     */
+    private $subjectReader;
+
+    /**
+     * @var PaymentDataObjectInterface|MockObject
+     */
+    private $paymentDataObject;
+
+    /**
+     * @var InfoInterface|MockObject
+     */
+    private $paymentInfo;
+
+    /**
+     * @var VaultDataBuilder
+     */
+    private $builder;
+
+    protected function setUp()
+    {
+        $this->paymentDataObject = $this->getMock(PaymentDataObjectInterface::class);
+
+        $this->paymentInfo = $this->getMock(InfoInterface::class);
+
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['readPayment'])
+            ->getMock();
+
+        $this->builder = new VaultDataBuilder($this->subjectReader);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder::build
+     * @param array $additionalInfo
+     * @param array $expected
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild(array $additionalInfo, array $expected)
+    {
+        $subject = [
+            'payment' => $this->paymentDataObject
+        ];
+
+        $this->subjectReader->expects(static::once())
+            ->method('readPayment')
+            ->with($subject)
+            ->willReturn($this->paymentDataObject);
+
+        $this->paymentDataObject->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentInfo);
+
+        $this->paymentInfo->expects(static::once())
+            ->method('getAdditionalInformation')
+            ->willReturn($additionalInfo);
+
+        $actual = $this->builder->build($subject);
+        static::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get variations to test build method
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            [
+                'additionalInfo' => [
+                    VaultConfigProvider::IS_ACTIVE_CODE => true
+                ],
+                'expected' => [
+                    'options' => [
+                        'storeInVaultOnSuccess' => true
+                    ]
+                ]
+            ],
+            [
+                'additionalInfo' => [
+                    VaultConfigProvider::IS_ACTIVE_CODE => false
+                ],
+                'expected' => []
+            ],
+            [
+                'additionalInfo' => [],
+                'expected' => []
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
index b5df7f312ec61..165bc94aa6842 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
@@ -5,14 +5,12 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder;
-use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtension;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Vault\Model\PaymentToken;
-use Magento\Sales\Api\Data\OrderPaymentExtension;
 
 class VaultCaptureDataBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -82,7 +80,7 @@ public function testBuild()
         $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
             ->setMethods(['getVaultPaymentToken'])
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
 
         $paymentToken = $this->getMockBuilder(PaymentToken::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
new file mode 100644
index 0000000000000..be2239151a2db
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Response\PayPal;
+
+use Braintree\Transaction;
+use Braintree\Transaction\PayPalDetails;
+use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+use Magento\Vault\Model\PaymentToken;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class VaultDetailsHandlerTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class VaultDetailsHandlerTest extends \PHPUnit_Framework_TestCase
+{
+    private static $transactionId = '1n2suy';
+
+    /**
+     * @var SubjectReader|MockObject
+     */
+    private $subjectReader;
+
+    /**
+     * @var PaymentDataObjectInterface|MockObject
+     */
+    private $paymentDataObject;
+
+    /**
+     * @var Payment|MockObject
+     */
+    private $paymentInfo;
+
+    /**
+     * @var AccountPaymentTokenFactory|MockObject
+     */
+    private $paymentTokenFactory;
+
+    /**
+     * @var PaymentTokenInterface|MockObject
+     */
+    protected $paymentToken;
+
+    /**
+     * @var OrderPaymentExtension|MockObject
+     */
+    private $paymentExtension;
+
+    /**
+     * @var OrderPaymentExtensionInterfaceFactory|MockObject
+     */
+    private $paymentExtensionFactory;
+
+    /**
+     * @var VaultDetailsHandler
+     */
+    private $handler;
+
+    /**
+     * @var DateTimeFactory|MockObject
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var array
+     */
+    private $subject = [];
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->paymentDataObject = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);
+
+        $this->paymentInfo = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['__wakeup'])
+            ->getMock();
+
+        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+
+        $this->paymentTokenFactory = $this->getMockBuilder(AccountPaymentTokenFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
+            ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->subject = [
+            'payment' => $this->paymentDataObject,
+        ];
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['readPayment', 'readTransaction'])
+            ->getMock();
+        $this->subjectReader->expects(static::once())
+            ->method('readPayment')
+            ->with($this->subject)
+            ->willReturn($this->paymentDataObject);
+
+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        
+        $this->handler = new VaultDetailsHandler(
+            $this->paymentTokenFactory,
+            $this->paymentExtensionFactory,
+            $this->subjectReader,
+            $this->dateTimeFactory
+        );
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle
+     */
+    public function testHandle()
+    {
+        /** @var Transaction $transaction */
+        $transaction = $this->getTransaction();
+        $response = [
+            'object' => $transaction
+        ];
+
+        $this->paymentExtension->expects(static::once())
+            ->method('setVaultPaymentToken')
+            ->with($this->paymentToken);
+        $this->paymentExtension->expects(static::once())
+            ->method('getVaultPaymentToken')
+            ->willReturn($this->paymentToken);
+
+        $this->subjectReader->expects(static::once())
+            ->method('readTransaction')
+            ->with($response)
+            ->willReturn($transaction);
+        
+        $this->paymentDataObject->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentInfo);
+
+        $this->paymentTokenFactory->expects(static::once())
+            ->method('create')
+            ->willReturn($this->paymentToken);
+
+        $this->paymentExtensionFactory->expects(static::once())
+            ->method('create')
+            ->willReturn($this->paymentExtension);
+
+        $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
+        $expirationDate = '2017-07-05 00:00:00';
+        $this->dateTimeFactory->expects(static::once())
+            ->method('create')
+            ->willReturn($dateTime);
+        
+        $this->handler->handle($this->subject, $response);
+
+        $extensionAttributes = $this->paymentInfo->getExtensionAttributes();
+        /** @var PaymentTokenInterface $paymentToken */
+        $paymentToken = $extensionAttributes->getVaultPaymentToken();
+        static::assertNotNull($paymentToken);
+
+        $tokenDetails = json_decode($paymentToken->getTokenDetails(), true);
+
+        static::assertSame($this->paymentToken, $paymentToken);
+        static::assertEquals($transaction->paypalDetails->token, $paymentToken->getGatewayToken());
+        static::assertEquals($transaction->paypalDetails->payerEmail, $tokenDetails['payerEmail']);
+        static::assertEquals($expirationDate, $paymentToken->getExpiresAt());
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle
+     */
+    public function testHandleWithoutToken()
+    {
+        $transaction = $this->getTransaction();
+        $transaction->paypalDetails->token = null;
+
+        $response = [
+            'object' => $transaction
+        ];
+
+        $this->subjectReader->expects(static::once())
+            ->method('readTransaction')
+            ->with($response)
+            ->willReturn($transaction);
+
+        $this->paymentDataObject->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentInfo);
+
+        $this->paymentTokenFactory->expects(static::never())
+            ->method('create');
+
+        $this->dateTimeFactory->expects(static::never())
+            ->method('create');
+
+        $this->handler->handle($this->subject, $response);
+        static::assertNull($this->paymentInfo->getExtensionAttributes());
+    }
+
+    /**
+     * Create Braintree transaction
+     * @return Transaction
+     */
+    private function getTransaction()
+    {
+        $attributes = [
+            'id' => self::$transactionId,
+            'paypalDetails' => $this->getPayPalDetails()
+        ];
+
+        $transaction = Transaction::factory($attributes);
+
+        return $transaction;
+    }
+
+    /**
+     * Get PayPal transaction details
+     * @return PayPalDetails
+     */
+    private function getPayPalDetails()
+    {
+        $attributes = [
+            'token' => 'rc39al',
+            'payerEmail' => 'john.doe@example.com'
+        ];
+
+        $details = new PayPalDetails($attributes);
+
+        return $details;
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
index 239524e04c0e0..2baf3356a0008 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Braintree\RiskData;
 use Braintree\Transaction;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Response\RiskDataHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Model\Order\Payment;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class RiskDataHandlerTest
@@ -25,99 +25,95 @@ class RiskDataHandlerTest extends \PHPUnit_Framework_TestCase
     private $riskDataHandler;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
-    private $subjectReaderMock;
+    private $subjectReader;
 
     /**
      * Set up
      */
     protected function setUp()
     {
-        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
+            ->setMethods(['readPayment', 'readTransaction'])
             ->getMock();
 
-        $this->riskDataHandler = new RiskDataHandler($this->subjectReaderMock);
+        $this->riskDataHandler = new RiskDataHandler($this->subjectReader);
     }
 
     /**
-     * Run test for handle method
+     * Test for handle method
+     * @covers \Magento\Braintree\Gateway\Response\RiskDataHandler::handle
+     * @param string $riskDecision
+     * @param boolean $isFraud
+     * @dataProvider riskDataProvider
      */
-    public function testHandle()
+    public function testHandle($riskDecision, $isFraud)
     {
-        $paymentData = $this->getPaymentDataObjectMock();
-        $transaction = $this->getBraintreeTransactionMock();
+        /** @var Payment|MockObject $payment */
+        $payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setAdditionalInformation', 'setIsFraudDetected'])
+            ->getMock();
+        /** @var PaymentDataObjectInterface|MockObject $paymentDO */
+        $paymentDO = $this->getMock(PaymentDataObjectInterface::class);
+        $paymentDO->expects(self::once())
+            ->method('getPayment')
+            ->willReturn($payment);
+
+        $transaction = Transaction::factory([
+            'riskData' => [
+                'id' => 'test-id',
+                'decision' => $riskDecision
+            ]
+        ]);
 
         $response = [
             'object' => $transaction
         ];
         $handlingSubject = [
-            'payment' =>$paymentData,
+            'payment' => $paymentDO,
         ];
 
-        $this->subjectReaderMock->expects(self::once())
+        $this->subjectReader->expects(static::once())
             ->method('readPayment')
             ->with($handlingSubject)
-            ->willReturn($paymentData);
-        $this->subjectReaderMock->expects(self::once())
+            ->willReturn($paymentDO);
+        $this->subjectReader->expects(static::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
 
-        $this->riskDataHandler->handle($handlingSubject, $response);
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getBraintreeTransactionMock()
-    {
-        $transaction = \Braintree\Transaction::factory([]);
-        $transaction->_set(
-            'riskData',
-            RiskData::factory(
-                [
-                    'id' => 'test-id',
-                    'decision' => 'test-decision',
-                ]
-            )
-        );
-
-        return $transaction;
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getPaymentDataObjectMock()
-    {
-        $mock = $this->getMockBuilder(PaymentDataObjectInterface::class)
-            ->getMockForAbstractClass();
+        $payment->expects(static::at(0))
+            ->method('setAdditionalInformation')
+            ->with(RiskDataHandler::RISK_DATA_ID, 'test-id');
+        $payment->expects(static::at(1))
+            ->method('setAdditionalInformation')
+            ->with(RiskDataHandler::RISK_DATA_DECISION, $riskDecision);
 
-        $mock->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($this->getPaymentMock());
+        if (!$isFraud) {
+            $payment->expects(static::never())
+                ->method('setIsFraudDetected');
+        } else {
+            $payment->expects(static::once())
+                ->method('setIsFraudDetected')
+                ->with(true);
+        }
 
-        return $mock;
+        $this->riskDataHandler->handle($handlingSubject, $response);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Get list of variations to test fraud
+     * @return array
      */
-    private function getPaymentMock()
+    public function riskDataProvider()
     {
-        $paymentMock = $this->getMockBuilder(Payment::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $paymentMock->expects(self::at(0))
-            ->method('setAdditionalInformation')
-            ->with(RiskDataHandler::RISK_DATA_ID, 'test-id');
-        $paymentMock->expects(self::at(1))
-            ->method('setAdditionalInformation')
-            ->with(RiskDataHandler::RISK_DATA_DECISION, 'test-decision');
-
-        return $paymentMock;
+        return [
+            ['decision' => 'Not Evaluated', 'isFraud' => false],
+            ['decision' => 'Approve', 'isFraud' => false],
+            ['decision' => 'Review', 'isFraud' => true],
+        ];
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
index 57b625a4488ce..4f641bbb56765 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -7,18 +7,18 @@
 
 use Braintree\Transaction;
 use Braintree\Transaction\CreditCardDetails;
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Response\VaultDetailsHandler;
 use Magento\Framework\DataObject;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
-use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Vault\Model\CreditCardTokenFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Braintree\Gateway\Config\Config;
 
 /**
  * VaultDetailsHandler Test
@@ -40,7 +40,7 @@ class VaultDetailsHandlerTest extends \PHPUnit_Framework_TestCase
     private $payment;
 
     /**
-     * @var \Magento\Vault\Api\Data\PaymentTokenInterfaceFactory|MockObject
+     * @var CreditCardTokenFactory|MockObject
      */
     private $paymentTokenFactory;
 
@@ -72,7 +72,7 @@ class VaultDetailsHandlerTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->paymentToken = $this->getMock(PaymentTokenInterface::class);
-        $this->paymentTokenFactory = $this->getMockBuilder(PaymentTokenInterfaceFactory::class)
+        $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
index 469cfea9c5fbb..8f57cd0e6f575 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
@@ -37,7 +37,7 @@ class GeneralResponseValidatorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->resultInterfaceFactoryMock = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Validator\ResultInterfaceFactory'
+            \Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class
         )->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
index 68fddf24bfd7d..c486783be6bca 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
@@ -11,6 +11,9 @@
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 use Magento\Braintree\Gateway\Validator\ResponseValidator;
 use Magento\Braintree\Gateway\Helper\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Braintree\Result\Error;
+use Braintree\Result\Successful;
 
 /**
  * Class ResponseValidatorTest
@@ -23,14 +26,14 @@ class ResponseValidatorTest extends \PHPUnit_Framework_TestCase
     private $responseValidator;
 
     /**
-     * @var ResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterfaceFactory|MockObject
      */
-    private $resultInterfaceFactoryMock;
+    private $resultInterfaceFactory;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
-    private $subjectReaderMock;
+    private $subjectReader;
 
     /**
      * Set up
@@ -39,18 +42,17 @@ class ResponseValidatorTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->resultInterfaceFactoryMock = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Validator\ResultInterfaceFactory'
-        )->disableOriginalConstructor()
+        $this->resultInterfaceFactory = $this->getMockBuilder(ResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->responseValidator = new ResponseValidator(
-            $this->resultInterfaceFactoryMock,
-            $this->subjectReaderMock
+            $this->resultInterfaceFactory,
+            $this->subjectReader
         );
     }
 
@@ -63,7 +65,7 @@ public function testValidateReadResponseException()
             'response' => null
         ];
 
-        $this->subjectReaderMock->expects(self::once())
+        $this->subjectReader->expects(self::once())
             ->method('readResponseObject')
             ->with($validationSubject)
             ->willThrowException(new \InvalidArgumentException());
@@ -80,7 +82,7 @@ public function testValidateReadResponseObjectException()
             'response' => ['object' => null]
         ];
 
-        $this->subjectReaderMock->expects(self::once())
+        $this->subjectReader->expects(self::once())
             ->method('readResponseObject')
             ->with($validationSubject)
             ->willThrowException(new \InvalidArgumentException());
@@ -100,25 +102,25 @@ public function testValidateReadResponseObjectException()
      */
     public function testValidate(array $validationSubject, $isValid, $messages)
     {
-        /** @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject $resultMock */
-        $resultMock = $this->getMock(ResultInterface::class);
+        /** @var ResultInterface|MockObject $result */
+        $result = $this->getMock(ResultInterface::class);
 
-        $this->subjectReaderMock->expects(self::once())
+        $this->subjectReader->expects(self::once())
             ->method('readResponseObject')
             ->with($validationSubject)
             ->willReturn($validationSubject['response']['object']);
 
-        $this->resultInterfaceFactoryMock->expects(self::once())
+        $this->resultInterfaceFactory->expects(self::once())
             ->method('create')
             ->with([
                 'isValid' => $isValid,
                 'failsDescription' => $messages
             ])
-            ->willReturn($resultMock);
+            ->willReturn($result);
 
-        $actualMock = $this->responseValidator->validate($validationSubject);
+        $actual = $this->responseValidator->validate($validationSubject);
 
-        self::assertEquals($resultMock, $actualMock);
+        self::assertEquals($result, $actual);
     }
 
     /**
@@ -126,19 +128,21 @@ public function testValidate(array $validationSubject, $isValid, $messages)
      */
     public function dataProviderTestValidate()
     {
-        $successTrue = new \stdClass();
+        $successTrue = new Successful();
         $successTrue->success = true;
         $successTrue->transaction = new \stdClass();
         $successTrue->transaction->status = Transaction::AUTHORIZED;
 
-        $successFalse = new \stdClass();
+        $successFalse = new Successful();
         $successFalse->success = false;
 
-        $transactionDeclined = new \stdClass();
+        $transactionDeclined = new Successful();
         $transactionDeclined->success = true;
         $transactionDeclined->transaction = new \stdClass();
         $transactionDeclined->transaction->status = Transaction::SETTLEMENT_DECLINED;
 
+        $errorResult = new Error(['errors' => []]);
+
         return [
             [
                 'validationSubject' => [
@@ -171,6 +175,18 @@ public function dataProviderTestValidate()
                 [
                     __('Wrong transaction status')
                 ]
+            ],
+            [
+                'validationSubject' => [
+                    'response' => [
+                        'object' => $errorResult,
+                    ]
+                ],
+                'isValid' => false,
+                [
+                    __('Braintree error response.'),
+                    __('Wrong transaction status')
+                ]
             ]
         ];
     }
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index 32767d469f199..c2413517fe06f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
index c44a67b2c61d9..34c607c88784d 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
@@ -11,6 +11,8 @@
 use Magento\Braintree\Model\Report\Row\TransactionMap;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Phrase;
+use Magento\Framework\Phrase\RendererInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -30,6 +32,16 @@ class TransactionMapTest extends \PHPUnit_Framework_TestCase
      */
     private $attributeValueFactoryMock;
 
+    /**
+     * @var RendererInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $defaultRenderer;
+
+    /**
+     * @var RendererInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $rendererMock;
+
     /**
      * Setup
      */
@@ -39,6 +51,9 @@ protected function setUp()
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->defaultRenderer = Phrase::getRenderer();
+        $this->rendererMock = $this->getMockBuilder(RendererInterface::class)
+            ->getMock();
     }
 
     /**
@@ -65,6 +80,8 @@ public function testGetCustomAttributes($transaction)
             $this->transactionStub
         );
 
+        Phrase::setRenderer($this->rendererMock);
+
         /** @var AttributeValue[] $result */
         $result = $map->getCustomAttributes();
 
@@ -77,6 +94,31 @@ public function testGetCustomAttributes($transaction)
             $result[6]->getValue()
         );
         $this->assertEquals(implode(', ', $transaction['refundIds']), $result[11]->getValue());
+        $this->assertEquals($transaction['merchantAccountId'], $result[1]->getValue());
+        $this->assertEquals($transaction['orderId'], $result[2]->getValue());
+        $this->assertEquals($transaction['amount'], $result[7]->getValue());
+        $this->assertEquals($transaction['processorSettlementResponseCode'], $result[8]->getValue());
+        $this->assertEquals($transaction['processorSettlementResponseText'], $result[10]->getValue());
+        $this->assertEquals($transaction['settlementBatchId'], $result[12]->getValue());
+        $this->assertEquals($transaction['currencyIsoCode'], $result[13]->getValue());
+
+        $this->rendererMock->expects($this->at(0))
+            ->method('render')
+            ->with([$transaction['paymentInstrumentType']])
+            ->willReturn('Credit card');
+        $this->assertEquals('Credit card', $result[3]->getValue()->render());
+
+        $this->rendererMock->expects($this->at(0))
+            ->method('render')
+            ->with([$transaction['type']])
+            ->willReturn('Sale');
+        $this->assertEquals('Sale', $result[5]->getValue()->render());
+
+        $this->rendererMock->expects($this->at(0))
+            ->method('render')
+            ->with([$transaction['status']])
+            ->willReturn('Pending for settlement');
+        $this->assertEquals('Pending for settlement', $result[9]->getValue()->render());
     }
 
     /**
@@ -90,9 +132,27 @@ public function getConfigDataProvider()
                     'id' => 1,
                     'createdAt' => new \DateTime(),
                     'paypalDetails' => new PayPalDetails(['paymentId' => 10]),
-                    'refundIds' => [1, 2, 3, 4, 5]
+                    'refundIds' => [1, 2, 3, 4, 5],
+                    'merchantAccountId' => 'MerchantId',
+                    'orderId' => 1,
+                    'paymentInstrumentType' => 'credit_card',
+                    'type' => 'sale',
+                    'amount' => '$19.99',
+                    'processorSettlementResponseCode' => 1,
+                    'status' => 'pending_for_settlement',
+                    'processorSettlementResponseText' => 'sample text',
+                    'settlementBatchId' => 2,
+                    'currencyIsoCode' => 'USD'
                 ]
             ]
         ];
     }
+
+    /**
+     * @return void
+     */
+    protected function tearDown()
+    {
+        Phrase::setRenderer($this->defaultRenderer);
+    }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
index 50488df2600c6..6024141280a02 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
@@ -184,4 +184,42 @@ public function testGetItemsWithNullLimit()
         $this->assertEquals(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT, count($items));
         $this->assertInstanceOf(DocumentInterface::class, $items[1]);
     }
+
+    /**
+     * Add fields to filter
+     * 
+     * @dataProvider addToFilterDataProvider
+     */
+    public function testAddToFilter($field, $condition, $filterMapperCall, $expectedCondition)
+    {
+        $this->filterMapperMock->expects(static::exactly($filterMapperCall))
+            ->method('getFilter')
+            ->with($field, $expectedCondition)
+            ->willReturn(new BraintreeSearchNodeStub());
+
+        $collection = new TransactionsCollection(
+            $this->entityFactoryMock,
+            $this->braintreeAdapterMock,
+            $this->filterMapperMock
+        );
+
+        static::assertInstanceOf(
+            TransactionsCollection::class,
+            $collection->addFieldToFilter($field, $condition)
+        );
+    }
+
+    /**
+     * addToFilter DataProvider
+     * 
+     * @return array
+     */
+    public function addToFilterDataProvider()
+    {
+        return [
+            ['orderId', ['like' => 1], 1, ['like' => 1]],
+            ['type', 'sale', 1, ['eq' => 'sale']],
+            [['type', 'orderId'], [], 0, []],
+        ];
+    }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
new file mode 100644
index 0000000000000..bdc39cbc5b868
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Model\Ui\Adminhtml\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\Adminhtml\PayPal\TokenUiComponentProvider;
+use Magento\Framework\UrlInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Contains methods to test PayPal token Ui component provider
+ */
+class TokenUiComponentProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var TokenUiComponentInterfaceFactory|MockObject
+     */
+    private $componentFactory;
+
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $urlBuilder;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var TokenUiComponentProvider
+     */
+    private $tokenUiComponentProvider;
+
+    protected function setUp()
+    {
+        $this->componentFactory = $this->getMockBuilder(TokenUiComponentInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->urlBuilder = $this->getMock(UrlInterface::class);
+
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPayPalIcon'])
+            ->getMock();
+
+        $this->tokenUiComponentProvider = new TokenUiComponentProvider(
+            $this->componentFactory,
+            $this->urlBuilder,
+            $this->config
+        );
+    }
+
+    /**
+     * @covers \Magento\Braintree\Model\Ui\Adminhtml\PayPal\TokenUiComponentProvider::getComponentForToken
+     */
+    public function testGetComponentForToken()
+    {
+        $nonceUrl = 'https://payment/adminhtml/nonce/url';
+        $payerEmail = 'john.doe@test.com';
+        $icon = [
+            'url' => 'https://payment/adminhtml/icon.png',
+            'width' => 48,
+            'height' => 32
+        ];
+
+        $expected = [
+            'code' => 'vault',
+            'nonceUrl' => $nonceUrl,
+            'details' => [
+                'payerEmail' => $payerEmail,
+                'icon' => $icon
+            ],
+            'template' => 'vault.phtml'
+        ];
+
+        $this->config->expects(static::once())
+            ->method('getPayPalIcon')
+            ->willReturn($icon);
+
+        $paymentToken = $this->getMock(PaymentTokenInterface::class);
+        $paymentToken->expects(static::once())
+            ->method('getTokenDetails')
+            ->willReturn('{"payerEmail":" ' . $payerEmail . '"}');
+        $paymentToken->expects(static::once())
+            ->method('getPublicHash')
+            ->willReturn('cmk32dl21l');
+
+        $this->urlBuilder->expects(static::once())
+            ->method('getUrl')
+            ->willReturn($nonceUrl);
+
+        $tokenComponent = $this->getMock(TokenUiComponentInterface::class);
+        $tokenComponent->expects(static::once())
+            ->method('getConfig')
+            ->willReturn($expected);
+
+        $this->componentFactory->expects(static::once())
+            ->method('create')
+            ->willReturn($tokenComponent);
+
+        $component = $this->tokenUiComponentProvider->getComponentForToken($paymentToken);
+        static::assertEquals($tokenComponent, $component);
+        static::assertEquals($expected, $component->getConfig());
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
index d1665c71804cf..f159136cf4c46 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
@@ -7,10 +7,10 @@
 
 use Magento\Braintree\Model\Ui\Adminhtml\TokenUiComponentProvider;
 use Magento\Framework\UrlInterface;
-use Magento\Framework\View\Element\Template;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class TokenUiComponentProviderTest
@@ -19,12 +19,12 @@ class TokenUiComponentProviderTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var TokenUiComponentInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var TokenUiComponentInterfaceFactory|MockObject
      */
     private $componentFactory;
 
     /**
-     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var UrlInterface|MockObject
      */
     private $urlBuilder;
 
@@ -59,6 +59,7 @@ public function testGetComponentForToken()
         $expirationDate = '12/2015';
 
         $expected = [
+            'code' => 'vault',
             'nonceUrl' => $nonceUrl,
             'details' => [
                 'type' => $type,
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
index 0195c8bd7a883..bc142aa41f722 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
@@ -8,6 +8,7 @@
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
 use Magento\Braintree\Model\Ui\ConfigProvider;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\Braintree\Gateway\Config\PayPal\Config as PayPalConfig;
 use Magento\Framework\Locale\ResolverInterface;
 
@@ -23,25 +24,15 @@ class ConfigProviderTest extends \PHPUnit_Framework_TestCase
     const MERCHANT_ACCOUNT_ID = '245345';
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $config;
 
     /**
-     * @var PayPalConfig|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $payPalConfig;
-
-    /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
     private $braintreeAdapter;
 
-    /**
-     * @var ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $localeResolver;
-
     /**
      * @var ConfigProvider
      */
@@ -53,7 +44,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->payPalConfig = $this->getMockBuilder(PayPalConfig::class)
+        $payPalConfig = $this->getMockBuilder(PayPalConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -61,13 +52,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
 
         $this->configProvider = new ConfigProvider(
             $this->config,
-            $this->payPalConfig,
+            $payPalConfig,
             $this->braintreeAdapter,
-            $this->localeResolver
+            $localeResolver
         );
     }
 
@@ -90,26 +81,6 @@ public function testGetConfig($config, $expected)
                 ->willReturn($value);
         }
 
-        $this->payPalConfig->expects(static::once())
-            ->method('isActive')
-            ->willReturn(true);
-
-        $this->payPalConfig->expects(static::once())
-            ->method('isAllowToEditShippingAddress')
-            ->willReturn(true);
-
-        $this->payPalConfig->expects(static::once())
-            ->method('getMerchantName')
-            ->willReturn('Test');
-
-        $this->payPalConfig->expects(static::once())
-            ->method('getTitle')
-            ->willReturn('Payment Title');
-
-        $this->localeResolver->expects(static::once())
-            ->method('getLocale')
-            ->willReturn('en_US');
-
         static::assertEquals($expected, $this->configProvider->getConfig());
     }
 
@@ -179,15 +150,6 @@ public function getConfigDataProvider()
                             'enabled' => true,
                             'thresholdAmount' => 20,
                             'specificCountries' => ['GB', 'US', 'CA']
-                        ],
-                        ConfigProvider::PAYPAL_CODE => [
-                            'isActive' => true,
-                            'title' => 'Payment Title',
-                            'isAllowShippingAddressOverride' => true,
-                            'merchantName' => 'Test',
-                            'locale' => 'en_us',
-                            'paymentAcceptanceMarkSrc' =>
-                                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
                         ]
                     ]
                 ]
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
new file mode 100644
index 0000000000000..8859425eb0def
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Model\Ui\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Framework\Locale\ResolverInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class ConfigProviderTest
+ *
+ * Test for class \Magento\Braintree\Model\Ui\PayPal\ConfigProvider
+ */
+class ConfigProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var ResolverInterface|MockObject
+     */
+    private $localeResolver;
+
+    /**
+     * @var ConfigProvider
+     */
+    private $configProvider;
+
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+
+        $this->configProvider = new ConfigProvider(
+            $this->config,
+            $this->localeResolver
+        );
+    }
+
+    /**
+     * Run test getConfig method
+     *
+     * @param array $config
+     * @dataProvider getConfigDataProvider
+     */
+    public function testGetConfig($expected)
+    {
+        $this->config->expects(static::once())
+            ->method('isActive')
+            ->willReturn(true);
+
+        $this->config->expects(static::once())
+            ->method('isAllowToEditShippingAddress')
+            ->willReturn(true);
+
+        $this->config->expects(static::once())
+            ->method('getMerchantName')
+            ->willReturn('Test');
+
+        $this->config->expects(static::once())
+            ->method('getTitle')
+            ->willReturn('Payment Title');
+
+        $this->localeResolver->expects(static::once())
+            ->method('getLocale')
+            ->willReturn('en_US');
+
+        $this->config->expects(static::once())
+            ->method('isSkipOrderReview')
+            ->willReturn(false);
+
+        $this->config->expects(static::once())
+            ->method('getPayPalIcon')
+            ->willReturn([
+                'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
+            ]);
+
+        static::assertEquals($expected, $this->configProvider->getConfig());
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfigDataProvider()
+    {
+        return [
+            [
+                'expected' => [
+                    'payment' => [
+                        ConfigProvider::PAYPAL_CODE => [
+                            'isActive' => true,
+                            'title' => 'Payment Title',
+                            'isAllowShippingAddressOverride' => true,
+                            'merchantName' => 'Test',
+                            'locale' => 'en_us',
+                            'paymentAcceptanceMarkSrc' =>
+                                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
+                            'vaultCode' => ConfigProvider::PAYPAL_VAULT_CODE,
+                            'skipOrderReview' => false,
+                            'paymentIcon' => [
+                                'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php
new file mode 100644
index 0000000000000..d0368a22ef960
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Model\Ui\PayPal;
+
+use Magento\Braintree\Model\Ui\PayPal\TokenUiComponentProvider;
+use Magento\Framework\UrlInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use Magento\Vault\Model\Ui\TokenUiComponentInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class TokenUiComponentProviderTest
+ */
+class TokenUiComponentProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $urlBuilder;
+
+    /**
+     * @var PaymentTokenInterface|MockObject
+     */
+    private $paymentToken;
+
+    /**
+     * @var TokenUiComponentInterface|MockObject
+     */
+    private $tokenComponent;
+
+    /**
+     * @var TokenUiComponentInterfaceFactory|MockObject
+     */
+    private $componentFactory;
+
+    /**
+     * @var TokenUiComponentProvider
+     */
+    private $componentProvider;
+
+    protected function setUp()
+    {
+        $this->componentFactory = $this->getMockBuilder(TokenUiComponentInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->tokenComponent = $this->getMockForAbstractClass(TokenUiComponentInterface::class);
+
+        $this->urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
+        
+        $this->paymentToken = $this->getMockForAbstractClass(PaymentTokenInterface::class);
+
+        $this->componentProvider = new TokenUiComponentProvider(
+            $this->componentFactory,
+            $this->urlBuilder
+        );
+    }
+
+    /**
+     * @covers \Magento\Braintree\Model\Ui\PayPal\TokenUiComponentProvider::getComponentForToken
+     */
+    public function testGetComponentForToken()
+    {
+        $tokenDetails = [
+            'payerEmail' => 'john.doe@example.com'
+        ];
+        $hash = '4g1mn4ew0vj23n2jf';
+
+        $this->paymentToken->expects(static::once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($tokenDetails));
+
+        $this->componentFactory->expects(static::once())
+            ->method('create')
+            ->willReturn($this->tokenComponent);
+        
+        $this->paymentToken->expects(static::once())
+            ->method('getPublicHash')
+            ->willReturn($hash);
+        
+        $this->urlBuilder->expects(static::once())
+            ->method('getUrl');
+
+        $actual = $this->componentProvider->getComponentForToken($this->paymentToken);
+        static::assertEquals($this->tokenComponent, $actual);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
new file mode 100644
index 0000000000000..b81dbe2fb036f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Ui\Component\Report\Filters\Type;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Braintree\Ui\Component\Report\Filters\Type\DateRange;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Element\DataType\Date as FormDate;
+
+/**
+ * Class DateRangeTest
+ */
+class DateRangeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterBuilderMock;
+
+    /**
+     * @var FilterModifier|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterModifierMock;
+
+
+    /**
+     * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataProviderMock;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMockForAbstractClass(ContextInterface::class);
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects(static::any())
+            ->method('getProcessor')
+            ->willReturn($processor);
+        $this->uiComponentFactory = $this->getMockBuilder(UiComponentFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filterBuilderMock = $this->getMockBuilder(FilterBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterModifierMock = $this->getMockBuilder(FilterModifier::class)
+            ->setMethods(['applyFilterModifier'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        $this->dataProviderMock = $this->getMockForAbstractClass(DataProviderInterface::class);
+    }
+
+    /**
+     * Run test prepare method
+     *
+     * @param string $name
+     * @param array $filterData
+     * @param array|null $expectedCondition
+     * @dataProvider getPrepareDataProvider
+     * @return void
+     */
+    public function testPrepare($name, $filterData, $expectedCondition)
+    {
+        /** @var FormDate PHPUnit_Framework_MockObject_MockObject|$uiComponent */
+        $uiComponent = $this->getMockBuilder(FormDate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $uiComponent->expects($this->any())
+            ->method('getContext')
+            ->willReturn($this->contextMock);
+
+        $this->contextMock->expects($this->any())
+            ->method('getNamespace')
+            ->willReturn(DateRange::NAME);
+        $this->contextMock->expects($this->any())
+            ->method('addComponentDefinition')
+            ->with(DateRange::NAME, ['extends' => DateRange::NAME]);
+
+        $this->contextMock->expects($this->any())
+            ->method('getFiltersParams')
+            ->willReturn($filterData);
+        
+        $this->contextMock->expects($this->any())
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+
+        if ($expectedCondition !== null) {
+            if (is_string($filterData[$name])) {
+                $uiComponent->expects(static::once())
+                    ->method('convertDate')
+                    ->with($filterData[$name])
+                    ->willReturn(new \DateTime($filterData[$name], new \DateTimeZone('UTC')));
+            } else {
+                $uiComponent->method('convertDate')
+                    ->willReturnMap([
+                        [
+                            $filterData[$name]['from'], 0, 0, 0,
+                            new \DateTime($filterData[$name]['from'], new \DateTimeZone('UTC'))
+                        ],
+                        [
+                            $filterData[$name]['to'], 23, 59, 59,
+                            new \DateTime($filterData[$name]['to'] . ' 23:59:00', new \DateTimeZone('UTC'))
+                        ],
+                    ]);
+            }
+
+            $i=0;
+            switch (true) {
+                case is_string($filterData[$name]):
+                case isset($filterData[$name]['from']) && !isset($filterData[$name]['to']):
+                case !isset($filterData[$name]['from']) && isset($filterData[$name]['to']):
+                    $filterMock = $this->getFilterMock(
+                        $name,
+                        $expectedCondition['type'],
+                        $expectedCondition['date'],
+                        $i
+                    );
+                    $this->dataProviderMock->expects(static::once())
+                        ->method('addFilter')
+                        ->with($filterMock);
+                    break;
+                case isset($filterData[$name]['from']) && isset($filterData[$name]['to']):
+                    $this->getFilterMock(
+                        $name,
+                        $expectedCondition['type_from'],
+                        $expectedCondition['date_from'],
+                        $i
+                    );
+                    $filterMock = $this->getFilterMock(
+                        $name,
+                        $expectedCondition['type_to'],
+                        $expectedCondition['date_to'],
+                        $i
+                    );
+                    $this->dataProviderMock->expects(static::exactly(2))
+                        ->method('addFilter')
+                        ->with($filterMock);
+                    break;
+            }
+        }
+
+        $this->uiComponentFactory->expects($this->any())
+            ->method('create')
+            ->with($name, DateRange::COMPONENT, ['context' => $this->contextMock])
+            ->willReturn($uiComponent);
+
+        $date = new DateRange(
+            $this->contextMock,
+            $this->uiComponentFactory,
+            $this->filterBuilderMock,
+            $this->filterModifierMock,
+            [],
+            ['name' => $name]
+        );
+        $date->prepare();
+    }
+
+    /**
+     * Gets Filter mock
+     * 
+     * @param string $name
+     * @param string $expectedType
+     * @param string $expectedDate
+     * @param int $i
+     * 
+     * @return Filter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getFilterMock($name, $expectedType, $expectedDate, &$i)
+    {
+        $this->filterBuilderMock->expects(static::at($i++))
+            ->method('setConditionType')
+            ->with($expectedType)
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects(static::at($i++))
+            ->method('setField')
+            ->with($name)
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects(static::at($i++))
+            ->method('setValue')
+            ->with($expectedDate)
+            ->willReturnSelf();
+        
+        $filterMock = $this->getMock(Filter::class);
+        $this->filterBuilderMock->expects(static::at($i++))
+            ->method('create')
+            ->willReturn($filterMock);
+
+        return $filterMock;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPrepareDataProvider()
+    {
+        return [
+            [
+                'test_date',
+                ['test_date' => ['from' => '11-05-2015', 'to' => null]],
+                ['date' => '2015-05-11T00:00:00+0000', 'type' => 'gteq'],
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => null, 'to' => '11-05-2015']],
+                ['date' => '2015-05-11T23:59:00+0000', 'type' => 'lteq'],
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => '11-05-2015', 'to' => '11-05-2015']],
+                [
+                    'date_from' => '2015-05-11T00:00:00+0000', 'type_from' => 'gteq',
+                    'date_to' => '2015-05-11T23:59:00+0000', 'type_to' => 'lteq'
+                ],
+            ],
+            [
+                'test_date',
+                ['test_date' => '11-05-2015'],
+                ['date' => '2015-05-11T00:00:00+0000', 'type' => 'eq'],
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => '', 'to' => '']],
+                null,
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php b/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php
new file mode 100644
index 0000000000000..adbb3b78cb663
--- /dev/null
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Ui\Component\Report\Filters\Type;
+
+/**
+ * Class DateRange
+ */
+class DateRange extends \Magento\Ui\Component\Filters\Type\Date
+{
+    /**
+     * Braintree date format
+     *
+     * @var string
+     */
+    protected static $dateFormat = 'Y-m-d\TH:i:00O';
+}
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
index df6c2ffcd229d..489c0d4cd1e49 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
@@ -44,12 +44,12 @@ public function toOptionArray()
     private function getAvailablePaymentTypes()
     {
         return [
-            PaymentInstrumentType::PAYPAL_ACCOUNT => __('Paypal account'),
-            PaymentInstrumentType::COINBASE_ACCOUNT => __('Coinbase account'),
-            PaymentInstrumentType::EUROPE_BANK_ACCOUNT => __('Europe bank account'),
-            PaymentInstrumentType::CREDIT_CARD => __('Credit card'),
-            PaymentInstrumentType::APPLE_PAY_CARD => __('Apple pay card'),
-            PaymentInstrumentType::ANDROID_PAY_CARD => __('Android pay card')
+            PaymentInstrumentType::PAYPAL_ACCOUNT => __(PaymentInstrumentType::PAYPAL_ACCOUNT),
+            PaymentInstrumentType::COINBASE_ACCOUNT => __(PaymentInstrumentType::COINBASE_ACCOUNT),
+            PaymentInstrumentType::EUROPE_BANK_ACCOUNT => __(PaymentInstrumentType::EUROPE_BANK_ACCOUNT),
+            PaymentInstrumentType::CREDIT_CARD => __(PaymentInstrumentType::CREDIT_CARD),
+            PaymentInstrumentType::APPLE_PAY_CARD => __(PaymentInstrumentType::APPLE_PAY_CARD),
+            PaymentInstrumentType::ANDROID_PAY_CARD => __(PaymentInstrumentType::ANDROID_PAY_CARD)
         ];
     }
 }
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
index f5424c6dd9b7f..ca6d6522990b4 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
@@ -44,20 +44,20 @@ public function toOptionArray()
     private function getAvailableStatuses()
     {
         return [
-            Transaction::AUTHORIZATION_EXPIRED => __('Authorization expired'),
-            Transaction::AUTHORIZING => __('Authorizing'),
-            Transaction::AUTHORIZED => __('Authorized'),
-            Transaction::GATEWAY_REJECTED => __('Gateway rejected'),
-            Transaction::FAILED => __('Failed'),
-            Transaction::PROCESSOR_DECLINED => __('Processor declined'),
-            Transaction::SETTLED => __('Settled'),
-            Transaction::SETTLING => __('Settling'),
-            Transaction::SUBMITTED_FOR_SETTLEMENT => __('Submitted for settlement'),
-            Transaction::VOIDED => __('Voided'),
-            Transaction::UNRECOGNIZED => __('Unrecognized'),
-            Transaction::SETTLEMENT_DECLINED => __('Settlement declined'),
-            Transaction::SETTLEMENT_PENDING => __('Settlement pending'),
-            Transaction::SETTLEMENT_CONFIRMED => __('Settlement confirmed')
+            Transaction::AUTHORIZATION_EXPIRED => __(Transaction::AUTHORIZATION_EXPIRED),
+            Transaction::AUTHORIZING => __(Transaction::AUTHORIZING),
+            Transaction::AUTHORIZED => __(Transaction::AUTHORIZED),
+            Transaction::GATEWAY_REJECTED => __(Transaction::GATEWAY_REJECTED),
+            Transaction::FAILED => __(Transaction::FAILED),
+            Transaction::PROCESSOR_DECLINED => __(Transaction::PROCESSOR_DECLINED),
+            Transaction::SETTLED => __(Transaction::SETTLED),
+            Transaction::SETTLING => __(Transaction::SETTLING),
+            Transaction::SUBMITTED_FOR_SETTLEMENT => __(Transaction::SUBMITTED_FOR_SETTLEMENT),
+            Transaction::VOIDED => __(Transaction::VOIDED),
+            Transaction::UNRECOGNIZED => __(Transaction::UNRECOGNIZED),
+            Transaction::SETTLEMENT_DECLINED => __(Transaction::SETTLEMENT_DECLINED),
+            Transaction::SETTLEMENT_PENDING => __(Transaction::SETTLEMENT_PENDING),
+            Transaction::SETTLEMENT_CONFIRMED => __(Transaction::SETTLEMENT_CONFIRMED)
         ];
     }
 }
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
index 312b2f518b464..0fe752d423277 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
@@ -44,8 +44,8 @@ public function toOptionArray()
     private function getAvailableTransactionTypes()
     {
         return [
-            Transaction::SALE => __('Sale'),
-            Transaction::CREDIT => __('Credit')
+            Transaction::SALE => __(Transaction::SALE),
+            Transaction::CREDIT => __(Transaction::CREDIT)
         ];
     }
 }
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index 1d256221702f7..5d0d179363310 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -17,6 +17,7 @@
         "magento/module-quote": "100.1.*",
         "magento/module-paypal": "100.1.*",
         "magento/module-theme": "100.1.*",
+        "magento/module-ui": "100.1.*",
         "braintree/braintree_php": "3.7.0"
     },
     "suggest": {
diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
index ed52db8cf7234..d154aabbb01b5 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
@@ -27,6 +27,7 @@
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\VaultDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -37,6 +38,7 @@
                 <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -45,6 +47,7 @@
         <arguments>
             <argument name="tokenUiComponentProviders" xsi:type="array">
                 <item name="braintree" xsi:type="object">Magento\Braintree\Model\Ui\Adminhtml\TokenUiComponentProvider</item>
+                <item name="braintree_paypal" xsi:type="object">Magento\Braintree\Model\Ui\Adminhtml\PayPal\TokenUiComponentProvider</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index 3668cd7779fda..9d3e17bf06fe8 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -8,16 +8,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="braintree_section" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Braintree</label>
-                <comment><![CDATA[Accept credit/debit cards and PayPal in your Magento store. No setup or monthly fees and your customers never leave your store to complete the purchase.]]></comment>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex braintree-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <group id="braintree" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label><![CDATA[&nbsp;]]></label>
+            <group id="braintree_section" sortOrder="6" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="braintree" translate="label comment" type="text" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Braintree</label>
+                    <comment><![CDATA[Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.]]></comment>
+                    <fieldset_css>complex braintree-section</fieldset_css>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                     <attribute type="activity_path">payment/braintree/active</attribute>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Enable this Solution</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -35,15 +33,19 @@
                         </requires>
                     </field>
                     <field id="braintree_cc_vault_active" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault enabled</label>
+                        <label>Vault Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/braintree_cc_vault/active</config_path>
                         <requires>
                             <group id="braintree_required"/>
                         </requires>
                     </field>
+                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
+                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                    </group>
                     <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
-                        <comment><![CDATA[<a href="https://www.braintreegateway.com/login" target="_blank">Click here to login to your existing Braintree account</a>. Or to setup a new account and accept payments on your website, <a href="https://apply.braintreegateway.com/signup/us" target="_blank">click here to signup for a Braintree account</a>.]]></comment>
+                        <comment><![CDATA[<a href="https://www.braintreegateway.com/login" target="_blank">Click here to login to your existing Braintree account</a>. Or to setup a new account and accept payments on your website, <a href="https://apply.braintreegateway.com/signup/us" target="_blank">click here to signup for a Braintree account</a>.<br><br>Powered by <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Braintree v.zero with Hosted Fields</a> latest technology. Hosted Fields are small, transparent iframes that replace the sensitive credit card inputs in your checkout flow - helping you meet the latest data security requirements while ensuring your customization doesn't suffer. <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Find out more</a>.]]></comment>
                         <label>Basic Braintree Settings</label>
                         <attribute type="expanded">1</attribute>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
@@ -153,6 +155,14 @@
                             <config_path>payment/braintree_paypal/title</config_path>
                             <comment>It is recommended to set this value to "PayPal" per store views.</comment>
                         </field>
+                        <field id="braintree_paypal_vault_active" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="0">
+                            <label>Vault Enabled</label>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                            <config_path>payment/braintree_paypal_vault/active</config_path>
+                            <requires>
+                                <group id="braintree_required"/>
+                            </requires>
+                        </field>
                         <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Sort Order</label>
                             <frontend_class>validate-number</frontend_class>
@@ -200,6 +210,11 @@
                             <config_path>payment/braintree_paypal/display_on_shopping_cart</config_path>
                             <comment>Also affects mini-shopping cart.</comment>
                         </field>
+                        <field id="skip_order_review" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
+                            <label>Skip Order Review</label>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                            <config_path>payment/braintree_paypal/skip_order_review</config_path>
+                        </field>
                     </group>
                     <group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" sortOrder="41">
                         <label>3D Secure Verification Settings</label>
@@ -225,6 +240,36 @@
                             <config_path>payment/braintree/verify_specific_countries</config_path>
                         </field>
                     </group>
+                    <group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="50">
+                        <label>Dynamic Descriptors</label>
+                        <comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
+                            The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
+                            Dynamic descriptors are not enabled on all accounts by default. If you receive a validation error of 92203 or if your dynamic descriptors are not displaying as expected,
+                            please <a href="mailto:support@getbraintree.com">Braintree Support</a>.]]></comment>
+                        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+                        <field id="name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>Name</label>
+                            <config_path>payment/braintree/descriptor_name</config_path>
+                            <comment>
+                                The value in the business name field of a customer's statement. Company name/DBA section must be either 3, 7 or 12 characters
+                                and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
+                            </comment>
+                        </field>
+                        <field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>Phone</label>
+                            <config_path>payment/braintree/descriptor_phone</config_path>
+                            <comment>
+                                The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
+                            </comment>
+                        </field>
+                        <field id="url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>URL</label>
+                            <config_path>payment/braintree/descriptor_url</config_path>
+                            <comment>
+                                The value in the URL/web address field of a customer's statement. The URL must be 13 characters or shorter.
+                            </comment>
+                        </field>
+                    </group>
                 </group>
             </group>
         </section>
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index 7511ec2ca1563..bf19324ae7a02 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -25,13 +25,16 @@
                 <can_refund>1</can_refund>
                 <can_void>1</can_void>
                 <can_cancel>1</can_cancel>
+                <can_edit>1</can_edit>
+                <can_review_payment>1</can_review_payment>
+                <can_deny_payment>1</can_deny_payment>
                 <cctypes>AE,VI,MC,DI,JCB,CUP,DN,MI</cctypes>
                 <useccv>1</useccv>
                 <cctypes_braintree_mapper><![CDATA[{"american-express":"AE","discover":"DI","jcb":"JCB","mastercard":"MC","master-card":"MC","visa":"VI","maestro":"MI","diners-club":"DN","unionpay":"CUP"}]]></cctypes_braintree_mapper>
                 <order_status>processing</order_status>
                 <environment>sandbox</environment>
                 <allowspecific>0</allowspecific>
-                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.17.6.min.js]]></sdk_url>
+                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.25.0.min.js]]></sdk_url>
                 <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <masked_fields>cvv,number</masked_fields>
@@ -57,6 +60,8 @@
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
                 <can_void>1</can_void>
                 <can_cancel>1</can_cancel>
+                <can_authorize_vault>1</can_authorize_vault>
+                <can_capture_vault>1</can_capture_vault>
                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
             </braintree_paypal>
@@ -64,6 +69,11 @@
                 <model>BraintreeCreditCardVaultFacade</model>
                 <title>Stored Cards (Braintree)</title>
             </braintree_cc_vault>
+            <braintree_paypal_vault>
+                <model>BraintreePayPalVaultFacade</model>
+                <title>Stored Accounts (Braintree PayPal)</title>
+                <can_use_internal>1</can_use_internal>
+            </braintree_paypal_vault>
         </payment>
     </default>
 </config>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index c8041faf7cb8e..5417c96ba6772 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -19,13 +19,15 @@
     </virtualType>
     <virtualType name="BraintreePayPalFacade" type="BraintreeFacade">
         <arguments>
-            <argument name="code" xsi:type="const">Magento\Braintree\Model\Ui\ConfigProvider::PAYPAL_CODE</argument>
+            <argument name="code" xsi:type="const">Magento\Braintree\Model\Ui\PayPal\ConfigProvider::PAYPAL_CODE</argument>
             <argument name="infoBlockType" xsi:type="string">BraintreePayPalInfo</argument>
             <argument name="valueHandlerPool" xsi:type="object">BraintreePayPalValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">BraintreePayPalValidatorPool</argument>
             <argument name="commandPool" xsi:type="object">BraintreePayPalCommandPool</argument>
         </arguments>
     </virtualType>
-    <!-- Configuration for Braintree Vault payment -->
+
+    <!-- Configuration for Vault payments -->
     <virtualType name="BraintreeVaultPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
         <arguments>
             <argument name="methodCode" xsi:type="const">Magento\Braintree\Model\Ui\ConfigProvider::CC_VAULT_CODE</argument>
@@ -51,6 +53,32 @@
             <argument name="code" xsi:type="const">Magento\Braintree\Model\Ui\ConfigProvider::CC_VAULT_CODE</argument>
         </arguments>
     </virtualType>
+    <virtualType name="BraintreePayPalVaultPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">Magento\Braintree\Model\Ui\PayPal\ConfigProvider::PAYPAL_VAULT_CODE</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreePayPalVaultPaymentValueHandler" type="VaultPaymentDefaultValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">BraintreePayPalVaultPaymentConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreePayPalVaultPaymentValueHandlerPool" type="VaultPaymentValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">BraintreePayPalVaultPaymentValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreePayPalVaultFacade" type="Magento\Vault\Model\Method\Vault">
+        <arguments>
+            <argument name="config" xsi:type="object">BraintreePayPalVaultPaymentConfig</argument>
+            <argument name="valueHandlerPool" xsi:type="object">BraintreePayPalVaultPaymentValueHandlerPool</argument>
+            <argument name="vaultProvider" xsi:type="object">BraintreePayPalFacade</argument>
+            <argument name="code" xsi:type="const">Magento\Braintree\Model\Ui\PayPal\ConfigProvider::PAYPAL_VAULT_CODE</argument>
+        </arguments>
+    </virtualType>
+    <!-- END Configuration for Vault payments -->
 
     <!-- Configuration reader -->
     <type name="Magento\Braintree\Gateway\Config\Config">
@@ -60,7 +88,7 @@
     </type>
     <type name="Magento\Braintree\Gateway\Config\PayPal\Config">
         <arguments>
-            <argument name="methodCode" xsi:type="const">Magento\Braintree\Model\Ui\ConfigProvider::PAYPAL_CODE</argument>
+            <argument name="methodCode" xsi:type="const">Magento\Braintree\Model\Ui\PayPal\ConfigProvider::PAYPAL_CODE</argument>
         </arguments>
     </type>
 
@@ -70,6 +98,27 @@
             <argument name="config" xsi:type="object">Magento\Braintree\Gateway\Config\Config</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Braintree\Gateway\Http\Client\TransactionSale">
+        <arguments>
+            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement">
+        <arguments>
+            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Braintree\Gateway\Http\Client\TransactionRefund">
+        <arguments>
+            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Braintree\Gateway\Http\Client\TransactionVoid">
+        <arguments>
+            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
+        </arguments>
+    </type>
+    <!-- END Logger, initialized with BraintreeConfig -->
 
     <!-- Commands infrastructure -->
     <virtualType name="BraintreeCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
@@ -85,6 +134,7 @@
                 <item name="void" xsi:type="string">BraintreeVoidCommand</item>
                 <item name="refund" xsi:type="string">BraintreeRefundCommand</item>
                 <item name="cancel" xsi:type="string">BraintreeVoidCommand</item>
+                <item name="deny_payment" xsi:type="string">BraintreeVoidCommand</item>
             </argument>
         </arguments>
     </virtualType>
@@ -95,39 +145,49 @@
                 <item name="sale" xsi:type="string">BraintreePayPalSaleCommand</item>
                 <item name="capture" xsi:type="string">BraintreePayPalCaptureStrategyCommand</item>
                 <item name="settlement" xsi:type="string">BraintreeCaptureCommand</item>
+                <item name="vault_authorize" xsi:type="string">BraintreePayPalVaultAuthorizeCommand</item>
+                <item name="vault_sale" xsi:type="string">BraintreePayPalVaultSaleCommand</item>
+                <item name="vault_capture" xsi:type="string">BraintreeVaultCaptureCommand</item>
                 <item name="void" xsi:type="string">BraintreeVoidCommand</item>
                 <item name="refund" xsi:type="string">BraintreeRefundCommand</item>
                 <item name="cancel" xsi:type="string">BraintreeVoidCommand</item>
             </argument>
         </arguments>
     </virtualType>
-
-    <virtualType name="BraintreeCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
+    <virtualType name="BraintreeCaptureStrategyCommand" type="Magento\Braintree\Gateway\Command\CaptureStrategyCommand">
         <arguments>
             <argument name="commandPool" xsi:type="object">BraintreeCommandPool</argument>
         </arguments>
     </virtualType>
-
-    <type name="Magento\Payment\Gateway\Command\CommandManagerPool">
+    <virtualType name="BraintreePayPalCaptureStrategyCommand" type="Magento\Braintree\Gateway\Command\CaptureStrategyCommand">
         <arguments>
-            <argument name="executors" xsi:type="array">
-                <item name="braintree" xsi:type="string">BraintreeCommandManager</item>
-            </argument>
+            <argument name="commandPool" xsi:type="object">BraintreePayPalCommandPool</argument>
         </arguments>
-    </type>
+    </virtualType>
+    <!-- END Commands infrastructure -->
 
-    <virtualType name="BraintreeCaptureStrategyCommand" type="Magento\Braintree\Gateway\Command\CaptureStrategyCommand">
+    <!-- Command managers section for Vault -->
+    <virtualType name="BraintreeCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
         <arguments>
             <argument name="commandPool" xsi:type="object">BraintreeCommandPool</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreePayPalCaptureStrategyCommand" type="Magento\Braintree\Gateway\Command\CaptureStrategyCommand">
+    <virtualType name="BraintreePayPalCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
         <arguments>
             <argument name="commandPool" xsi:type="object">BraintreePayPalCommandPool</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Payment\Gateway\Command\CommandManagerPool">
+        <arguments>
+            <argument name="executors" xsi:type="array">
+                <item name="braintree" xsi:type="string">BraintreeCommandManager</item>
+                <item name="braintree_paypal" xsi:type="string">BraintreePayPalCommandManager</item>
+            </argument>
+        </arguments>
+    </type>
+    <!-- END command managers section for Vault -->
 
-    <!-- Authorization command  -->
+    <!-- Braintree commands  -->
     <virtualType name="BraintreeAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
             <argument name="requestBuilder" xsi:type="object">BraintreeAuthorizeRequest</argument>
@@ -146,11 +206,42 @@
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\VaultDataBuilder</item>
                 <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
-                <item name="kount" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
+                <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Authorization&Capture command  -->
+    <virtualType name="BraintreeSaleCommand" type="BraintreeAuthorizeCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">BraintreeSaleRequest</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreeSaleRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="authorize" xsi:type="string">BraintreeAuthorizeRequest</item>
+                <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Capture commands  -->
+    <virtualType name="BraintreeCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">BraintreeCaptureRequest</argument>
+            <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement</argument>
+            <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
+            <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreeCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="capture" xsi:type="string">Magento\Braintree\Gateway\Request\CaptureDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-
     <!-- Vault Authorization command -->
     <virtualType name="BraintreeVaultAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
@@ -169,74 +260,61 @@
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
-                <item name="kount" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
+                <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-
-    <!-- PayPal Authorization command -->
-    <virtualType name="BraintreePayPalAuthorizeCommand" type="BraintreeAuthorizeCommand">
+    <!-- Vault Authorization&Capture command -->
+    <virtualType name="BraintreeVaultSaleCommand" type="BraintreeVaultAuthorizeCommand">
         <arguments>
-            <argument name="requestBuilder" xsi:type="object">BraintreePayPalAuthorizeRequest</argument>
-            <argument name="handler" xsi:type="object">BraintreePayPalResponseHandler</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreeVaultSaleRequest</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreePayPalAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeVaultSaleRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
-                <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
-                <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
-                <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
+                <item name="authorize" xsi:type="string">BraintreeVaultAuthorizeRequest</item>
+                <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-
-    <type name="Magento\Braintree\Gateway\Http\Client\TransactionSale">
-        <arguments>
-            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement">
-        <arguments>
-            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Braintree\Gateway\Http\Client\TransactionRefund">
-        <arguments>
-            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Braintree\Gateway\Http\Client\TransactionVoid">
-        <arguments>
-            <argument name="customLogger" xsi:type="object">BraintreeLoggerForTransactionSale</argument>
-        </arguments>
-    </type>
-
-    <!-- Authorization&Capture command  -->
-    <virtualType name="BraintreeSaleCommand" type="BraintreeAuthorizeCommand">
+    <!-- Vault Capture (Sale actually) command -->
+    <virtualType name="BraintreeVaultCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
-            <argument name="requestBuilder" xsi:type="object">BraintreeSaleRequest</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreeVaultCaptureRequest</argument>
+            <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSale</argument>
+            <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
+            <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeSaleRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeVaultCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
-                <item name="authorize" xsi:type="string">BraintreeAuthorizeRequest</item>
+                <item name="vault_capture" xsi:type="string">Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder</item>
                 <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-    <!-- Vault Authorization&Capture command -->
-    <virtualType name="BraintreeVaultSaleCommand" type="BraintreeVaultAuthorizeCommand">
+    <!-- END Braintree commands  -->
+
+    <!-- PayPal commands -->
+    <virtualType name="BraintreePayPalAuthorizeCommand" type="BraintreeAuthorizeCommand">
         <arguments>
-            <argument name="requestBuilder" xsi:type="object">BraintreeVaultSaleRequest</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreePayPalAuthorizeRequest</argument>
+            <argument name="handler" xsi:type="object">BraintreePayPalResponseHandler</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeVaultSaleRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreePayPalAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
-                <item name="authorize" xsi:type="string">BraintreeVaultAuthorizeRequest</item>
-                <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
+                <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
+                <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
+                <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
+                <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder</item>
+                <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -254,45 +332,46 @@
             </argument>
         </arguments>
     </virtualType>
-
-    <!-- Capture command  -->
-    <virtualType name="BraintreeCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+    <!-- PayPal Vault Authorization command -->
+    <virtualType name="BraintreePayPalVaultAuthorizeCommand" type="BraintreeVaultAuthorizeCommand">
         <arguments>
-            <argument name="requestBuilder" xsi:type="object">BraintreeCaptureRequest</argument>
-            <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
-            <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement</argument>
-            <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
-            <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreePayPalVaultAuthorizeRequest</argument>
+            <argument name="handler" xsi:type="object">BraintreePayPalVaultResponseHandler</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreePayPalVaultAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
-                <item name="capture" xsi:type="string">Magento\Braintree\Gateway\Request\CaptureDataBuilder</item>
+                <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
+                <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
+                <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
+                <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
+                <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-
-    <!-- Vault Capture (Sale actually) command -->
-    <virtualType name="BraintreeVaultCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+    <!-- Vault Authorization&Capture command -->
+    <virtualType name="BraintreePayPalVaultSaleCommand" type="BraintreePayPalVaultAuthorizeCommand">
         <arguments>
-            <argument name="requestBuilder" xsi:type="object">BraintreeVaultCaptureRequest</argument>
-            <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
-            <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSale</argument>
-            <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
-            <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreePayPalVaultSaleRequest</argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeVaultCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreePayPalVaultSaleRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
-                <item name="vault_capture" xsi:type="string">Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder</item>
+                <item name="authorize" xsi:type="string">BraintreePayPalVaultAuthorizeRequest</item>
                 <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
-    
+    <!-- END PayPal commands -->
+
     <!-- Value handlers infrastructure -->
+    <type name="Magento\Braintree\Gateway\Response\VaultDetailsHandler">
+        <arguments>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\CreditCardTokenFactory</argument>
+        </arguments>
+    </type>
     <virtualType name="BraintreeValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
         <arguments>
             <argument name="handlers" xsi:type="array">
@@ -330,17 +409,14 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreePayPalResponseHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="payment_details" xsi:type="string">Magento\Braintree\Gateway\Response\PaymentDetailsHandler</item>
-                <item name="txn_id" xsi:type="string">Magento\Braintree\Gateway\Response\TransactionIdHandler</item>
-                <item name="paypal_details" xsi:type="string">Magento\Braintree\Gateway\Response\PayPalDetailsHandler</item>
-            </argument>
-        </arguments>
-    </virtualType>
+    <!-- END Value handlers infrastructure -->
 
     <!-- PayPal value handlers infrastructure -->
+    <type name="Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler">
+        <arguments>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\AccountPaymentTokenFactory</argument>
+        </arguments>
+    </type>
     <virtualType name="BraintreePayPalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
         <arguments>
             <argument name="handlers" xsi:type="array">
@@ -356,7 +432,27 @@
             <argument name="configInterface" xsi:type="object">Magento\Braintree\Gateway\Config\PayPal\Config</argument>
         </arguments>
     </virtualType>
-    
+    <virtualType name="BraintreePayPalResponseHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="payment_details" xsi:type="string">Magento\Braintree\Gateway\Response\PaymentDetailsHandler</item>
+                <item name="txn_id" xsi:type="string">Magento\Braintree\Gateway\Response\TransactionIdHandler</item>
+                <item name="paypal_details" xsi:type="string">Magento\Braintree\Gateway\Response\PayPalDetailsHandler</item>
+                <item name="vault_details" xsi:type="string">Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreePayPalVaultResponseHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="payment_details" xsi:type="string">Magento\Braintree\Gateway\Response\PaymentDetailsHandler</item>
+                <item name="txn_id" xsi:type="string">Magento\Braintree\Gateway\Response\TransactionIdHandler</item>
+                <item name="paypal_details" xsi:type="string">Magento\Braintree\Gateway\Response\PayPalDetailsHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- END PayPal value handlers infrastructure -->
+
     <!-- Void Command -->
     <virtualType name="BraintreeVoidCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
@@ -379,7 +475,7 @@
         </arguments>
     </virtualType>
 
-    <!-- Value validators infrastructure -->
+    <!-- Braintree validators infrastructure -->
     <virtualType name="BraintreeCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
         <arguments>
             <argument name="config" xsi:type="object">Magento\Braintree\Gateway\Config\Config</argument>
@@ -392,6 +488,22 @@
             </argument>
         </arguments>
     </virtualType>
+    <!-- Braintree validators infrastructure -->
+
+    <!-- Braintree PayPal validators -->
+    <virtualType name="BraintreePayPalCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\Braintree\Gateway\Config\PayPal\Config</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BraintreePayPalValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">BraintreePayPalCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- END Braintree PayPal validators -->
 
     <type name="Magento\Braintree\Block\Info">
         <arguments>
@@ -404,6 +516,7 @@
         </arguments>
     </virtualType>
 
+    <!-- Settlement Report Section -->
     <virtualType name="BraintreeTransactionsCollectionFactoryForReporting" type="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
             <argument name="collections" xsi:type="array">
@@ -411,19 +524,16 @@
             </argument>
         </arguments>
     </virtualType>
-
     <virtualType name="BraintreeTransactionsReporting" type="Magento\Framework\View\Element\UiComponent\DataProvider\Reporting">
         <arguments>
             <argument name="collectionFactory" xsi:type="object">BraintreeTransactionsCollectionFactoryForReporting</argument>
         </arguments>
     </virtualType>
-
     <virtualType name="BraintreeTransactionsDataProvider" type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider">
         <arguments>
             <argument name="reporting" xsi:type="object">BraintreeTransactionsReporting</argument>
         </arguments>
     </virtualType>
-
     <type name="Magento\Braintree\Model\Report\ConditionAppliers\AppliersPool">
         <arguments>
             <argument name="appliers" xsi:type="array">
@@ -433,7 +543,7 @@
             </argument>
         </arguments>
     </type>
-
+    <!-- END Settlement Report Section -->
     <type name="Magento\Config\Model\Config\Export\ExcludeList">
         <arguments>
             <argument name="configs" xsi:type="array">
diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
index 98ae47dea794a..cdd56e236a72b 100644
--- a/app/code/Magento/Braintree/etc/frontend/di.xml
+++ b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -10,6 +10,7 @@
         <arguments>
             <argument name="configProviders" xsi:type="array">
                 <item name="braintree_config_provider" xsi:type="object">Magento\Braintree\Model\Ui\ConfigProvider</item>
+                <item name="braintree_paypal_config_provider" xsi:type="object">Magento\Braintree\Model\Ui\PayPal\ConfigProvider</item>
             </argument>
         </arguments>
     </type>
@@ -32,6 +33,7 @@
         <arguments>
             <argument name="tokenUiComponentProviders" xsi:type="array">
                 <item name="braintree" xsi:type="object">Magento\Braintree\Model\Ui\TokenUiComponentProvider</item>
+                <item name="braintree_paypal" xsi:type="object">Magento\Braintree\Model\Ui\PayPal\TokenUiComponentProvider</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
index f912e59c2edac..f5e2d36e1e9bb 100644
--- a/app/code/Magento/Braintree/i18n/en_US.csv
+++ b/app/code/Magento/Braintree/i18n/en_US.csv
@@ -140,6 +140,29 @@ Debug,Debug
 "liabilityShifted", "Liability Shifted"
 "liabilityShiftPossible", "Liability Shift Possible"
 "riskDataId", "Risk ID"
-"riskDataDecision", "Risk Decision",
-"paymentId", "Payment Id",
-"payerEmail", "Payer Email",
+"riskDataDecision", "Risk Decision"
+"paymentId", "Payment Id"
+"payerEmail", "Payer Email"
+"sale","Sale"
+"credit","Credit"
+"authorization_expired","Authorization expired"
+"authorizing","Authorizing"
+"authorized","Authorized"
+"gateway_rejected","Gateway rejected"
+"failed","Failed"
+"processor_declined","Processor declined"
+"settled","Settled"
+"settling","Settling"
+"submitted_for_settlement","Submitted for settlement"
+"voided","Voided"
+"unrecognized","Unrecognized"
+"settlement_declined","Settlement declined"
+"settlement_pending","Settlement pending"
+"settlement_confirmed","Settlement confirmed"
+"paypal_account","Paypal account"
+"coinbase_account","Coinbase account"
+"europe_bank_accout","Europe bank account"
+"credit_card","Credit card"
+"apple_pay_card","Apple pay card"
+"android_pay_card","Android pay card"
+"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml
index 76f6b5a4d616c..5e4f36e1c1fb4 100644
--- a/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml
@@ -18,13 +18,17 @@
                 <argument name="method" xsi:type="string">braintree_cc_vault</argument>
                 <argument name="template" xsi:type="string">Magento_Vault::form/vault.phtml</argument>
             </action>
+            <action method="setMethodFormTemplate">
+                <argument name="method" xsi:type="string">braintree_paypal_vault</argument>
+                <argument name="template" xsi:type="string">Magento_Vault::form/vault.phtml</argument>
+            </action>
         </referenceBlock>
         <referenceBlock name="content">
             <block name="braintree_payment_script"
                    as="braintree_payment_script"
-                   after="billing_method"
                    template="Magento_Braintree::payment/script.phtml"
-                   class="Magento\Braintree\Block\Payment"/>
+                   class="Magento\Braintree\Block\Payment"
+                   after="billing_method"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml b/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
index 68e0abc0cd009..579b82c61f690 100644
--- a/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
+++ b/app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
@@ -18,6 +18,10 @@
                 <argument name="method" xsi:type="string">braintree_cc_vault</argument>
                 <argument name="template" xsi:type="string">Magento_Vault::form/vault.phtml</argument>
             </action>
+            <action method="setMethodFormTemplate">
+                <argument name="method" xsi:type="string">braintree_paypal_vault</argument>
+                <argument name="template" xsi:type="string">Magento_Vault::form/vault.phtml</argument>
+            </action>
         </referenceBlock>
     </body>
 </page>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
new file mode 100644
index 0000000000000..22930bbc65666
--- /dev/null
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
@@ -0,0 +1,30 @@
+<?php
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+
+/** @var \Magento\Framework\View\Element\Template $block */
+$details = $block->getData(TokenUiComponentProviderInterface::COMPONENT_DETAILS);
+$icon = $details['icon'];
+$id = $block->escapeHtml($block->getData('id'));
+?>
+<div data-mage-init='{
+        "Magento_Braintree/js/vault": {
+            "container": "payment_<?php /* @noEscape */ echo $id; ?>",
+            "publicHash": "<?php echo $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)); ?>",
+            "code": "<?php echo $block->escapeHtml($block->getData('code')); ?>",
+            "nonceUrl": "<?php echo $block->escapeUrl($block->getData('nonceUrl')); ?>"
+        }
+    }' id="payment_<?php /* @noEscape */ echo $id;?>" class="admin__field">
+    <div class="admin__field-control control">
+        <input type="radio" id="token_switcher_<?php /* @noEscape */ echo $id; ?>" name="payment[token_switcher]"/>
+        <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
+             width="<?php echo $block->escapeHtml($icon['width']); ?>"
+             height="<?php echo $block->escapeHtml($icon['height']); ?>"
+             class="payment-icon" >
+        <span><?php echo $block->escapeHtml($details['payerEmail']); ?></span>
+    </div>
+</div>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
index 3811461884725..001422d4bf911 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
@@ -7,7 +7,7 @@ use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 // @codingStandardsIgnoreFile
 
 /** @var \Magento\Framework\View\Element\Template $block */
-$details = $block->getData('details');
+$details = $block->getData(TokenUiComponentProviderInterface::COMPONENT_DETAILS);
 $icon = $block->getData('icons')[$details['type']];
 $id = $block->escapeHtml($block->getData('id'));
 ?>
@@ -15,6 +15,7 @@ $id = $block->escapeHtml($block->getData('id'));
         "Magento_Braintree/js/vault": {
             "container": "payment_<?php /* @noEscape */ echo $id; ?>",
             "publicHash": "<?php echo $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)); ?>",
+            "code": "<?php echo $block->escapeHtml($block->getData('code')); ?>",
             "nonceUrl": "<?php echo $block->escapeUrl($block->getData('nonceUrl')); ?>"
         }
     }' id="payment_<?php /* @noEscape */ echo $id;?>" class="admin__field">
diff --git a/app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml b/app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml
index d1b661b2c3ecd..031ddca7a8707 100644
--- a/app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml
+++ b/app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml
@@ -109,7 +109,6 @@
                     </item>
                 </argument>
             </filterSelect>
-            <!--
             <filterSelect name="paymentInstrumentType">
                 <argument name="optionsProvider" xsi:type="configurableObject">
                     <argument name="class" xsi:type="string">Magento\Braintree\Ui\Component\Report\Listing\Column\PaymentType</argument>
@@ -126,7 +125,6 @@
                     </item>
                 </argument>
             </filterSelect>
-            -->
             <filterInput name="paypalDetails_paymentId">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -135,6 +133,22 @@
                     </item>
                 </argument>
             </filterInput>
+            <filterRange name="createdAt" class="Magento\Braintree\Ui\Component\Report\Filters\Type\DateRange">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="provider" xsi:type="string">${ $.parentName }</item>
+                        <item name="imports" xsi:type="array">
+                            <item name="visible" xsi:type="string">componentType = column, index = ${ $.index }:visible</item>
+                        </item>
+                        <item name="parent" xsi:type="string">braintree_report.braintree_report.listing_top.listing_filters</item>
+                        <item name="template" xsi:type="string">ui/grid/filters/elements/group</item>
+                        <item name="component" xsi:type="string">Magento_Ui/js/grid/filters/range</item>
+                        <item name="rangeType" xsi:type="string">date</item>
+                        <item name="dataScope" xsi:type="string">createdAt</item>
+                        <item name="label" xsi:type="string" translate="true">Created At</item>
+                    </item>
+                </argument>
+            </filterRange>
         </filters>
     </container>
     <columns name="braintree_report_columns">
@@ -216,7 +230,6 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="sorting" xsi:type="string">desc</item>
-                    <item name="filter" xsi:type="string">dateRange</item>
                     <item name="dataType" xsi:type="string">date</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
                     <item name="label" xsi:type="string" translate="true">Created At</item>
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js b/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
index fcff173e7fcd4..14729714b4e60 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
@@ -14,7 +14,8 @@ define([
     return Class.extend({
         defaults: {
             $selector: null,
-            selector: 'edit_form'
+            selector: 'edit_form',
+            $container: null
         },
 
         /**
@@ -25,17 +26,18 @@ define([
             var self = this;
 
             self.$selector = $('#' + self.selector);
+            self.$container =  $('#' + self.container);
             self.$selector.on(
-                'setVaultNotActive',
+                'setVaultNotActive.' + self.getCode(),
                 function () {
-                    self.$selector.off('submitOrder.braintree_vault');
+                    self.$selector.off('submitOrder.' + self.getCode());
                 }
             );
-            this._super();
+            self._super();
 
-            this.initEventHandlers();
+            self.initEventHandlers();
 
-            return this;
+            return self;
         },
 
         /**
@@ -43,14 +45,14 @@ define([
          * @returns {String}
          */
         getCode: function () {
-            return 'braintree';
+            return this.code;
         },
 
         /**
          * Init event handlers
          */
         initEventHandlers: function () {
-            $('#' + this.container).find('[name="payment[token_switcher]"]')
+            $(this.$container).find('[name="payment[token_switcher]"]')
                 .on('click', this.selectPaymentMethod.bind(this));
         },
 
@@ -66,7 +68,7 @@ define([
          * Enable form event listeners
          */
         enableEventListeners: function () {
-            this.$selector.on('submitOrder.braintree_vault', this.submitOrder.bind(this));
+            this.$selector.on('submitOrder.' + this.getCode(), this.submitOrder.bind(this));
         },
 
         /**
@@ -129,7 +131,7 @@ define([
             this.createPublicHashSelector();
 
             this.$selector.find('[name="payment[public_hash]"]').val(this.publicHash);
-            this.$selector.find('#braintree_nonce').val(nonce);
+            this.$container.find('#' + this.getNonceSelectorName()).val(nonce);
         },
 
         /**
@@ -138,16 +140,16 @@ define([
         createPublicHashSelector: function () {
             var $input;
 
-            if (this.$selector.find('#braintree_nonce').size() === 0) {
+            if (this.$container.find('#' + this.getNonceSelectorName()).size() === 0) {
                 $input = $('<input>').attr(
                     {
                         type: 'hidden',
-                        id: 'braintree_nonce',
+                        id: this.getNonceSelectorName(),
                         name: 'payment[payment_method_nonce]'
                     }
                 );
 
-                $input.appendTo(this.$selector);
+                $input.appendTo(this.$container);
                 $input.prop('disabled', false);
             }
         },
@@ -160,6 +162,14 @@ define([
             alert({
                 content: message
             });
+        },
+
+        /**
+         * Get selector name for nonce input
+         * @returns {String}
+         */
+        getNonceSelectorName: function () {
+            return 'nonce_' + this.getCode();
         }
     });
 });
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/styles.css b/app/code/Magento/Braintree/view/adminhtml/web/styles.css
index c0d8822e779d4..81378f636eb61 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Braintree/view/adminhtml/web/styles.css
@@ -3,5 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-.braintree-section .entry-edit-head > .config-heading .heading strong {padding-left:150px;background:url(images/braintree_logo.png) no-repeat 0 0 / 145px auto;line-height:36px;}
-.braintree-section .entry-edit-head > .config-heading:before {background: url("images/braintree_allinone.png") no-repeat 0 0 / 100% auto;content: "";display: inline;float: right;height: 35px;width: 280px;}
+.braintree-section .heading {background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
+.braintree-section .button-container {float: right;}
+.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;}
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/base/web/images/paypal-small.png b/app/code/Magento/Braintree/view/base/web/images/paypal-small.png
new file mode 100644
index 0000000000000..92d5c63bca442
Binary files /dev/null and b/app/code/Magento/Braintree/view/base/web/images/paypal-small.png differ
diff --git a/app/code/Magento/Braintree/view/base/web/images/paypal.png b/app/code/Magento/Braintree/view/base/web/images/paypal.png
new file mode 100644
index 0000000000000..291693037814a
Binary files /dev/null and b/app/code/Magento/Braintree/view/base/web/images/paypal.png differ
diff --git a/app/code/Magento/Braintree/view/frontend/layout/vault_cards_listaction.xml b/app/code/Magento/Braintree/view/frontend/layout/vault_cards_listaction.xml
index b7bf5919a7e15..c8cd4e3cc4085 100644
--- a/app/code/Magento/Braintree/view/frontend/layout/vault_cards_listaction.xml
+++ b/app/code/Magento/Braintree/view/frontend/layout/vault_cards_listaction.xml
@@ -11,6 +11,9 @@
             <referenceBlock name="vault.cards.list">
                 <block class="Magento\Braintree\Block\Customer\CardRenderer" name="braintree.card.renderer" template="Magento_Vault::customer_account/credit_card.phtml"/>
             </referenceBlock>
+            <referenceBlock name="vault.token.list">
+                <block class="Magento\Braintree\Block\Customer\PayPal\VaultTokenRenderer" name="braintree_paypal.token.renderer" template="paypal/vault_token.phtml"/>
+            </referenceBlock>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Braintree/view/frontend/requirejs-config.js b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
index c08a45bdbecd7..76391a81fe663 100644
--- a/app/code/Magento/Braintree/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
@@ -6,7 +6,7 @@
 var config = {
     map: {
         '*': {
-            braintree: 'https://js.braintreegateway.com/js/braintree-2.17.6.min.js'
+            braintree: 'https://js.braintreegateway.com/js/braintree-2.25.0.min.js'
         }
     }
 };
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
new file mode 100644
index 0000000000000..32c2d98e7e76b
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Braintree\Block\Customer\PayPal\VaultTokenRenderer;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/** @var VaultTokenRenderer $block */
+
+$payerEmail = $block->escapeHtml($block->getPayerEmail());
+?>
+<tr>
+    <td data-th="<?php echo $block->escapeHtml(__('PayPal Account')); ?>" class="col paypal-account">
+        <img src="<?php /* @noEscape */ echo $block->getIconUrl(); ?>"
+             width="<?php /* @noEscape */ echo $block->getIconWidth(); ?>"
+             height="<?php /* @noEscape */ echo $block->getIconHeight(); ?>"
+             alt="<?php echo $block->escapeHtml(__('PayPal Logo')); ?>"
+        >
+        <span><?php /* @noEscape */ echo $payerEmail; ?></span>
+    </td>
+    <td data-th="<?php echo $block->escapeHtml(__('Actions')); ?>" class="col actions">
+        <form
+            class="form"
+            action="<?php echo $block->escapeUrl($block->getUrl('vault/cards/deleteaction')); ?>"
+            method="post"
+        >
+            <?php echo $block->getBlockHtml('formkey'); ?>
+            <input
+                name="<?php /* @noEscape */ echo PaymentTokenInterface::PUBLIC_HASH; ?>"
+                value="<?php /* @noEscape */ echo $block->getToken()->getPublicHash(); ?>"
+                type="hidden"/>
+            <button type="submit"
+                    class="action delete"
+                    data-mage-init='{
+                                    "Magento_Vault/js/customer_account/deleteWidget":{
+                                        "type": "popup",
+                                        "modalClass": "my-credit-cards-popup",
+                                        "toggleEvent": "click",
+                                        "title": "<?php echo $block->escapeHtml(__('Delete')); ?>",
+                                        "content": "Are you sure you want to delete this PayPal account: <?php /* @noEscape */ echo $payerEmail; ?>?"
+                                    }
+                                }'>
+                <span><?php echo $block->escapeHtml(__('Delete')); ?></span>
+            </button>
+        </form>
+    </td>
+</tr>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal-vault.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal-vault.js
new file mode 100644
index 0000000000000..a609175fe25bf
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal-vault.js
@@ -0,0 +1,87 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+define([
+    'jquery',
+    'underscore',
+    'Magento_Vault/js/view/payment/method-renderer/vault',
+    'Magento_Ui/js/model/messageList',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function ($, _, VaultComponent, globalMessageList, fullScreenLoader) {
+    'use strict';
+
+    return VaultComponent.extend({
+        defaults: {
+            template: 'Magento_Braintree/payment/paypal/vault',
+            additionalData: {}
+        },
+
+        /**
+         * Get PayPal payer email
+         * @returns {String}
+         */
+        getPayerEmail: function () {
+            return this.details.payerEmail;
+        },
+
+        /**
+         * Get type of payment
+         * @returns {String}
+         */
+        getPaymentIcon: function () {
+            return window.checkoutConfig.payment['braintree_paypal'].paymentIcon;
+        },
+
+        /**
+         * Place order
+         */
+        beforePlaceOrder: function () {
+            this.getPaymentMethodNonce();
+        },
+
+        /**
+         * Send request to get payment method nonce
+         */
+        getPaymentMethodNonce: function () {
+            var self = this;
+
+            fullScreenLoader.startLoader();
+            $.get(self.nonceUrl, {
+                'public_hash': self.publicHash
+            })
+                .done(function (response) {
+                    fullScreenLoader.stopLoader();
+                    self.additionalData['payment_method_nonce'] = response.paymentMethodNonce;
+                    self.placeOrder();
+                })
+                .fail(function (response) {
+                    var error = JSON.parse(response.responseText);
+
+                    fullScreenLoader.stopLoader();
+                    globalMessageList.addErrorMessage({
+                        message: error.message
+                    });
+                });
+        },
+
+        /**
+         * Get payment method data
+         * @returns {Object}
+         */
+        getData: function () {
+            var data = {
+                'method': this.code,
+                'additional_data': {
+                    'public_hash': this.publicHash
+                }
+            };
+
+            data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
+
+            return data;
+        }
+    });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index 2b7aea3db5c4f..075a1fdaf1fc1 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -11,8 +11,20 @@ define([
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/full-screen-loader',
-    'Magento_Checkout/js/model/payment/additional-validators'
-], function ($, _, Component, Braintree, quote, fullScreenLoader, additionalValidators) {
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Vault/js/view/payment/vault-enabler',
+    'Magento_Checkout/js/action/create-billing-address'
+], function (
+    $,
+    _,
+    Component,
+    Braintree,
+    quote,
+    fullScreenLoader,
+    additionalValidators,
+    VaultEnabler,
+    createBillingAddress
+) {
     'use strict';
 
     return Component.extend({
@@ -22,12 +34,24 @@ define([
             active: false,
             paymentMethodNonce: null,
             grandTotalAmount: null,
+            isReviewRequired: false,
+            customerEmail: null,
+
+            /**
+             * Additional payment data
+             *
+             * {Object}
+             */
+            additionalData: {},
 
             /**
              * PayPal client configuration
              * {Object}
              */
             clientConfig: {
+                dataCollector: {
+                    paypal: true
+                },
 
                 /**
                  * Triggers when widget is loaded
@@ -35,6 +59,7 @@ define([
                  */
                 onReady: function (checkout) {
                     Braintree.checkout = checkout;
+                    this.additionalData['device_data'] = checkout.deviceData;
                     this.enableButton();
                     Braintree.onReady();
                 },
@@ -60,17 +85,24 @@ define([
             var self = this;
 
             this._super()
-                .observe(['active']);
+                .observe(['active', 'isReviewRequired', 'customerEmail']);
+
+            this.vaultEnabler = new VaultEnabler();
+            this.vaultEnabler.setPaymentCode(this.getVaultCode());
+            this.vaultEnabler.isActivePaymentTokenEnabler.subscribe(function () {
+                self.onVaultPaymentTokenEnablerChange();
+            });
 
             this.grandTotalAmount = quote.totals()['base_grand_total'];
 
             quote.totals.subscribe(function () {
                 if (self.grandTotalAmount !== quote.totals()['base_grand_total']) {
                     self.grandTotalAmount = quote.totals()['base_grand_total'];
-                    self.reInitPayPal();
                 }
             });
 
+            // for each component initialization need update property
+            this.isReviewRequired(false);
             this.initClientConfig();
 
             return this;
@@ -131,8 +163,6 @@ define([
                     this.clientConfig[name] = fn.bind(this);
                 }
             }, this);
-
-            Braintree.config = _.extend(Braintree.config, this.clientConfig);
         },
 
         /**
@@ -152,14 +182,16 @@ define([
             var billingAddress = {
                 street: [address.streetAddress],
                 city: address.locality,
-                regionCode: address.region,
                 postcode: address.postalCode,
                 countryId: address.countryCodeAlpha2,
+                email: customer.email,
                 firstname: customer.firstName,
                 lastname: customer.lastName,
                 telephone: customer.phone
             };
 
+            billingAddress['region_code'] = address.region;
+            billingAddress = createBillingAddress(billingAddress);
             quote.billingAddress(billingAddress);
         },
 
@@ -173,7 +205,13 @@ define([
             if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
                 this.setBillingAddress(data.details, data.details.billingAddress);
             }
-            this.placeOrder();
+
+            if (this.isSkipOrderReview()) {
+                this.placeOrder();
+            } else {
+                this.customerEmail(data.details.email);
+                this.isReviewRequired(true);
+            }
         },
 
         /**
@@ -193,15 +231,6 @@ define([
             Braintree.setup();
         },
 
-        /**
-         * Triggers when customer click "Continue to PayPal" button
-         */
-        payWithPayPal: function () {
-            if (additionalValidators.validate()) {
-                Braintree.checkout.paypal.initAuthFlow();
-            }
-        },
-
         /**
          * Get locale
          * @returns {String}
@@ -224,11 +253,12 @@ define([
          */
         getPayPalConfig: function () {
             var totals = quote.totals(),
-                config = {};
+                config = {},
+                isActiveVaultEnabler = this.isActiveVault();
 
             config.paypal = {
                 container: 'paypal-container',
-                singleUse: true,
+                singleUse: !isActiveVaultEnabler,
                 headless: true,
                 amount: this.grandTotalAmount,
                 currency: totals['base_currency_code'],
@@ -296,12 +326,18 @@ define([
          * @returns {Object}
          */
         getData: function () {
-            return {
+            var data = {
                 'method': this.getCode(),
                 'additional_data': {
                     'payment_method_nonce': this.paymentMethodNonce
                 }
             };
+
+            data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
+
+            this.vaultEnabler.visitAdditionalData(data);
+
+            return data;
         },
 
         /**
@@ -313,12 +349,43 @@ define([
             return window.checkoutConfig.payment[this.getCode()].paymentAcceptanceMarkSrc;
         },
 
+        /**
+         * @returns {String}
+         */
+        getVaultCode: function () {
+            return window.checkoutConfig.payment[this.getCode()].vaultCode;
+        },
+
+        /**
+         * Check if need to skip order review
+         * @returns {Boolean}
+         */
+        isSkipOrderReview: function () {
+            return window.checkoutConfig.payment[this.getCode()].skipOrderReview;
+        },
+
+        /**
+         * Checks if vault is active
+         * @returns {Boolean}
+         */
+        isActiveVault: function () {
+            return this.vaultEnabler.isVaultEnabled() && this.vaultEnabler.isActivePaymentTokenEnabler();
+        },
+
+        /**
+         * Re-init PayPal Auth flow to use Vault
+         */
+        onVaultPaymentTokenEnablerChange: function () {
+            this.clientConfig.paypal.singleUse = !this.isActiveVault();
+            this.reInitPayPal();
+        },
+
         /**
          * Disable submit button
          */
         disableButton: function () {
             // stop any previous shown loaders
-            fullScreenLoader.stopLoader();
+            fullScreenLoader.stopLoader(true);
             fullScreenLoader.startLoader();
             $('[data-button="place"]').attr('disabled', 'disabled');
         },
@@ -329,6 +396,31 @@ define([
         enableButton: function () {
             $('[data-button="place"]').removeAttr('disabled');
             fullScreenLoader.stopLoader();
+        },
+
+        /**
+         * Triggers when customer click "Continue to PayPal" button
+         */
+        payWithPayPal: function () {
+            if (additionalValidators.validate()) {
+                Braintree.checkout.paypal.initAuthFlow();
+            }
+        },
+
+        /**
+         * Get button title
+         * @returns {String}
+         */
+        getButtonTitle: function () {
+            return this.isSkipOrderReview() ? 'Pay with PayPal' : 'Continue to PayPal';
+        },
+
+        /**
+         * Get button id
+         * @returns {String}
+         */
+        getButtonId: function () {
+            return this.getCode() + (this.isSkipOrderReview() ? '_pay_with' : '_continue_to');
         }
     });
 });
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
index 3c349afca754d..dc2b0bdf34128 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
@@ -6,12 +6,11 @@
 /*global define*/
 define([
     'jquery',
-    'Magento_Braintree/js/view/payment/method-renderer/cc-form',
     'Magento_Vault/js/view/payment/method-renderer/vault',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Ui/js/model/messageList',
     'Magento_Checkout/js/model/full-screen-loader'
-], function ($, Component, VaultComponent, Braintree, globalMessageList, fullScreenLoader) {
+], function ($, VaultComponent, Braintree, globalMessageList, fullScreenLoader) {
     'use strict';
 
     return VaultComponent.extend({
@@ -53,7 +52,7 @@ define([
             var self = this;
 
             /**
-             * Define on ready callback
+             * Define already callback
              */
             Braintree.onReady = function () {
                 self.getPaymentMethodNonce();
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
index 9d1dda23c2d84..cd080c83ecfea 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
@@ -7,9 +7,9 @@
 <div data-bind="attr: {class: 'payment-method payment-method-' + getCode()}, css: {'_active': isActive()}">
     <div class="payment-method-title field choice">
         <input type="radio"
-        name="payment[method]"
-        class="radio"
-        data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+            name="payment[method]"
+            class="radio"
+            data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
         <label class="label" data-bind="attr: {'for': getCode()}">
             <span data-bind="text: getTitle()"></span>
         </label>
@@ -109,8 +109,8 @@
                     <input type="checkbox"
                            name="vault[is_enabled]"
                            class="checkbox"
-                           data-bind="attr: {'id': getCode() + '_vault_enabler'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
-                    <label class="label" data-bind="attr: {'for': getCode() + '_vault_enabler'}">
+                           data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
+                    <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
                         <span><!-- ko i18n: 'Save for later use.'--><!-- /ko --></span>
                     </label>
                     <div class="field-tooltip toggle">
@@ -147,4 +147,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index f392d21b04091..a674299994c06 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -21,20 +21,57 @@
 
     <div class="payment-method-content">
         <each args="getRegion('messages')" render=""></each>
-        <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
+        <fieldset class="braintree-paypal-fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div id="paypal-container"></div>
         </fieldset>
         <div class="checkout-agreements-block">
             <each args="$parent.getRegion('before-place-order')" render=""></each>
         </div>
-        <div class="actions-toolbar">
+        <!-- ko if: (vaultEnabler.isVaultEnabled())-->
+        <div class="field choice" data-bind="visible: !isReviewRequired()">
+            <input type="checkbox"
+                   name="vault[is_enabled]"
+                   class="checkbox"
+                   data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
+            <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
+                <span><!-- ko i18n: 'Save for later use.'--><!-- /ko --></span>
+            </label>
+            <div class="field-tooltip toggle">
+                <span class="field-tooltip-action action-vault"
+                      tabindex="0"
+                      data-toggle="dropdown"
+                      data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
+                    <span translate="'What is this?'"></span>
+                </span>
+                <div class="field-tooltip-content"
+                     data-target="dropdown"
+                     translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
+            </div>
+        </div>
+        <!-- /ko -->
+        <div class="actions-toolbar braintree-paypal-actions" data-bind="visible: isReviewRequired()">
+            <div class="payment-method-item braintree-paypal-account">
+                <span class="payment-method-type">PayPal</span>
+                <span class="payment-method-description" text="customerEmail()"></span>
+            </div>
+            <div class="primary">
+                <button data-button="paypal-place" data-role="review-save"
+                        type="submit"
+                        data-bind="attr: {id: getCode() + '_place_order', title: $t('Place Order')}, enable: (isActive()), click: placeOrder"
+                        class="action primary checkout"
+                        disabled>
+                    <span translate="'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+        <div class="actions-toolbar" data-bind="visible: !isReviewRequired()">
             <div class="primary">
                 <button data-button="place" data-role="review-save"
                         type="submit"
-                        data-bind="attr: {title: $t('Continue to PayPal')}, enable: (isActive()), click: payWithPayPal"
+                        data-bind="attr: {id: getButtonId(), title: $t(getButtonTitle())}, enable: (isActive()), click: payWithPayPal"
                         class="action primary checkout"
                         disabled>
-                    <span translate="'Continue to PayPal'"></span>
+                    <span translate="getButtonTitle()"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal/vault.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal/vault.html
new file mode 100644
index 0000000000000..eef06f048cdc1
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal/vault.html
@@ -0,0 +1,47 @@
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="payment-method" css="'_active': (getId() === isChecked())">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="
+                    attr: {'id': getId()},
+                    value: getId(),
+                    click: selectPaymentMethod,
+                    checked: isChecked,
+                    visible: isRadioButtonVisible()"/>
+        <label class="label" data-bind="attr: {'for': getId()}">
+            <img data-bind="attr: {
+                'src': getPaymentIcon().url,
+                'width': getPaymentIcon().width,
+                'height': getPaymentIcon().height
+            }" class="payment-icon">
+            <span text="getPayerEmail()"></span>
+        </label>
+    </div>
+
+    <div class="payment-method-content">
+        <each args="getRegion('messages')" render=""></each>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                            click: beforePlaceOrder,
+                            attr: {title: $t('Place Order')}">
+                    <span translate="'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 7d8b464db3b34..34e1ad30ad434 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -498,8 +498,7 @@ public function setBaseFile($file)
         $path = [
             $this->_catalogProductMediaConfig->getBaseMediaPath(),
             'cache',
-            $this->_storeManager->getStore()->getId(),
-            $path[] = $this->getDestinationSubdir(),
+            $this->getDestinationSubdir(),
         ];
         if (!empty($this->_width) || !empty($this->_height)) {
             $path[] = "{$this->_width}x{$this->_height}";
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
index f4a791622f5d8..b8263eea4f553 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
@@ -180,7 +180,7 @@ public function testSetGetBaseFile()
         $this->image->setBaseFile('/somefile.png');
         $this->assertEquals('catalog/product/somefile.png', $this->image->getBaseFile());
         $this->assertEquals(
-            'catalog/product/cache/1//beff4985b56e3afdbeabfc89641a4582/somefile.png',
+            'catalog/product/cache//beff4985b56e3afdbeabfc89641a4582/somefile.png',
             $this->image->getNewFile()
         );
     }
@@ -300,7 +300,7 @@ public function testGetUrl()
         $this->testSetGetBaseFile();
         $url = $this->image->getUrl();
         $this->assertEquals(
-            'http://magento.com/media/catalog/product/cache/1//beff4985b56e3afdbeabfc89641a4582/somefile.png',
+            'http://magento.com/media/catalog/product/cache//beff4985b56e3afdbeabfc89641a4582/somefile.png',
             $url
         );
     }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js b/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
index ca9d6493a1674..9005015d2460e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
@@ -24,7 +24,7 @@ define([
             /**
              * Stop full page loader action
              *
-             * @param {Boolean} forceStop
+             * @param {Boolean} [forceStop]
              */
             stopLoader: function (forceStop) {
                 var $elem = $(containerId),
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/method-group.js b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/method-group.js
new file mode 100644
index 0000000000000..4236a215d7359
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/method-group.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+        'uiElement',
+        'mage/translate'
+], function (Element, $t) {
+    'use strict';
+
+    var DEFAULT_GROUP_ALIAS = 'default';
+
+    return Element.extend({
+        defaults: {
+            alias: DEFAULT_GROUP_ALIAS,
+            title: $t('Payment Method'),
+            sortOrder: 100,
+            displayArea: 'payment-methods-items-${ $.alias }'
+        },
+
+        /**
+         * Checks if group instance is default
+         *
+         * @returns {Boolean}
+         */
+        isDefault: function () {
+            return this.alias === DEFAULT_GROUP_ALIAS;
+        }
+    });
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
index 18f6b8479c229..918d305ee031b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
@@ -10,14 +10,22 @@ define([
     'Magento_Checkout/js/model/payment/method-list',
     'Magento_Checkout/js/model/payment/renderer-list',
     'uiLayout',
-    'Magento_Checkout/js/model/checkout-data-resolver'
-], function (_, ko, utils, Component, paymentMethods, rendererList, layout, checkoutDataResolver) {
+    'Magento_Checkout/js/model/checkout-data-resolver',
+    'mage/translate',
+    'uiRegistry'
+], function (_, ko, utils, Component, paymentMethods, rendererList, layout, checkoutDataResolver, $t, registry) {
     'use strict';
 
     return Component.extend({
         defaults: {
             template: 'Magento_Checkout/payment-methods/list',
-            visible: paymentMethods().length > 0
+            visible: paymentMethods().length > 0,
+            configDefaultGroup: {
+                name: 'methodGroup',
+                component: 'Magento_Checkout/js/model/payment/method-group'
+            },
+            paymentGroupsList: [],
+            defaultGroupTitle: $t('Select a new payment method')
         },
 
         /**
@@ -26,7 +34,7 @@ define([
          * @returns {Component} Chainable.
          */
         initialize: function () {
-            this._super().initChildren();
+            this._super().initDefaulGroup().initChildren();
             paymentMethods.subscribe(
                 function (changes) {
                     checkoutDataResolver.resolvePaymentMethod();
@@ -47,6 +55,27 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        initObservable: function () {
+            this._super().
+                observe(['paymentGroupsList']);
+
+            return this;
+        },
+
+        /**
+         * Creates default group
+         *
+         * @returns {Component} Chainable.
+         */
+        initDefaulGroup: function() {
+            layout([
+                this.configDefaultGroup
+            ]);
+
+            return this;
+        },
+
         /**
          * Create renders for child payment methods.
          *
@@ -77,7 +106,7 @@ define([
             rendererTemplate = {
                 parent: '${ $.$data.parentName }',
                 name: '${ $.$data.name }',
-                displayArea: 'payment-method-items',
+                displayArea: payment.displayArea,
                 component: payment.component
             };
             rendererComponent = utils.template(rendererTemplate, templateData);
@@ -95,49 +124,105 @@ define([
          * @param {Object} paymentMethodData
          */
         createRenderer: function (paymentMethodData) {
-            var isRendererForMethod = false;
+            var isRendererForMethod = false,
+                currentGroup;
+
+            registry.get(this.configDefaultGroup.name, function (defaultGroup) {
+                _.each(rendererList(), function (renderer) {
 
-            _.find(rendererList(), function (renderer) {
+                    if (renderer.hasOwnProperty('typeComparatorCallback') &&
+                        typeof renderer.typeComparatorCallback == 'function'
+                    ) {
+                        isRendererForMethod = renderer.typeComparatorCallback(renderer.type, paymentMethodData.method);
+                    } else {
+                        isRendererForMethod = renderer.type === paymentMethodData.method;
+                    }
 
-                if (renderer.hasOwnProperty('typeComparatorCallback') &&
-                    typeof renderer.typeComparatorCallback == 'function'
-                ) {
-                    isRendererForMethod = renderer.typeComparatorCallback(renderer.type, paymentMethodData.method);
-                } else {
-                    isRendererForMethod = renderer.type === paymentMethodData.method;
-                }
+                    if (isRendererForMethod) {
+                        currentGroup = renderer.group ? renderer.group : defaultGroup;
 
-                if (isRendererForMethod) {
-                    layout(
-                        [
+                        this.collectPaymentGroups(currentGroup);
+
+                        layout([
                             this.createComponent(
                                 {
                                     config: renderer.config,
                                     component: renderer.component,
                                     name: renderer.type,
                                     method: paymentMethodData.method,
-                                    item: paymentMethodData
+                                    item: paymentMethodData,
+                                    displayArea: currentGroup.displayArea
                                 }
-                            )
-                        ]
-                    );
-                }
+                            )]);
+                    }
+                }.bind(this));
             }.bind(this));
         },
 
+        /**
+         * Collects unique groups of available payment methods
+         *
+         * @param {Object} group
+         */
+        collectPaymentGroups: function (group) {
+            var groupsList = this.paymentGroupsList(),
+                isGroupExists = _.some(groupsList, function (existsGroup) {
+                    return existsGroup.alias === group.alias;
+                });
+
+            if (!isGroupExists) {
+                groupsList.push(group);
+                groupsList = _.sortBy(groupsList, function (existsGroup) {
+                    return existsGroup.sortOrder;
+                });
+                this.paymentGroupsList(groupsList);
+            }
+        },
+
+        /**
+         * Returns payment group title
+         *
+         * @param {Object} group
+         * @returns {String}
+         */
+        getGroupTitle: function (group) {
+            var title = group().title;
+
+            if (group().isDefault() && this.paymentGroupsList().length > 1) {
+                title = this.defaultGroupTitle;
+            }
+
+            return title + ':';
+        },
+
+        /**
+         * Checks if at least one payment method available
+         *
+         * @returns {String}
+         */
+        isPaymentMethodsAvailable: function () {
+            return _.some(this.paymentGroupsList(), function (group) {
+                return this.getRegion(group.displayArea)().length;
+            }, this);
+        },
+
         /**
          * Remove view renderer.
          *
          * @param {String} paymentMethodCode
          */
         removeRenderer: function (paymentMethodCode) {
-            var items = this.getRegion('payment-method-items');
+            var items;
+
+            _.each(this.paymentGroupsList(), function (group) {
+                items = this.getRegion(group.displayArea);
 
-            _.find(items(), function (value) {
-                if (value.item.method.indexOf(paymentMethodCode) === 0) {
-                    value.disposeSubscriptions();
-                    value.destroy();
-                }
+                _.find(items(), function (value) {
+                    if (value.item.method.indexOf(paymentMethodCode) === 0) {
+                        value.disposeSubscriptions();
+                        value.destroy();
+                    }
+                });
             }, this);
         }
     });
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
index 66769f37386d6..f6c41c62eeca6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
@@ -4,9 +4,19 @@
  * See COPYING.txt for license details.
  */
  -->
-<div class="items payment-methods">
-    <!-- ko foreach: { data: getRegion('payment-method-items'), as: 'element'}  -->
-        <!-- ko template: element.getTemplate() --><!-- /ko -->
-    <!-- /ko -->
+<div if="isPaymentMethodsAvailable()"
+     class="items payment-methods">
+    <div repeat="foreach: paymentGroupsList, item: '$group'"
+         class="payment-group">
+        <div if="getRegion($group().displayArea)().length"
+             translate="getGroupTitle($group)"
+             class="step-title"
+             data-role="title">
+        </div>
+        <each args="data: getRegion($group().displayArea), as: 'method'" render=""/>
+    </div>
+</div>
+<div ifnot="isPaymentMethodsAvailable()"
+     class="no-payments-block"
+     translate="'No Payment Methods'">
 </div>
-<!-- ko ifnot: getRegion('payment-method-items')().length > 0 --><div class="no-payments-block"><!-- ko i18n: 'No Payment Methods'--><!-- /ko --></div><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 292ece611e6b6..46467839da3fb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -5,7 +5,6 @@
  */
 -->
 <li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
-    <div class="step-title" data-bind="i18n: title" data-role="title"></div>
     <div id="checkout-step-payment"
          class="step-content"
          data-role="content"
diff --git a/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
new file mode 100644
index 0000000000000..881595f60e541
--- /dev/null
+++ b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Api\Data;
+
+/**
+ * Payment method interface.
+ *
+ * @api
+ */
+interface PaymentMethodInterface
+{
+    /**
+     * Get code.
+     *
+     * @return string
+     */
+    public function getCode();
+
+    /**
+     * Get title.
+     *
+     * @return string
+     */
+    public function getTitle();
+
+    /**
+     * Get store id.
+     *
+     * @return int
+     */
+    public function getStoreId();
+
+    /**
+     * Get is active.
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     */
+    public function getIsActive();
+}
diff --git a/app/code/Magento/Payment/Api/PaymentMethodListInterface.php b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
new file mode 100644
index 0000000000000..faf231562d9ed
--- /dev/null
+++ b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Api;
+
+/**
+ * Payment method list interface.
+ *
+ * @api
+ */
+interface PaymentMethodListInterface
+{
+    /**
+     * Get list of payment methods.
+     *
+     * @param int $storeId
+     * @return \Magento\Payment\Api\Data\PaymentMethodInterface[]
+     */
+    public function getList($storeId);
+
+    /**
+     * Get list of active payment methods.
+     *
+     * @param int $storeId
+     * @return \Magento\Payment\Api\Data\PaymentMethodInterface[]
+     */
+    public function getActiveList($storeId);
+}
diff --git a/app/code/Magento/Payment/Block/Form/Container.php b/app/code/Magento/Payment/Block/Form/Container.php
index cdcd4137159a1..d91c0e3dc39a4 100644
--- a/app/code/Magento/Payment/Block/Form/Container.php
+++ b/app/code/Magento/Payment/Block/Form/Container.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Payment\Block\Form;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Model\Method\AbstractMethod;
 
 /**
@@ -24,20 +25,38 @@ class Container extends \Magento\Framework\View\Element\Template
     /** @var  \Magento\Payment\Model\Checks\SpecificationFactory */
     protected $methodSpecificationFactory;
 
+    /**
+     * @var \Magento\Payment\Api\PaymentMethodListInterface
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var \Magento\Payment\Model\Method\InstanceFactory
+     */
+    private $paymentMethodInstanceFactory;
+
+    /**
+     * @var array
+     */
+    protected $additionalChecks;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Magento\Payment\Model\Checks\SpecificationFactory $methodSpecificationFactory
      * @param array $data
+     * @param array $additionalChecks
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Payment\Helper\Data $paymentHelper,
         \Magento\Payment\Model\Checks\SpecificationFactory $methodSpecificationFactory,
-        array $data = []
+        array $data = [],
+        array $additionalChecks = []
     ) {
         $this->_paymentHelper = $paymentHelper;
         $this->methodSpecificationFactory = $methodSpecificationFactory;
+        $this->additionalChecks = $additionalChecks;
         parent::__construct($context, $data);
     }
 
@@ -69,13 +88,17 @@ protected function _prepareLayout()
      */
     protected function _canUseMethod($method)
     {
-        return $this->methodSpecificationFactory->create(
+        $checks = array_merge(
             [
                 AbstractMethod::CHECK_USE_FOR_COUNTRY,
                 AbstractMethod::CHECK_USE_FOR_CURRENCY,
                 AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
-            ]
-        )->isApplicable(
+                AbstractMethod::CHECK_ZERO_TOTAL
+            ],
+            $this->additionalChecks
+        );
+
+        return $this->methodSpecificationFactory->create($checks)->isApplicable(
             $method,
             $this->getQuote()
         );
@@ -124,11 +147,11 @@ public function getMethods()
             $quote = $this->getQuote();
             $store = $quote ? $quote->getStoreId() : null;
             $methods = [];
-            $specification = $this->methodSpecificationFactory->create([AbstractMethod::CHECK_ZERO_TOTAL]);
-            foreach ($this->_paymentHelper->getStoreMethods($store, $quote) as $method) {
-                if ($this->_canUseMethod($method) && $specification->isApplicable($method, $this->getQuote())) {
-                    $this->_assignMethod($method);
-                    $methods[] = $method;
+            foreach ($this->getPaymentMethodList()->getActiveList($store) as $method) {
+                $methodInstance = $this->getPaymentMethodInstanceFactory()->create($method);
+                if ($methodInstance->isAvailable($quote) && $this->_canUseMethod($methodInstance)) {
+                    $this->_assignMethod($methodInstance);
+                    $methods[] = $methodInstance;
                 }
             }
             $this->setData('methods', $methods);
@@ -150,4 +173,36 @@ public function getSelectedMethodCode()
         }
         return false;
     }
+
+    /**
+     * Get payment method list.
+     *
+     * @return \Magento\Payment\Api\PaymentMethodListInterface
+     * @deprecated
+     */
+    private function getPaymentMethodList()
+    {
+        if ($this->paymentMethodList === null) {
+            $this->paymentMethodList = ObjectManager::getInstance()->get(
+                \Magento\Payment\Api\PaymentMethodListInterface::class
+            );
+        }
+        return $this->paymentMethodList;
+    }
+
+    /**
+     * Get payment method instance factory.
+     *
+     * @return \Magento\Payment\Model\Method\InstanceFactory
+     * @deprecated
+     */
+    private function getPaymentMethodInstanceFactory()
+    {
+        if ($this->paymentMethodInstanceFactory === null) {
+            $this->paymentMethodInstanceFactory = ObjectManager::getInstance()->get(
+                \Magento\Payment\Model\Method\InstanceFactory::class
+            );
+        }
+        return $this->paymentMethodInstanceFactory;
+    }
 }
diff --git a/app/code/Magento/Payment/Block/Info/Substitution.php b/app/code/Magento/Payment/Block/Info/Substitution.php
index 5cbc7ba325dea..c06212ebe7315 100644
--- a/app/code/Magento/Payment/Block/Info/Substitution.php
+++ b/app/code/Magento/Payment/Block/Info/Substitution.php
@@ -25,7 +25,7 @@ protected function _beforeToHtml()
         $container = $parentBlock->getParentBlock();
         if ($container) {
             $block = $this->_layout->createBlock(
-                'Magento\Framework\View\Element\Template',
+                \Magento\Framework\View\Element\Template::class,
                 '',
                 ['data' => ['method' => $this->getMethod(), 'template' => 'Magento_Payment::info/substitution.phtml']]
             );
diff --git a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
index 92dd860a28311..0ab98673d9afa 100644
--- a/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
+++ b/app/code/Magento/Payment/Gateway/Data/PaymentDataObjectFactory.php
@@ -65,7 +65,7 @@ public function create(InfoInterface $paymentInfo)
         $data['payment'] = $paymentInfo;
 
         return $this->objectManager->create(
-            'Magento\Payment\Gateway\Data\PaymentDataObject',
+            \Magento\Payment\Gateway\Data\PaymentDataObject::class,
             $data
         );
     }
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 78cde93ba6717..0c5518a5c4c9f 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -118,6 +118,7 @@ public function getMethodInstance($code)
      * @param null|string|bool|int $store
      * @param Quote|null $quote
      * @return AbstractMethod[]
+     * @deprecated
      */
     public function getStoreMethods($store = null, $quote = null)
     {
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
index e43026ce3718e..2cb288dba0773 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
@@ -34,9 +34,9 @@ public function create($salesModel)
     {
         $arguments = ['salesModel' => $salesModel];
         if ($salesModel instanceof \Magento\Quote\Model\Quote) {
-            return $this->_objectManager->create('Magento\Payment\Model\Cart\SalesModel\Quote', $arguments);
+            return $this->_objectManager->create(\Magento\Payment\Model\Cart\SalesModel\Quote::class, $arguments);
         } elseif ($salesModel instanceof \Magento\Sales\Model\Order) {
-            return $this->_objectManager->create('Magento\Payment\Model\Cart\SalesModel\Order', $arguments);
+            return $this->_objectManager->create(\Magento\Payment\Model\Cart\SalesModel\Order::class, $arguments);
         }
         throw new \InvalidArgumentException('Sales model has bad type!');
     }
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
index 8342b181d5e6f..cb7791cbc6d2d 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
@@ -31,8 +31,8 @@ public function __construct(DirectoryHelper $directoryHelper)
      */
     public function getCountry(Quote $quote)
     {
-        $address = $quote->isVirtual() ? $quote->getBillingAddress() : $quote->getShippingAddress();
-        return $address
+        $address = $quote->getBillingAddress() ? : $quote->getShippingAddress();
+        return (!empty($address) && !empty($address->getCountry()))
             ? $address->getCountry()
             : $this->directoryHelper->getDefaultCountry();
     }
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 24b543ca02d62..50c0f52e3f45b 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -70,12 +70,12 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
     /**
      * @var string
      */
-    protected $_formBlockType = 'Magento\Payment\Block\Form';
+    protected $_formBlockType = \Magento\Payment\Block\Form::class;
 
     /**
      * @var string
      */
-    protected $_infoBlockType = 'Magento\Payment\Block\Info';
+    protected $_infoBlockType = \Magento\Payment\Block\Info::class;
 
     /**
      * Payment Method feature
diff --git a/app/code/Magento/Payment/Model/Method/Adapter.php b/app/code/Magento/Payment/Model/Method/Adapter.php
index 1d693e11fe51f..07a4dcdef5f3c 100644
--- a/app/code/Magento/Payment/Model/Method/Adapter.php
+++ b/app/code/Magento/Payment/Model/Method/Adapter.php
@@ -268,14 +268,17 @@ public function isAvailable(CartInterface $quote = null)
         $checkResult = new DataObject();
         $checkResult->setData('is_available', true);
         try {
-            $validator = $this->getValidatorPool()->get('availability');
-            $result = $validator->validate(
-                [
-                    'payment' => $this->paymentDataObjectFactory->create($this->getInfoInstance())
-                ]
-            );
-
-            $checkResult->setData('is_available', $result->isValid());
+            $infoInstance = $this->getInfoInstance();
+            if ($infoInstance !== null) {
+                $validator = $this->getValidatorPool()->get('availability');
+                $result = $validator->validate(
+                    [
+                        'payment' => $this->paymentDataObjectFactory->create($infoInstance)
+                    ]
+                );
+
+                $checkResult->setData('is_available', $result->isValid());
+            }
         } catch (\Exception $e) {
             // pass
         }
diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
index c5dcfb727e37c..f5dd670b2ede4 100644
--- a/app/code/Magento/Payment/Model/Method/Cc.php
+++ b/app/code/Magento/Payment/Model/Method/Cc.php
@@ -19,12 +19,12 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
     /**
      * @var string
      */
-    protected $_formBlockType = 'Magento\Payment\Block\Form\Cc';
+    protected $_formBlockType = \Magento\Payment\Block\Form\Cc::class;
 
     /**
      * @var string
      */
-    protected $_infoBlockType = 'Magento\Payment\Block\Info\Cc';
+    protected $_infoBlockType = \Magento\Payment\Block\Info\Cc::class;
 
     /**
      * @var bool
@@ -127,28 +127,25 @@ public function validate()
                     //Solo, Switch or Maestro. International safe
                     'SO' => '/(^(6334)[5-9](\d{11}$|\d{13,14}$))|(^(6767)(\d{12}$|\d{14,15}$))/',
                     'SM' => '/(^(5[0678])\d{11,18}$)|(^(6[^05])\d{11,18}$)|(^(601)[^1]\d{9,16}$)|(^(6011)\d{9,11}$)' .
-                    '|(^(6011)\d{13,16}$)|(^(65)\d{11,13}$)|(^(65)\d{15,18}$)' .
-                    '|(^(49030)[2-9](\d{10}$|\d{12,13}$))|(^(49033)[5-9](\d{10}$|\d{12,13}$))' .
-                    '|(^(49110)[1-2](\d{10}$|\d{12,13}$))|(^(49117)[4-9](\d{10}$|\d{12,13}$))' .
-                    '|(^(49118)[0-2](\d{10}$|\d{12,13}$))|(^(4936)(\d{12}$|\d{14,15}$))/',
+                        '|(^(6011)\d{13,16}$)|(^(65)\d{11,13}$)|(^(65)\d{15,18}$)' .
+                        '|(^(49030)[2-9](\d{10}$|\d{12,13}$))|(^(49033)[5-9](\d{10}$|\d{12,13}$))' .
+                        '|(^(49110)[1-2](\d{10}$|\d{12,13}$))|(^(49117)[4-9](\d{10}$|\d{12,13}$))' .
+                        '|(^(49118)[0-2](\d{10}$|\d{12,13}$))|(^(4936)(\d{12}$|\d{14,15}$))/',
                     // Visa
                     'VI' => '/^4[0-9]{12}([0-9]{3})?$/',
                     // Master Card
-                    'MC' => '/^5[1-5][0-9]{14}$/',
+                    'MC' => '/^(?:5[1-5][0-9]{2}|222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}$/',
                     // American Express
                     'AE' => '/^3[47][0-9]{13}$/',
                     // Discover
-                    'DI' => '/^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})' .
-                    '|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}' .
-                    '|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}' .
-                    '|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}' .
-                    '|5[0-9]{14}))$/',
+                    'DI' => '/^(6011((0|9|[2-4])[0-9]{11,14}|(74|7[7-9]|8[6-9])[0-9]{10,13})|6(4[4-9][0-9]{13,16}|' .
+                        '5[0-9]{14,17}))/',
+                    'DN' => '/^3(0[0-5][0-9]{13,16}|095[0-9]{12,15}|(6|[8-9])[0-9]{14,17})/',
+                    // UnionPay
+                    'UN' => '/^622(1(2[6-9][0-9]{10,13}|[3-9][0-9]{11,14})|[3-8][0-9]{12,15}|9([[0-1][0-9]{11,14}|' .
+                        '2[0-5][0-9]{10,13}))|62[4-6][0-9]{13,16}|628[2-8][0-9]{12,15}/',
                     // JCB
-                    'JCB' => '/^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}' .
-                    '|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}' .
-                    '|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}' .
-                    '|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}' .
-                    '|5[0-9]{14}))$/',
+                    'JCB' => '/^35(2[8-9][0-9]{12,15}|[3-8][0-9]{13,16})/',
                     'MI' => '/^(5(0|[6-9])|63|67(?!59|6770|6774))\d*$/',
                     'MD' => '/^(6759(?!24|38|40|6[3-9]|70|76)|676770|676774)\d*$/',
                 ];
@@ -215,6 +212,8 @@ public function getVerificationRegEx()
             'MC' => '/^[0-9]{3}$/',
             'AE' => '/^[0-9]{4}$/',
             'DI' => '/^[0-9]{3}$/',
+            'DN' => '/^[0-9]{3}$/',
+            'UN' => '/^[0-9]{3}$/',
             'SS' => '/^[0-9]{3,4}$/',
             'SM' => '/^[0-9]{3,4}$/',
             'SO' => '/^[0-9]{3,4}$/',
diff --git a/app/code/Magento/Payment/Model/Method/InstanceFactory.php b/app/code/Magento/Payment/Model/Method/InstanceFactory.php
new file mode 100644
index 0000000000000..c273c71e78330
--- /dev/null
+++ b/app/code/Magento/Payment/Model/Method/InstanceFactory.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Model\Method;
+
+use Magento\Payment\Api\Data\PaymentMethodInterface;
+
+/**
+ * Payment method instance factory.
+ */
+class InstanceFactory
+{
+    /**
+     * @var \Magento\Payment\Helper\Data
+     */
+    private $helper;
+
+    /**
+     * @param \Magento\Payment\Helper\Data $helper
+     */
+    public function __construct(
+        \Magento\Payment\Helper\Data $helper
+    ) {
+        $this->helper = $helper;
+    }
+
+    /**
+     * Create payment method instance.
+     *
+     * @param PaymentMethodInterface $paymentMethod
+     * @return \Magento\Payment\Model\MethodInterface
+     */
+    public function create(PaymentMethodInterface $paymentMethod)
+    {
+        $methodInstance = $this->helper->getMethodInstance($paymentMethod->getCode());
+        $methodInstance->setStore($paymentMethod->getStoreId());
+
+        return $methodInstance;
+    }
+}
diff --git a/app/code/Magento/Payment/Model/Method/Substitution.php b/app/code/Magento/Payment/Model/Method/Substitution.php
index 375f4452494d3..3d2ca06609783 100644
--- a/app/code/Magento/Payment/Model/Method/Substitution.php
+++ b/app/code/Magento/Payment/Model/Method/Substitution.php
@@ -31,7 +31,7 @@ class Substitution extends AbstractMethod
     /**
      * @var string
      */
-    protected $_infoBlockType = 'Magento\Payment\Block\Info\Substitution';
+    protected $_infoBlockType = \Magento\Payment\Block\Info\Substitution::class;
 
     /**
      * Retrieve payment method title
diff --git a/app/code/Magento/Payment/Model/MethodList.php b/app/code/Magento/Payment/Model/MethodList.php
index df0ddb9ed4b0c..ff1f786c77f61 100644
--- a/app/code/Magento/Payment/Model/MethodList.php
+++ b/app/code/Magento/Payment/Model/MethodList.php
@@ -6,12 +6,14 @@
 
 namespace Magento\Payment\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Model\Method\AbstractMethod;
 
 class MethodList
 {
     /**
      * @var \Magento\Payment\Helper\Data
+     * @deprecated
      */
     protected $paymentHelper;
 
@@ -20,6 +22,16 @@ class MethodList
      */
     protected $methodSpecificationFactory;
 
+    /**
+     * @var \Magento\Payment\Api\PaymentMethodListInterface
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var \Magento\Payment\Model\Method\InstanceFactory
+     */
+    private $paymentMethodInstanceFactory;
+
     /**
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param Checks\SpecificationFactory $specificationFactory
@@ -40,14 +52,16 @@ public function __construct(
     public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         $store = $quote ? $quote->getStoreId() : null;
-        $methods = [];
-        foreach ($this->paymentHelper->getStoreMethods($store, $quote) as $method) {
-            if ($this->_canUseMethod($method, $quote)) {
-                $method->setInfoInstance($quote->getPayment());
-                $methods[] = $method;
+        $availableMethods = [];
+
+        foreach ($this->getPaymentMethodList()->getActiveList($store) as $method) {
+            $methodInstance = $this->getPaymentMethodInstanceFactory()->create($method);
+            if ($methodInstance->isAvailable($quote) && $this->_canUseMethod($methodInstance, $quote)) {
+                $methodInstance->setInfoInstance($quote->getPayment());
+                $availableMethods[] = $methodInstance;
             }
         }
-        return $methods;
+        return $availableMethods;
     }
 
     /**
@@ -61,6 +75,7 @@ protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface
     {
         return $this->methodSpecificationFactory->create(
             [
+                AbstractMethod::CHECK_USE_CHECKOUT,
                 AbstractMethod::CHECK_USE_FOR_COUNTRY,
                 AbstractMethod::CHECK_USE_FOR_CURRENCY,
                 AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
@@ -70,4 +85,36 @@ protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface
             $quote
         );
     }
+
+    /**
+     * Get payment method list.
+     *
+     * @return \Magento\Payment\Api\PaymentMethodListInterface
+     * @deprecated
+     */
+    private function getPaymentMethodList()
+    {
+        if ($this->paymentMethodList === null) {
+            $this->paymentMethodList = ObjectManager::getInstance()->get(
+                \Magento\Payment\Api\PaymentMethodListInterface::class
+            );
+        }
+        return $this->paymentMethodList;
+    }
+
+    /**
+     * Get payment method instance factory.
+     *
+     * @return \Magento\Payment\Model\Method\InstanceFactory
+     * @deprecated
+     */
+    private function getPaymentMethodInstanceFactory()
+    {
+        if ($this->paymentMethodInstanceFactory === null) {
+            $this->paymentMethodInstanceFactory = ObjectManager::getInstance()->get(
+                \Magento\Payment\Model\Method\InstanceFactory::class
+            );
+        }
+        return $this->paymentMethodInstanceFactory;
+    }
 }
diff --git a/app/code/Magento/Payment/Model/PaymentMethod.php b/app/code/Magento/Payment/Model/PaymentMethod.php
new file mode 100644
index 0000000000000..581c4703f777e
--- /dev/null
+++ b/app/code/Magento/Payment/Model/PaymentMethod.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Model;
+
+/**
+ * Payment method class.
+ */
+class PaymentMethod implements \Magento\Payment\Api\Data\PaymentMethodInterface
+{
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * @var string
+     */
+    private $title;
+
+    /**
+     * @var int
+     */
+    private $storeId;
+
+    /**
+     * @var bool
+     */
+    private $isActive;
+
+    /**
+     * @param string $code
+     * @param string $title
+     * @param int $storeId
+     * @param bool $isActive
+     */
+    public function __construct($code, $title, $storeId, $isActive)
+    {
+        $this->code = $code;
+        $this->title = $title;
+        $this->storeId = $storeId;
+        $this->isActive = $isActive;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreId()
+    {
+        return $this->storeId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIsActive()
+    {
+        return $this->isActive;
+    }
+}
diff --git a/app/code/Magento/Payment/Model/PaymentMethodList.php b/app/code/Magento/Payment/Model/PaymentMethodList.php
new file mode 100644
index 0000000000000..5968d201ca686
--- /dev/null
+++ b/app/code/Magento/Payment/Model/PaymentMethodList.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Model;
+
+use Magento\Payment\Api\Data\PaymentMethodInterface;
+
+/**
+ * Payment method list class.
+ */
+class PaymentMethodList implements \Magento\Payment\Api\PaymentMethodListInterface
+{
+    /**
+     * @var \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory
+     */
+    private $methodFactory;
+
+    /**
+     * @var \Magento\Payment\Helper\Data
+     */
+    private $helper;
+
+    /**
+     * @param \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory
+     * @param \Magento\Payment\Helper\Data $helper
+     */
+    public function __construct(
+        \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory,
+        \Magento\Payment\Helper\Data $helper
+    ) {
+        $this->methodFactory = $methodFactory;
+        $this->helper = $helper;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getList($storeId)
+    {
+        $methodsCodes = array_keys($this->helper->getPaymentMethods());
+
+        $methodsInstances = array_map(
+            function ($code) {
+                return $this->helper->getMethodInstance($code);
+            },
+            $methodsCodes
+        );
+
+        $methodsInstances = array_filter($methodsInstances, function (MethodInterface $method) {
+            return !($method instanceof \Magento\Payment\Model\Method\Substitution);
+        });
+
+        @uasort(
+            $methodsInstances,
+            function (MethodInterface $a, MethodInterface $b) use ($storeId) {
+                return (int)$a->getConfigData('sort_order', $storeId) - (int)$b->getConfigData('sort_order', $storeId);
+            }
+        );
+
+        $methodList = array_map(
+            function (MethodInterface $methodInstance) use ($storeId) {
+
+                return $this->methodFactory->create([
+                    'code' => (string)$methodInstance->getCode(),
+                    'title' => (string)$methodInstance->getTitle(),
+                    'storeId' => (int)$storeId,
+                    'isActive' => (bool)$methodInstance->isActive($storeId)
+                ]);
+            },
+            $methodsInstances
+        );
+
+        return array_values($methodList);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getActiveList($storeId)
+    {
+        $methodList = array_filter(
+            $this->getList($storeId),
+            function (PaymentMethodInterface $method) {
+                return $method->getIsActive();
+            }
+        );
+
+        return array_values($methodList);
+    }
+}
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
index c87b597825d1c..7b156f244165c 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
@@ -32,25 +32,25 @@ protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
 
-        $this->requestMock = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->setMethods(['getParam'])
             ->getMockForAbstractClass();
 
-        $this->urlBuilderMock = $this->getMockBuilder('\Magento\Framework\UrlInterface')
+        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->setMethods(['getUrl'])
             ->getMockForAbstractClass();
 
-        $context = $objectManagerHelper->getObject('Magento\Framework\View\Element\Template\Context');
+        $context = $objectManagerHelper->getObject(\Magento\Framework\View\Element\Template\Context::class);
 
-        $this->methodMock = $this->getMockBuilder('Magento\Payment\Model\Method\TransparentInterface')
+        $this->methodMock = $this->getMockBuilder(\Magento\Payment\Model\Method\TransparentInterface::class)
             ->getMock();
 
-        $this->checkoutSessionMock = $this->getMockBuilder('Magento\Checkout\Model\Session')
+        $this->checkoutSessionMock = $this->getMockBuilder(\Magento\Checkout\Model\Session::class)
             ->setMethods([])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $paymentConfigMock = $this->getMockBuilder('Magento\Payment\Model\Config')
+        $paymentConfigMock = $this->getMockBuilder(\Magento\Payment\Model\Config::class)
             ->setMethods([])
             ->disableOriginalConstructor()
             ->getMock();
@@ -64,10 +64,10 @@ protected function setUp()
 
     public function testToHtmlShouldRender()
     {
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $paymentMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Payment')
+        $paymentMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php b/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
index 4cb09ba321c3c..e6de90409de1d 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
@@ -17,8 +17,8 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
     public function testSetMethodFormTemplate()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $childBlockA = $objectManagerHelper->getObject('Magento\Framework\View\Element\Template');
-        $childBlockB = $objectManagerHelper->getObject('Magento\Framework\View\Element\Template');
+        $childBlockA = $objectManagerHelper->getObject(\Magento\Framework\View\Element\Template::class);
+        $childBlockB = $objectManagerHelper->getObject(\Magento\Framework\View\Element\Template::class);
 
         $func = function ($blockName) use ($childBlockA, $childBlockB) {
             switch ($blockName) {
@@ -29,7 +29,7 @@ public function testSetMethodFormTemplate()
             }
             return null;
         };
-        $block = $this->getMock('Magento\Payment\Block\Form\Container', ['getChildBlock'], [], '', false);
+        $block = $this->getMock(\Magento\Payment\Block\Form\Container::class, ['getChildBlock'], [], '', false);
         $block->expects($this->atLeastOnce())->method('getChildBlock')->will($this->returnCallback($func));
 
         $template = 'any_template.phtml';
diff --git a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
index 0524358d6562f..ac207c02b0691 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
@@ -35,26 +35,26 @@ class FormTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_storeManager = $this->getMockBuilder(
-            '\Magento\Store\Model\StoreManager'
+        $this->_storeManager = $this->getMockBuilder(
+            \Magento\Store\Model\StoreManager::class
         )->setMethods(
                 ['getStore']
             )->disableOriginalConstructor()->getMock();
-        $this->_eventManager = $this->getMockBuilder(
-            '\Magento\Framework\Event\ManagerInterface'
+        $this->_eventManager = $this->getMockBuilder(
+            \Magento\Framework\Event\ManagerInterface::class
         )->setMethods(
                 ['dispatch']
             )->disableOriginalConstructor()->getMock();
-        $this->_escaper = $this->getMock('\Magento\Framework\Escaper', null, [], '', true);
-        $context = $helper->getObject(
-            'Magento\Framework\View\Element\Template\Context',
+        $this->_escaper = $this->getMock(\Magento\Framework\Escaper::class, null, [], '', true);
+        $context = $helper->getObject(
+            \Magento\Framework\View\Element\Template\Context::class,
             [
                 'storeManager' => $this->_storeManager,
                 'eventManager' => $this->_eventManager,
                 'escaper' => $this->_escaper
             ]
         );
-        $this->_object = $helper->getObject('Magento\Payment\Block\Form', ['context' => $context]);
+        $this->_object = $helper->getObject(\Magento\Payment\Block\Form::class, ['context' => $context]);
     }
 
     /**
@@ -69,7 +69,7 @@ public function testGetMethodException()
 
     public function testGetMethodCode()
     {
-        $method = $this->getMock('Magento\Payment\Model\MethodInterface', [], [], '', false);
+        $method = $this->getMock(\Magento\Payment\Model\MethodInterface::class, [], [], '', false);
         $method->expects($this->once())
             ->method('getCode')
             ->will($this->returnValue('method_code'));
@@ -82,7 +82,7 @@ public function testGetMethodCode()
      */
     public function testGetInfoData($field, $value, $expected)
     {
-        $methodInstance = $this->getMockBuilder('\Magento\Payment\Model\Method\AbstractMethod')
+        $methodInstance = $this->getMockBuilder(\Magento\Payment\Model\Method\AbstractMethod::class)
             ->setMethods(['getData'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -90,8 +90,8 @@ public function testGetInfoData($field, $value, $expected)
             ->method('getData')
             ->with($field)
             ->will($this->returnValue($value));
-        $method = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+        $method = $this->getMockBuilder(
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $method->expects($this->any())
             ->method('getInfoInstance')
@@ -118,7 +118,7 @@ public function getInfoDataProvider()
 
     public function testSetMethod()
     {
-        $methodInterfaceMock = $this->getMockBuilder('\Magento\Payment\Model\MethodInterface')
+        $methodInterfaceMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
 
         $this->assertSame($this->_object, $this->_object->setMethod($methodInterfaceMock));
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/CcTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/CcTest.php
index 744beb6634a85..3d75aaa39be34 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/CcTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/CcTest.php
@@ -31,14 +31,26 @@ class CcTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->paymentConfig = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
-        $this->localeDate = $this->getMock('Magento\Framework\Stdlib\DateTime\TimezoneInterface', [], [], '', false);
-        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', ['getLocaleDate'], [], '', false);
+        $this->paymentConfig = $this->getMock(\Magento\Payment\Model\Config::class, [], [], '', false);
+        $this->localeDate = $this->getMock(
+            \Magento\Framework\Stdlib\DateTime\TimezoneInterface::class,
+            [],
+            [],
+            '',
+            false
+        );
+        $context = $this->getMock(
+            \Magento\Framework\View\Element\Template\Context::class,
+            ['getLocaleDate'],
+            [],
+            '',
+            false
+        );
         $context->expects($this->any())
             ->method('getLocaleDate')
             ->will($this->returnValue($this->localeDate));
         $this->model = $this->objectManager->getObject(
-            'Magento\Payment\Block\Info\Cc',
+            \Magento\Payment\Block\Info\Cc::class,
             [
                 'paymentConfig' => $this->paymentConfig,
                 'context' => $context
@@ -54,7 +66,7 @@ public function testGetCcTypeName($configCcTypes, $ccType, $expected)
         $this->paymentConfig->expects($this->any())
             ->method('getCcTypes')
             ->will($this->returnValue($configCcTypes));
-        $paymentInfo = $this->getMock('Magento\Payment\Model\Info', ['getCcType'], [], '', false);
+        $paymentInfo = $this->getMock(\Magento\Payment\Model\Info::class, ['getCcType'], [], '', false);
         $paymentInfo->expects($this->any())
             ->method('getCcType')
             ->will($this->returnValue($ccType));
@@ -79,7 +91,13 @@ public function getCcTypeNameDataProvider()
      */
     public function testHasCcExpDate($ccExpMonth, $ccExpYear, $expected)
     {
-        $paymentInfo = $this->getMock('Magento\Payment\Model\Info', ['getCcExpMonth', 'getCcExpYear'], [], '', false);
+        $paymentInfo = $this->getMock(
+            \Magento\Payment\Model\Info::class,
+            ['getCcExpMonth', 'getCcExpYear'],
+            [],
+            '',
+            false
+        );
         $paymentInfo->expects($this->any())
             ->method('getCcExpMonth')
             ->will($this->returnValue($ccExpMonth));
@@ -107,7 +125,7 @@ public function hasCcExpDateDataProvider()
      */
     public function testGetCcExpMonth($ccExpMonth, $expected)
     {
-        $paymentInfo = $this->getMock('Magento\Payment\Model\Info', ['getCcExpMonth'], [], '', false);
+        $paymentInfo = $this->getMock(\Magento\Payment\Model\Info::class, ['getCcExpMonth'], [], '', false);
         $paymentInfo->expects($this->any())
             ->method('getCcExpMonth')
             ->will($this->returnValue($ccExpMonth));
@@ -131,7 +149,13 @@ public function ccExpMonthDataProvider()
      */
     public function testGetCcExpDate($ccExpMonth, $ccExpYear)
     {
-        $paymentInfo = $this->getMock('Magento\Payment\Model\Info', ['getCcExpMonth', 'getCcExpYear'], [], '', false);
+        $paymentInfo = $this->getMock(
+            \Magento\Payment\Model\Info::class,
+            ['getCcExpMonth', 'getCcExpYear'],
+            [],
+            '',
+            false
+        );
         $paymentInfo
             ->expects($this->any())
             ->method('getCcExpMonth')
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/ContainerAbstractTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/ContainerAbstractTest.php
index 7555a39917c43..5c87fb4ca28eb 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/ContainerAbstractTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/ContainerAbstractTest.php
@@ -14,19 +14,19 @@ class ContainerAbstractTest extends \PHPUnit_Framework_TestCase
     public function testSetInfoTemplate()
     {
         $block = $this->getMock(
-            'Magento\Payment\Block\Info\AbstractContainer',
+            \Magento\Payment\Block\Info\AbstractContainer::class,
             ['getChildBlock', 'getPaymentInfo'],
             [],
             '',
             false
         );
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $paymentInfo = $objectManagerHelper->getObject('Magento\Payment\Model\Info');
-        $methodInstance = $objectManagerHelper->getObject('Magento\OfflinePayments\Model\Checkmo');
+        $paymentInfo = $objectManagerHelper->getObject(\Magento\Payment\Model\Info::class);
+        $methodInstance = $objectManagerHelper->getObject(\Magento\OfflinePayments\Model\Checkmo::class);
         $paymentInfo->setMethodInstance($methodInstance);
         $block->expects($this->atLeastOnce())->method('getPaymentInfo')->will($this->returnValue($paymentInfo));
 
-        $childBlock = $objectManagerHelper->getObject('Magento\Framework\View\Element\Template');
+        $childBlock = $objectManagerHelper->getObject(\Magento\Framework\View\Element\Template::class);
         $block->expects(
             $this->atLeastOnce()
         )->method(
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
index ab8171e262d5e..40efa750c596e 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
@@ -23,9 +23,9 @@ class InstructionsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $context = $this->getMock(\Magento\Framework\View\Element\Template\Context::class, [], [], '', false);
         $this->_instructions = new \Magento\Payment\Block\Info\Instructions($context);
-        $this->_info = $this->getMock('Magento\Payment\Model\Info', [], [], '', false);
+        $this->_info = $this->getMock(\Magento\Payment\Model\Info::class, [], [], '', false);
         $this->_instructions->setData('info', $this->_info);
     }
 
@@ -44,7 +44,7 @@ public function testGetInstructionAdditionalInformation()
     public function testGetInstruction()
     {
         $methodInstance = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $methodInstance->expects($this->once())
             ->method('getConfigData')
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
index 97286561fad41..fb8f720b4735d 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
@@ -8,6 +8,9 @@
 
 namespace Magento\Payment\Test\Unit\Block\Info;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SubstitutionTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -30,19 +33,19 @@ protected function setUp()
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->layout = $this->getMockBuilder(
-            'Magento\Framework\View\LayoutInterface'
+            \Magento\Framework\View\LayoutInterface::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
 
         $eventManager = $this->getMockBuilder(
-            'Magento\Framework\Event\ManagerInterface'
+            \Magento\Framework\Event\ManagerInterface::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
 
         $scopeConfig = $this->getMockBuilder(
-            'Magento\Framework\App\Config\ScopeConfigInterface'
+            \Magento\Framework\App\Config\ScopeConfigInterface::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
@@ -62,7 +65,7 @@ protected function setUp()
         );
 
         $context = $this->getMockBuilder(
-            'Magento\Framework\View\Element\Template\Context'
+            \Magento\Framework\View\Element\Template\Context::class
         )->disableOriginalConstructor()->setMethods(
             ['getLayout', 'getEventManager', 'getScopeConfig']
         )->getMock();
@@ -95,7 +98,7 @@ protected function setUp()
         );
 
         $this->block = $this->objectManager->getObject(
-            'Magento\Payment\Block\Info\Substitution',
+            \Magento\Payment\Block\Info\Substitution::class,
             [
                 'context' => $context,
                 'data' => [
@@ -108,7 +111,7 @@ protected function setUp()
     public function testBeforeToHtml()
     {
         $abstractBlock = $this->getMockBuilder(
-            'Magento\Framework\View\Element\AbstractBlock'
+            \Magento\Framework\View\Element\AbstractBlock::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
@@ -120,12 +123,12 @@ public function testBeforeToHtml()
         $this->layout->expects($this->any())->method('getBlock')->will($this->returnValue($abstractBlock));
 
         $infoMock = $this->getMockBuilder(
-            'Magento\Payment\Model\Info'
+            \Magento\Payment\Model\Info::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
         $methodMock = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $infoMock->expects($this->once())->method('getMethodInstance')->will($this->returnValue($methodMock));
         $this->block->setInfo($infoMock);
@@ -136,7 +139,7 @@ public function testBeforeToHtml()
         )->method(
             'createBlock'
         )->with(
-            'Magento\Framework\View\Element\Template',
+            \Magento\Framework\View\Element\Template::class,
             '',
             ['data' => ['method' => $methodMock, 'template' => 'Magento_Payment::info/substitution.phtml']]
         )->will(
diff --git a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
index 913f570410a0a..6799e2156200f 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
@@ -33,25 +33,25 @@ protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_storeManager = $this->getMockBuilder(
-            '\Magento\Store\Model\StoreManager'
+            \Magento\Store\Model\StoreManager::class
         )->setMethods(
             ['getStore']
         )->disableOriginalConstructor()->getMock();
         $this->_eventManager = $this->getMockBuilder(
-            '\Magento\Framework\Event\ManagerInterface'
+            \Magento\Framework\Event\ManagerInterface::class
         )->setMethods(
             ['dispatch']
         )->disableOriginalConstructor()->getMock();
-        $this->_escaper = $this->getMock('\Magento\Framework\Escaper', null, [], '', true);
+        $this->_escaper = $this->getMock(\Magento\Framework\Escaper::class, null, [], '', true);
         $context = $helper->getObject(
-            'Magento\Framework\View\Element\Template\Context',
+            \Magento\Framework\View\Element\Template\Context::class,
             [
                 'storeManager' => $this->_storeManager,
                 'eventManager' => $this->_eventManager,
                 'escaper' => $this->_escaper
             ]
         );
-        $this->_object = $helper->getObject('Magento\Payment\Block\Info', ['context' => $context]);
+        $this->_object = $helper->getObject(\Magento\Payment\Block\Info::class, ['context' => $context]);
     }
 
     /**
@@ -73,7 +73,8 @@ public function testGetIsSecureMode($isSecureMode, $methodInstance, $store, $sto
             $this->_storeManager->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
         }
 
-        $paymentInfo = $this->getMockBuilder('\Magento\Payment\Model\Info')->disableOriginalConstructor()->getMock();
+        $paymentInfo = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
+            ->disableOriginalConstructor()->getMock();
         $paymentInfo->expects($this->any())->method('getMethodInstance')->will($this->returnValue($methodInstance));
 
         $this->_object->setData('info', $paymentInfo);
@@ -101,7 +102,7 @@ public function getIsSecureModeDataProvider()
     protected function _getMethodInstanceMock($store)
     {
         $methodInstance = $this->getMockBuilder(
-            '\Magento\Payment\Model\Method\AbstractMethod'
+            \Magento\Payment\Model\Method\AbstractMethod::class
         )->setMethods(
             ['getStore']
         )->disableOriginalConstructor()->getMock();
@@ -115,7 +116,7 @@ protected function _getMethodInstanceMock($store)
      */
     protected function _getStoreMock($storeCode)
     {
-        $storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')->disableOriginalConstructor()->getMock();
+        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
         $storeMock->expects($this->any())->method('getCode')->will($this->returnValue($storeCode));
         return $storeMock;
     }
@@ -131,7 +132,8 @@ public function testGetInfoThrowException()
 
     public function testGetSpecificInformation()
     {
-        $paymentInfo = $this->getMockBuilder('\Magento\Payment\Model\Info')->disableOriginalConstructor()->getMock();
+        $paymentInfo = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
+            ->disableOriginalConstructor()->getMock();
 
         $this->_object->setData('info', $paymentInfo);
         $this->_object->getSpecificInformation();
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
index ad33b4cd37407..2366508c2d348 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
@@ -12,6 +12,9 @@
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Model\Method\TransparentInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FormTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -43,31 +46,31 @@ protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
 
-        $this->requestMock = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->setMethods(['getParam'])
             ->getMockForAbstractClass();
 
-        $this->urlBuilderMock = $this->getMockBuilder('\Magento\Framework\UrlInterface')
+        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->setMethods(['getUrl'])
             ->getMockForAbstractClass();
 
         $context = $objectManagerHelper->getObject(
-            'Magento\Framework\View\Element\Template\Context',
+            \Magento\Framework\View\Element\Template\Context::class,
             [
                 'request' => $this->requestMock,
                 'urlBuilder' => $this->urlBuilderMock
             ]
         );
 
-        $this->methodMock = $this->getMockBuilder('Magento\Payment\Model\Method\TransparentInterface')
+        $this->methodMock = $this->getMockBuilder(\Magento\Payment\Model\Method\TransparentInterface::class)
             ->getMock();
 
-        $this->checkoutSessionMock = $this->getMockBuilder('Magento\Checkout\Model\Session')
+        $this->checkoutSessionMock = $this->getMockBuilder(\Magento\Checkout\Model\Session::class)
             ->setMethods([])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $paymentConfigMock = $this->getMockBuilder('Magento\Payment\Model\Config')
+        $paymentConfigMock = $this->getMockBuilder(\Magento\Payment\Model\Config::class)
             ->setMethods([])
             ->disableOriginalConstructor()
             ->getMock();
@@ -113,7 +116,7 @@ public function testGetMethodConfigData($fieldName, $fieldValue, $expected)
      */
     private function initializeMethodWithConfigMock(array $configMap = [])
     {
-        $configInterface = $this->getMockBuilder('Magento\Payment\Model\Method\ConfigInterface')
+        $configInterface = $this->getMockBuilder(\Magento\Payment\Model\Method\ConfigInterface::class)
             ->getMock();
 
         $configInterface->expects($this->any())
@@ -234,10 +237,10 @@ public function testGetCardFieldsMap()
 
     public function testToHtmlShouldRender()
     {
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $paymentMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Payment')
+        $paymentMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -265,7 +268,7 @@ public function testToHtmlShouldNotRenderEmptyQuote()
 
     public function testToHtmlShouldNotRenderEmptyPayment()
     {
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -288,11 +291,11 @@ public function testGetMethodSuccess()
     public function testGetMethodNotTransparentInterface()
     {
         $this->setExpectedException(
-            'Magento\Framework\Exception\LocalizedException',
+            \Magento\Framework\Exception\LocalizedException::class,
             __('We cannot retrieve the transparent payment method model object.')
         );
 
-        $methodMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
 
         $this->form->setMethod($methodMock);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php
index 4327cda62bdb3..6cecb6f7ac43a 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php
@@ -12,13 +12,13 @@ class CommandPoolTest extends \PHPUnit_Framework_TestCase
 {
     public function testGet()
     {
-        $commandI = $this->getMockBuilder('Magento\Payment\Gateway\CommandInterface')
+        $commandI = $this->getMockBuilder(\Magento\Payment\Gateway\CommandInterface::class)
             ->getMockForAbstractClass();
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -26,7 +26,7 @@ public function testGet()
             ->method('create')
             ->with(
                 [
-                    'array' => ['Magento\Payment\Gateway\CommandInterface'],
+                    'array' => [\Magento\Payment\Gateway\CommandInterface::class],
                     'type' => CommandInterface::class
                 ]
             )
@@ -40,20 +40,20 @@ public function testGet()
             ->with('command')
             ->willReturn($commandI);
 
-        $pool = new CommandPool($tMapFactory, ['Magento\Payment\Gateway\CommandInterface']);
+        $pool = new CommandPool($tMapFactory, [\Magento\Payment\Gateway\CommandInterface::class]);
 
         static::assertSame($commandI, $pool->get('command'));
     }
 
     public function testGetException()
     {
-        $this->setExpectedException('Magento\Framework\Exception\NotFoundException');
+        $this->setExpectedException(\Magento\Framework\Exception\NotFoundException::class);
 
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
index 8c42a625f1b55..ae939c881e4be 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
@@ -13,6 +13,9 @@
 use Magento\Payment\Gateway\Validator\ValidatorInterface;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class GatewayCommandTest extends \PHPUnit_Framework_TestCase
 {
     /** @var GatewayCommand */
@@ -86,12 +89,12 @@ public function testExecute()
         ];
         $response = ['response_field1' => 'response_value1'];
         $validationResult = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Validator\ResultInterface'
+            \Magento\Payment\Gateway\Validator\ResultInterface::class
         )
             ->getMockForAbstractClass();
 
         $transferO = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Http\TransferInterface'
+            \Magento\Payment\Gateway\Http\TransferInterface::class
         )
             ->getMockForAbstractClass();
 
@@ -127,7 +130,7 @@ public function testExecute()
     public function testExecuteValidationFail()
     {
         $this->setExpectedException(
-            'Magento\Payment\Gateway\Command\CommandException'
+            \Magento\Payment\Gateway\Command\CommandException::class
         );
 
         $commandSubject = ['authorize'];
@@ -141,12 +144,12 @@ public function testExecuteValidationFail()
             __('Failure #2'),
         ];
         $validationResult = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Validator\ResultInterface'
+            \Magento\Payment\Gateway\Validator\ResultInterface::class
         )
             ->getMockForAbstractClass();
 
         $transferO = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Http\TransferInterface'
+            \Magento\Payment\Gateway\Http\TransferInterface::class
         )
             ->getMockForAbstractClass();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
index d7f5f87fa83b4..d11b4ad562655 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
@@ -24,7 +24,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->getMockForAbstractClass();
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
index f6f494076ec62..9b7f2d8d22605 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
@@ -23,7 +23,7 @@ class ConfigValueHandlerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->configMock = $this->getMockBuilder('Magento\Payment\Gateway\ConfigInterface')
+        $this->configMock = $this->getMockBuilder(\Magento\Payment\Gateway\ConfigInterface::class)
             ->getMockForAbstractClass();
         $this->model = new ConfigValueHandler($this->configMock);
     }
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
index 9491df3b76d2e..ae49880c53d80 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
@@ -13,7 +13,7 @@ class ValueHandlerPoolTest extends \PHPUnit_Framework_TestCase
     public function testConstructorException()
     {
         $this->setExpectedException('LogicException');
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -25,17 +25,17 @@ public function testConstructorException()
 
     public function testGet()
     {
-        $defaultHandler = $this->getMockBuilder('Magento\Payment\Gateway\Config\ValueHandlerInterface')
+        $defaultHandler = $this->getMockBuilder(\Magento\Payment\Gateway\Config\ValueHandlerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $someValueHandler = $this->getMockBuilder('Magento\Payment\Gateway\Config\ValueHandlerInterface')
+        $someValueHandler = $this->getMockBuilder(\Magento\Payment\Gateway\Config\ValueHandlerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -44,8 +44,9 @@ public function testGet()
             ->with(
                 [
                     'array' => [
-                        ValueHandlerPool::DEFAULT_HANDLER => 'Magento\Payment\Gateway\Config\ValueHandlerInterface',
-                        'some_value' => 'Magento\Payment\Gateway\Config\ValueHandlerInterface'
+                        ValueHandlerPool::DEFAULT_HANDLER =>
+                            \Magento\Payment\Gateway\Config\ValueHandlerInterface::class,
+                        'some_value' => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class
                     ],
                     'type' => ValueHandlerInterface::class
                 ]
@@ -71,8 +72,8 @@ public function testGet()
         $pool = new ValueHandlerPool(
             $tMapFactory,
             [
-                ValueHandlerPool::DEFAULT_HANDLER => 'Magento\Payment\Gateway\Config\ValueHandlerInterface',
-                'some_value' => 'Magento\Payment\Gateway\Config\ValueHandlerInterface'
+                ValueHandlerPool::DEFAULT_HANDLER => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class,
+                'some_value' => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class
             ]
         );
         static::assertSame($someValueHandler, $pool->get('some_value'));
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
index fd8538b0994e8..7dd939fed7b46 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
@@ -23,7 +23,7 @@ class AddressAdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->orderAddressMock = $this->getMockBuilder('Magento\Sales\Api\Data\OrderAddressInterface')
+        $this->orderAddressMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderAddressInterface::class)
             ->getMockForAbstractClass();
 
         $this->model = new AddressAdapter($this->orderAddressMock);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
index ee83f7a2b0553..f128de111c2b1 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
@@ -29,12 +29,12 @@ class OrderAdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
+        $this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->addressAdapterFactoryMock =
-            $this->getMockBuilder('Magento\Payment\Gateway\Data\Order\AddressAdapterFactory')
+            $this->getMockBuilder(\Magento\Payment\Gateway\Data\Order\AddressAdapterFactory::class)
                 ->setMethods(['create'])
                 ->disableOriginalConstructor()
                 ->getMock();
@@ -73,10 +73,10 @@ public function testGetBillingAddressIsNull()
     public function testGetBillingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
-        $addressAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\AddressAdapterInterface')
+        $addressAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\AddressAdapterInterface::class)
             ->getMockForAbstractClass();
         /** @var \Magento\Sales\Api\Data\OrderAddressInterface $orderAddressMock */
-        $orderAddressMock = $this->getMockBuilder('Magento\Sales\Api\Data\OrderAddressInterface')
+        $orderAddressMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderAddressInterface::class)
             ->getMockForAbstractClass();
         $this->addressAdapterFactoryMock->expects($this->once())
             ->method('create')
@@ -97,10 +97,10 @@ public function testGetShippingAddressIsNull()
     public function testGetShippingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
-        $addressAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\AddressAdapterInterface')
+        $addressAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\AddressAdapterInterface::class)
             ->getMockForAbstractClass();
         /** @var \Magento\Sales\Api\Data\OrderAddressInterface $orderAddressMock */
-        $orderAddressMock = $this->getMockBuilder('Magento\Sales\Api\Data\OrderAddressInterface')
+        $orderAddressMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderAddressInterface::class)
             ->getMockForAbstractClass();
         $this->addressAdapterFactoryMock->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
index 1c192251da5d3..cf9e9f165007a 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
@@ -41,23 +41,23 @@ class PaymentDataObjectFactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
             ->getMockForAbstractClass();
 
         $this->orderAdapterFactoryMock =
-            $this->getMockBuilder('Magento\Payment\Gateway\Data\Order\OrderAdapterFactory')
+            $this->getMockBuilder(\Magento\Payment\Gateway\Data\Order\OrderAdapterFactory::class)
                 ->setMethods(['create'])
                 ->disableOriginalConstructor()
                 ->getMock();
 
         $this->quoteAdapterFactoryMock =
-            $this->getMockBuilder('Magento\Payment\Gateway\Data\Quote\QuoteAdapterFactory')
+            $this->getMockBuilder(\Magento\Payment\Gateway\Data\Quote\QuoteAdapterFactory::class)
                 ->setMethods(['create'])
                 ->disableOriginalConstructor()
                 ->getMock();
 
         $this->paymentDataObjectMock =
-            $this->getMock('Magento\Payment\Gateway\Data\PaymentDataObjectInterface');
+            $this->getMock(\Magento\Payment\Gateway\Data\PaymentDataObjectInterface::class);
 
         $this->model = new PaymentDataObjectFactory(
             $this->objectManagerMock,
@@ -69,17 +69,17 @@ protected function setUp()
     public function testCreatePaymentDataObjectFromOrder()
     {
         /** @var Order $orderMock */
-        $orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
+        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         /** @var OrderAdapter $orderAdapterMock */
-        $orderAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\Order\OrderAdapter')
+        $orderAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\Order\OrderAdapter::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         /** @var \Magento\Sales\Model\Order\Payment $paymentInfoMock */
-        $paymentInfoMock = $this->getMockBuilder('Magento\Sales\Model\Order\Payment')
+        $paymentInfoMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -95,7 +95,7 @@ public function testCreatePaymentDataObjectFromOrder()
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->with(
-                'Magento\Payment\Gateway\Data\PaymentDataObject',
+                \Magento\Payment\Gateway\Data\PaymentDataObject::class,
                 [
                     'order' => $orderAdapterMock,
                     'payment' => $paymentInfoMock
@@ -108,17 +108,17 @@ public function testCreatePaymentDataObjectFromOrder()
     public function testCreatePaymentDataObjectFromQuote()
     {
         /** @var \Magento\Quote\Model\Quote $quoteMock */
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         /** @var OrderAdapter $orderAdapterMock */
-        $quoteAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\Quote\QuoteAdapter')
+        $quoteAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\Quote\QuoteAdapter::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         /** @var \Magento\Quote\Model\Quote\Payment $paymentInfoMock */
-        $paymentInfoMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Payment')
+        $paymentInfoMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -134,7 +134,7 @@ public function testCreatePaymentDataObjectFromQuote()
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->with(
-                'Magento\Payment\Gateway\Data\PaymentDataObject',
+                \Magento\Payment\Gateway\Data\PaymentDataObject::class,
                 [
                     'order' => $quoteAdapterMock,
                     'payment' => $paymentInfoMock
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
index 1ff0bbe6b5d64..d28ad246367bc 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
@@ -29,10 +29,10 @@ class PaymentDataObjectTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->orderMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\OrderAdapterInterface')
+        $this->orderMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\OrderAdapterInterface::class)
             ->getMockForAbstractClass();
 
-        $this->paymentMock = $this->getMockBuilder('Magento\Payment\Model\InfoInterface')
+        $this->paymentMock = $this->getMockBuilder(\Magento\Payment\Model\InfoInterface::class)
             ->getMockForAbstractClass();
 
         $this->model = new PaymentDataObject($this->orderMock, $this->paymentMock);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
index 7af4957c0af11..4583732a82910 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
@@ -23,7 +23,7 @@ class AddressAdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->quoteAddressMock = $this->getMockBuilder('Magento\Quote\Api\Data\AddressInterface')
+        $this->quoteAddressMock = $this->getMockBuilder(\Magento\Quote\Api\Data\AddressInterface::class)
             ->getMockForAbstractClass();
 
         $this->model = new AddressAdapter($this->quoteAddressMock);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
index c5d111662a036..4864e3c25ad7c 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
@@ -29,10 +29,10 @@ class QuoteAdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
+        $this->quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
 
         $this->addressAdapterFactoryMock =
-            $this->getMockBuilder('Magento\Payment\Gateway\Data\Quote\AddressAdapterFactory')
+            $this->getMockBuilder(\Magento\Payment\Gateway\Data\Quote\AddressAdapterFactory::class)
                 ->setMethods(['create'])
                 ->disableOriginalConstructor()
                 ->getMock();
@@ -44,7 +44,9 @@ public function testGetCurrencyCode()
     {
         $expected = 'USD';
         /** @var \Magento\Quote\Api\Data\CurrencyInterface $currencyrMock */
-        $currencyMock = $this->getMockBuilder('Magento\Quote\Api\Data\CurrencyInterface')->getMockForAbstractClass();
+        $currencyMock = $this->getMockBuilder(
+            \Magento\Quote\Api\Data\CurrencyInterface::class
+        )->getMockForAbstractClass();
         $currencyMock->expects($this->once())->method('getBaseCurrencyCode')->willReturn($expected);
         $this->quoteMock->expects($this->once())->method('getCurrency')->willReturn($currencyMock);
         $this->assertEquals($expected, $this->model->getCurrencyCode());
@@ -61,7 +63,9 @@ public function testGetCustomerId()
     {
         $expected = 1;
         /** @var \Magento\Customer\Api\Data\CustomerInterface $customerMock */
-        $customerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')->getMockForAbstractClass();
+        $customerMock = $this->getMockBuilder(
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        )->getMockForAbstractClass();
         $customerMock->expects($this->once())->method('getId')->willReturn($expected);
         $this->quoteMock->expects($this->once())->method('getCustomer')->willReturn($customerMock);
         $this->assertEquals($expected, $this->model->getCustomerId());
@@ -77,10 +81,10 @@ public function testGetBillingAddressIsNull()
     public function testGetBillingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
-        $addressAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\AddressAdapterInterface')
+        $addressAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\AddressAdapterInterface::class)
             ->getMockForAbstractClass();
         /** @var \Magento\Quote\Api\Data\AddressInterface $quoteAddressMock */
-        $quoteAddressMock = $this->getMockBuilder('Magento\Quote\Api\Data\AddressInterface')
+        $quoteAddressMock = $this->getMockBuilder(\Magento\Quote\Api\Data\AddressInterface::class)
             ->getMockForAbstractClass();
         $this->addressAdapterFactoryMock->expects($this->once())
             ->method('create')
@@ -101,10 +105,10 @@ public function testGetShippingAddressIsNull()
     public function testGetShippingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
-        $addressAdapterMock = $this->getMockBuilder('Magento\Payment\Gateway\Data\AddressAdapterInterface')
+        $addressAdapterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\AddressAdapterInterface::class)
             ->getMockForAbstractClass();
         /** @var \Magento\Quote\Api\Data\AddressInterface $quoteAddressMock */
-        $quoteAddressMock = $this->getMockBuilder('Magento\Quote\Api\Data\AddressInterface')
+        $quoteAddressMock = $this->getMockBuilder(\Magento\Quote\Api\Data\AddressInterface::class)
             ->getMockForAbstractClass();
         $this->addressAdapterFactoryMock->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/SoapTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/SoapTest.php
index b8282228d7334..2a3ae9c306373 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/SoapTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/SoapTest.php
@@ -37,17 +37,18 @@ class SoapTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->logger = $this->getMockBuilder(
-            'Magento\Payment\Model\Method\Logger'
+            \Magento\Payment\Model\Method\Logger::class
         )
             ->disableOriginalConstructor()
             ->getMock();
         $this->clientFactory = $this->getMockBuilder(
-            'Magento\Framework\Webapi\Soap\ClientFactory'
+            \Magento\Framework\Webapi\Soap\ClientFactory::class
         )->getMock();
         $this->converter = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Http\ConverterInterface'
+            \Magento\Payment\Gateway\Http\ConverterInterface::class
         )->getMockForAbstractClass();
-        $this->client = $this->getMockBuilder('\SoapClient')
+        $this->client = $this->getMockBuilder(\SoapClient::class)
+            ->setMethods(['__setSoapHeaders', '__soapCall', '__getLastRequest'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -137,7 +138,7 @@ public function testPlaceRequestSoapException()
     private function getTransferObject()
     {
         $transferObject = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Http\TransferInterface'
+            \Magento\Payment\Gateway\Http\TransferInterface::class
         )->getMock();
 
         $transferObject->expects(static::any())
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
index d94b6f1d31d8e..17c2e9401c3d3 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
@@ -46,23 +46,23 @@ class ZendTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->converterMock = $this->getMockBuilder('Magento\Payment\Gateway\Http\ConverterInterface')
+        $this->converterMock = $this->getMockBuilder(\Magento\Payment\Gateway\Http\ConverterInterface::class)
             ->getMockForAbstractClass();
 
-        $this->zendClientFactoryMock = $this->getMockBuilder('Magento\Framework\HTTP\ZendClientFactory')
+        $this->zendClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->clientMock = $this->getMockBuilder('Magento\Framework\HTTP\ZendClient')
+        $this->clientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->loggerMock = $this->getMockBuilder('Magento\Payment\Model\Method\Logger')
+        $this->loggerMock = $this->getMockBuilder(\Magento\Payment\Model\Method\Logger::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->transferObjectMock = $this->getMockBuilder('Magento\Payment\Gateway\Http\TransferInterface')
+        $this->transferObjectMock = $this->getMockBuilder(\Magento\Payment\Gateway\Http\TransferInterface::class)
             ->getMockForAbstractClass();
 
         $this->model = new Zend(
@@ -77,7 +77,9 @@ public function testPlaceRequest()
         $this->setClientTransferObjects();
         $responseBody = 'Response body content';
 
-        $zendHttpResponseMock = $this->getMockBuilder('Zend_Http_Response')->disableOriginalConstructor()->getMock();
+        $zendHttpResponseMock = $this->getMockBuilder(
+            \Zend_Http_Response::class
+        )->disableOriginalConstructor()->getMock();
         $zendHttpResponseMock->expects($this->once())->method('getBody')->willReturn($responseBody);
 
         $this->clientMock->expects($this->once())->method('request')->willReturn($zendHttpResponseMock);
@@ -121,7 +123,9 @@ public function testPlaceRequestConvertResponseFail()
         $this->setClientTransferObjects();
         $responseBody = 'Response body content';
 
-        $zendHttpResponseMock = $this->getMockBuilder('Zend_Http_Response')->disableOriginalConstructor()->getMock();
+        $zendHttpResponseMock = $this->getMockBuilder(
+            \Zend_Http_Response::class
+        )->disableOriginalConstructor()->getMock();
         $zendHttpResponseMock->expects($this->once())->method('getBody')->willReturn($responseBody);
 
         $this->clientMock->expects($this->once())->method('request')->willReturn($zendHttpResponseMock);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Request/BuilderCompositeTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Request/BuilderCompositeTest.php
index fdc062210f81e..87049bddd0494 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Request/BuilderCompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Request/BuilderCompositeTest.php
@@ -12,11 +12,11 @@ class BuilderCompositeTest extends \PHPUnit_Framework_TestCase
 {
     public function testBuildEmpty()
     {
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -44,18 +44,18 @@ public function testBuildEmpty()
      */
     public function testBuild(array $expected)
     {
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $customerBuilder = $this->getMockBuilder('Magento\Payment\Gateway\Request\BuilderInterface')
+        $customerBuilder = $this->getMockBuilder(\Magento\Payment\Gateway\Request\BuilderInterface::class)
             ->getMockForAbstractClass();
-        $productBuilder = $this->getMockBuilder('Magento\Payment\Gateway\Request\BuilderInterface')
+        $productBuilder = $this->getMockBuilder(\Magento\Payment\Gateway\Request\BuilderInterface::class)
             ->getMockForAbstractClass();
-        $magentoBuilder = $this->getMockBuilder('Magento\Payment\Gateway\Request\BuilderInterface')
+        $magentoBuilder = $this->getMockBuilder(\Magento\Payment\Gateway\Request\BuilderInterface::class)
             ->getMockForAbstractClass();
 
         $customerBuilder->expects(static::once())
@@ -91,9 +91,9 @@ public function testBuild(array $expected)
             ->with(
                 [
                     'array' => [
-                        'customer' => 'Magento\Payment\Gateway\Request\BuilderInterface',
-                        'product' => 'Magento\Payment\Gateway\Request\BuilderInterface',
-                        'magento' => 'Magento\Payment\Gateway\Request\BuilderInterface'
+                        'customer' => \Magento\Payment\Gateway\Request\BuilderInterface::class,
+                        'product' => \Magento\Payment\Gateway\Request\BuilderInterface::class,
+                        'magento' => \Magento\Payment\Gateway\Request\BuilderInterface::class
                     ],
                     'type' => BuilderInterface::class
                 ]
@@ -106,9 +106,9 @@ public function testBuild(array $expected)
         $builder = new BuilderComposite(
             $tMapFactory,
             [
-                'customer' => 'Magento\Payment\Gateway\Request\BuilderInterface',
-                'product' => 'Magento\Payment\Gateway\Request\BuilderInterface',
-                'magento' => 'Magento\Payment\Gateway\Request\BuilderInterface'
+                'customer' => \Magento\Payment\Gateway\Request\BuilderInterface::class,
+                'product' => \Magento\Payment\Gateway\Request\BuilderInterface::class,
+                'magento' => \Magento\Payment\Gateway\Request\BuilderInterface::class
             ]
         );
 
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Response/HandlerChainTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Response/HandlerChainTest.php
index 2e556fb4f216f..b52e96af8bbae 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Response/HandlerChainTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Response/HandlerChainTest.php
@@ -12,15 +12,15 @@ class HandlerChainTest extends \PHPUnit_Framework_TestCase
 {
     public function testHandle()
     {
-        $handler1 = $this->getMockBuilder('Magento\Payment\Gateway\Response\HandlerInterface')
+        $handler1 = $this->getMockBuilder(\Magento\Payment\Gateway\Response\HandlerInterface::class)
             ->getMockForAbstractClass();
-        $handler2 = $this->getMockBuilder('Magento\Payment\Gateway\Response\HandlerInterface')
+        $handler2 = $this->getMockBuilder(\Magento\Payment\Gateway\Response\HandlerInterface::class)
             ->getMockForAbstractClass();
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -29,8 +29,8 @@ public function testHandle()
             ->with(
                 [
                     'array' => [
-                        'handler1' => 'Magento\Payment\Gateway\Response\HandlerInterface',
-                        'handler2' => 'Magento\Payment\Gateway\Response\HandlerInterface'
+                        'handler1' => \Magento\Payment\Gateway\Response\HandlerInterface::class,
+                        'handler2' => \Magento\Payment\Gateway\Response\HandlerInterface::class
                     ],
                     'type' => HandlerInterface::class
                 ]
@@ -52,8 +52,8 @@ public function testHandle()
         $chain = new HandlerChain(
             $tMapFactory,
             [
-                'handler1' => 'Magento\Payment\Gateway\Response\HandlerInterface',
-                'handler2' => 'Magento\Payment\Gateway\Response\HandlerInterface'
+                'handler1' => \Magento\Payment\Gateway\Response\HandlerInterface::class,
+                'handler2' => \Magento\Payment\Gateway\Response\HandlerInterface::class
             ]
         );
         $chain->handle($handlingSubject, $response);
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
index 8a429dbc88798..d36fda3fd6be5 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
@@ -27,13 +27,14 @@ class CountryValidatorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->configMock = $this->getMockBuilder('Magento\Payment\Gateway\ConfigInterface')
+        $this->configMock = $this->getMockBuilder(\Magento\Payment\Gateway\ConfigInterface::class)
             ->getMockForAbstractClass();
-        $this->resultFactoryMock = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ResultInterfaceFactory')
-            ->setMethods(['create'])
+        $this->resultFactoryMock = $this->getMockBuilder(
+            \Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class
+        )->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultMock = $this->getMockBuilder('Magento\Payment\Gateway\Validator\Result')
+        $this->resultMock = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\Result::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -43,7 +44,6 @@ protected function setUp()
         );
     }
 
-
     /**
      * @dataProvider validateAllowspecificTrueDataProvider
      */
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
index 50310adb42e8a..49e7ace9a0a5f 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
@@ -31,7 +31,7 @@ public function testResult($isValid, $failsDescription, $expectedIsValid, $expec
 
     public function resultDataProvider()
     {
-        $phraseMock = $this->getMockBuilder('Magento\Framework\Phrase')->disableOriginalConstructor()->getMock();
+        $phraseMock = $this->getMockBuilder(\Magento\Framework\Phrase::class)->disableOriginalConstructor()->getMock();
         return [
             [true, [$phraseMock, $phraseMock], true, [$phraseMock, $phraseMock]],
             ['', [], false, []],
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
index 027117eca5471..baf11d67773bc 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
@@ -13,15 +13,15 @@ class ValidatorCompositeTest extends \PHPUnit_Framework_TestCase
     public function testValidate()
     {
         $validationSubject = [];
-        $validator1 = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ValidatorInterface')
+        $validator1 = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ValidatorInterface::class)
             ->getMockForAbstractClass();
-        $validator2 = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ValidatorInterface')
+        $validator2 = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ValidatorInterface::class)
             ->getMockForAbstractClass();
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -30,8 +30,8 @@ public function testValidate()
             ->with(
                 [
                     'array' => [
-                        'validator1' => 'Magento\Payment\Gateway\Validator\ValidatorInterface',
-                        'validator2' => 'Magento\Payment\Gateway\Validator\ValidatorInterface'
+                        'validator1' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class,
+                        'validator2' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class
                     ],
                     'type' => ValidatorInterface::class
                 ]
@@ -41,12 +41,12 @@ public function testValidate()
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([$validator1, $validator2]));
 
-        $resultSuccess = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ResultInterface')
+        $resultSuccess = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterface::class)
             ->getMockForAbstractClass();
         $resultSuccess->expects(static::once())
             ->method('isValid')
             ->willReturn(true);
-        $resultFail = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ResultInterface')
+        $resultFail = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterface::class)
             ->getMockForAbstractClass();
         $resultFail->expects(static::once())
             ->method('isValid')
@@ -64,9 +64,9 @@ public function testValidate()
             ->with($validationSubject)
             ->willReturn($resultFail);
 
-        $compositeResult = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ResultInterface')
+        $compositeResult = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterface::class)
             ->getMockForAbstractClass();
-        $resultFactory = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ResultInterfaceFactory')
+        $resultFactory = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -80,13 +80,12 @@ public function testValidate()
             )
             ->willReturn($compositeResult);
 
-
         $validatorComposite = new ValidatorComposite(
             $resultFactory,
             $tMapFactory,
             [
-                'validator1' => 'Magento\Payment\Gateway\Validator\ValidatorInterface',
-                'validator2' => 'Magento\Payment\Gateway\Validator\ValidatorInterface'
+                'validator1' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class,
+                'validator2' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class
             ]
         );
         static::assertSame($compositeResult, $validatorComposite->validate($validationSubject));
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorPoolTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorPoolTest.php
index a568d0de60720..8d408abf147c4 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorPoolTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorPoolTest.php
@@ -12,12 +12,12 @@ class ValidatorPoolTest extends \PHPUnit_Framework_TestCase
 {
     public function testGet()
     {
-        $commandI = $this->getMockBuilder('Magento\Payment\Gateway\Validator\ValidatorInterface')
+        $commandI = $this->getMockBuilder(\Magento\Payment\Gateway\Validator\ValidatorInterface::class)
             ->getMockForAbstractClass();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -26,7 +26,7 @@ public function testGet()
             ->method('create')
             ->with(
                 [
-                    'array' => ['validator' => 'Magento\Payment\Gateway\Validator\ValidatorInterface'],
+                    'array' => ['validator' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class],
                     'type' => ValidatorInterface::class
                 ]
             )
@@ -42,7 +42,7 @@ public function testGet()
 
         $pool = new ValidatorPool(
             $tMapFactory,
-            ['validator' => 'Magento\Payment\Gateway\Validator\ValidatorInterface']
+            ['validator' => \Magento\Payment\Gateway\Validator\ValidatorInterface::class]
         );
 
         static::assertSame($commandI, $pool->get('validator'));
@@ -50,13 +50,13 @@ public function testGet()
 
     public function testGetException()
     {
-        $this->setExpectedException('Magento\Framework\Exception\NotFoundException');
+        $this->setExpectedException(\Magento\Framework\Exception\NotFoundException::class);
 
-        $tMapFactory = $this->getMockBuilder('Magento\Framework\ObjectManager\TMapFactory')
+        $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder('Magento\Framework\ObjectManager\TMap')
+        $tMap = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMap::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
index 756810416c2ae..81329a9bb98cc 100644
--- a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
@@ -37,12 +37,12 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $className = 'Magento\Payment\Helper\Data';
+        $className = \Magento\Payment\Helper\Data::class;
         $arguments = $objectManagerHelper->getConstructArguments($className);
         /** @var \Magento\Framework\App\Helper\Context $context */
         $context = $arguments['context'];
         $this->scopeConfig = $context->getScopeConfig();
-        $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface', [], [], '', false);
+        $this->layoutMock = $this->getMock(\Magento\Framework\View\LayoutInterface::class, [], [], '', false);
         $layoutFactoryMock = $arguments['layoutFactory'];
         $layoutFactoryMock->expects($this->once())->method('create')->willReturn($this->layoutMock);
 
@@ -53,7 +53,6 @@ protected function setUp()
         $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
-
     public function testGetMethodInstance()
     {
         list($code, $class, $methodInstance) = ['method_code', 'method_class', 'method_instance'];
@@ -120,19 +119,19 @@ public function testSortMethods(array $methodA, array $methodB)
         $this->scopeConfig->expects(new MethodInvokedAtIndex(0))
             ->method('getValue')
             ->with(sprintf('%s/%s/model', Data::XML_PATH_PAYMENT_METHODS, $methodA['code']))
-            ->will($this->returnValue('Magento\Payment\Model\Method\AbstractMethod'));
+            ->will($this->returnValue(\Magento\Payment\Model\Method\AbstractMethod::class));
         $this->scopeConfig->expects(new MethodInvokedAtIndex(1))
             ->method('getValue')
             ->with(
                 sprintf('%s/%s/model', Data::XML_PATH_PAYMENT_METHODS, $methodB['code'])
             )
-            ->will($this->returnValue('Magento\Payment\Model\Method\AbstractMethod'));
+            ->will($this->returnValue(\Magento\Payment\Model\Method\AbstractMethod::class));
         $this->scopeConfig->expects(new MethodInvokedAtIndex(2))
             ->method('getValue')
             ->with(sprintf('%s/%s/model', Data::XML_PATH_PAYMENT_METHODS, 'empty'))
             ->will($this->returnValue(null));
 
-        $methodInstanceMockA = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodInstanceMockA = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
         $methodInstanceMockA->expects($this->any())
             ->method('isAvailable')
@@ -142,7 +141,7 @@ public function testSortMethods(array $methodA, array $methodB)
             ->with('sort_order', null)
             ->will($this->returnValue($methodA['data']['sort_order']));
 
-        $methodInstanceMockB = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodInstanceMockB = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
         $methodInstanceMockB->expects($this->any())
             ->method('isAvailable')
@@ -171,13 +170,13 @@ public function testGetMethodFormBlock()
     {
         list($blockType, $methodCode) = ['method_block_type', 'method_code'];
 
-        $methodMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
-        $layoutMock = $this->getMockBuilder('Magento\Framework\View\LayoutInterface')
+        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $blockMock = $this->getMockBuilder('Magento\Framework\View\Element\BlockInterface')
+        $blockMock = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setMethod', 'toHtml'])
             ->getMock();
@@ -196,13 +195,13 @@ public function testGetInfoBlock()
     {
         $blockType = 'method_block_type';
 
-        $methodMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
-        $infoMock = $this->getMockBuilder('Magento\Payment\Model\Info')
+        $infoMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $blockMock = $this->getMockBuilder('Magento\Framework\View\Element\BlockInterface')
+        $blockMock = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setInfo', 'toHtml'])
             ->getMock();
@@ -221,13 +220,13 @@ public function testGetInfoBlockHtml()
     {
         list($storeId, $blockHtml, $secureMode, $blockType) = [1, 'HTML MARKUP', true, 'method_block_type'];
 
-        $methodMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
-        $infoMock = $this->getMockBuilder('Magento\Payment\Model\Info')
+        $infoMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $paymentBlockMock = $this->getMockBuilder('Magento\Framework\View\Element\BlockInterface')
+        $paymentBlockMock = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setArea', 'setIsSecureMode', 'getMethod', 'setStore', 'toHtml', 'setInfo'])
             ->getMock();
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
index d7bd9dfdc1483..c0b49635fea9e 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
@@ -15,7 +15,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->_objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->_model = new \Magento\Payment\Model\Cart\SalesModel\Factory($this->_objectManagerMock);
     }
 
@@ -43,8 +43,8 @@ public function testCreate($salesModelClass, $expectedType)
     public function createDataProvider()
     {
         return [
-            ['Magento\Quote\Model\Quote', 'Magento\Payment\Model\Cart\SalesModel\Quote'],
-            ['Magento\Sales\Model\Order', 'Magento\Payment\Model\Cart\SalesModel\Order']
+            [\Magento\Quote\Model\Quote::class, \Magento\Payment\Model\Cart\SalesModel\Quote::class],
+            [\Magento\Sales\Model\Order::class, \Magento\Payment\Model\Cart\SalesModel\Order::class]
         ];
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
index b3c76b3407fe7..b3096c35258a5 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
@@ -15,7 +15,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_orderMock = $this->getMock('Magento\Sales\Model\Order', [], [], '', false);
+        $this->_orderMock = $this->getMock(\Magento\Sales\Model\Order::class, [], [], '', false);
         $this->_model = new \Magento\Payment\Model\Cart\SalesModel\Order($this->_orderMock);
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
index 7516ff49f9daf..aded897dcd21b 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
@@ -15,7 +15,7 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
+        $this->_quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
         $this->_model = new \Magento\Payment\Model\Cart\SalesModel\Quote($this->_quoteMock);
     }
 
@@ -64,7 +64,7 @@ public function testGetTaxContainer()
      */
     public function testGetAllItems($pItem, $name, $qty, $price)
     {
-        $itemMock = $this->getMock('Magento\Quote\Model\Quote\Item\AbstractItem', [], [], '', false);
+        $itemMock = $this->getMock(\Magento\Quote\Model\Quote\Item\AbstractItem::class, [], [], '', false);
         $itemMock->expects($this->any())->method('getParentItem')->will($this->returnValue($pItem));
         $itemMock->expects($this->once())->method('__call')->with('getName')->will($this->returnValue($name));
         $itemMock->expects($this->any())->method('getTotalQty')->will($this->returnValue($qty));
@@ -114,7 +114,7 @@ public function testGetBaseSubtotal()
      */
     public function testGetter($isVirtual, $getterMethod)
     {
-        $address = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
+        $address = $this->getMock(\Magento\Quote\Model\Quote\Address::class, [], [], '', false);
         $address->expects(
             $this->any()
         )->method(
@@ -124,7 +124,7 @@ public function testGetter($isVirtual, $getterMethod)
         )->will(
             $this->returnValue($getterMethod)
         );
-        $quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
+        $quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
         $quoteMock->expects($this->any())->method('getIsVirtual')->will($this->returnValue($isVirtual));
         $method = 'getShippingAddress';
         if ($isVirtual) {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CartTest.php b/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
index 67b04b8344d77..9a4041183f3e6 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
@@ -20,9 +20,9 @@ class CartTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
-        $this->_salesModelMock = $this->getMock('Magento\Payment\Model\Cart\SalesModel\SalesModelInterface');
-        $factoryMock = $this->getMock('Magento\Payment\Model\Cart\SalesModel\Factory', [], [], '', false);
+        $this->_eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
+        $this->_salesModelMock = $this->getMock(\Magento\Payment\Model\Cart\SalesModel\SalesModelInterface::class);
+        $factoryMock = $this->getMock(\Magento\Payment\Model\Cart\SalesModel\Factory::class, [], [], '', false);
         $factoryMock->expects($this->once())->method('create')->will($this->returnValue($this->_salesModelMock));
 
         $this->_model = new \Magento\Payment\Model\Cart($factoryMock, $this->_eventManagerMock, null);
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
index 056cefeafdaa1..9897628514387 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
@@ -24,8 +24,8 @@ class CcConfigProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->ccConfigMock = $this->getMock('\Magento\Payment\Model\CcConfig', [], [], '', false);
-        $this->assetSourceMock = $this->getMock('\Magento\Framework\View\Asset\Source', [], [], '', false);
+        $this->ccConfigMock = $this->getMock(\Magento\Payment\Model\CcConfig::class, [], [], '', false);
+        $this->assetSourceMock = $this->getMock(\Magento\Framework\View\Asset\Source::class, [], [], '', false);
         $this->model = new \Magento\Payment\Model\CcConfigProvider(
             $this->ccConfigMock,
             $this->assetSourceMock
@@ -66,7 +66,7 @@ public function testGetConfig()
                 'url' => 'http://cc.card/ae.png'
             ]
         ];
-        $assetMock = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
+        $assetMock = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
 
         $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')->willReturn($ccAvailableTypesMock);
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcConfigTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcConfigTest.php
index 46663d30d8a0d..468d71f0ba9ea 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CcConfigTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CcConfigTest.php
@@ -29,11 +29,11 @@ class CcConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->configMock = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
-        $this->repositoryMock = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-        $this->requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
-        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
-        $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
+        $this->configMock = $this->getMock(\Magento\Payment\Model\Config::class, [], [], '', false);
+        $this->repositoryMock = $this->getMock(\Magento\Framework\View\Asset\Repository::class, [], [], '', false);
+        $this->requestMock = $this->getMock(\Magento\Framework\App\RequestInterface::class);
+        $this->urlMock = $this->getMock(\Magento\Framework\UrlInterface::class);
+        $this->loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
 
         $this->model = new \Magento\Payment\Model\CcConfig(
             $this->configMock,
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcGenericConfigProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcGenericConfigProviderTest.php
index 4628eb9446bed..60827173f72d7 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CcGenericConfigProviderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CcGenericConfigProviderTest.php
@@ -22,8 +22,8 @@ class CcGenericConfigProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->ccConfigMock = $this->getMock('Magento\Payment\Model\CcConfig', [], [], '', false);
-        $this->paymentHelperMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->ccConfigMock = $this->getMock(\Magento\Payment\Model\CcConfig::class, [], [], '', false);
+        $this->paymentHelperMock = $this->getMock(\Magento\Payment\Helper\Data::class, [], [], '', false);
 
         $this->model = new CcGenericConfigProvider(
             $this->ccConfigMock,
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
index d64efadbeb2f5..f397445418eb0 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
@@ -26,11 +26,11 @@ protected function setUp()
      */
     public function testIsApplicable($expectation)
     {
-        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $paymentMethod->expects($this->once())->method('canUseCheckout')->will(
             $this->returnValue($expectation)
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountry/CountryProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountry/CountryProviderTest.php
index dd33a4c0b877d..02cfd0387c3e5 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountry/CountryProviderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountry/CountryProviderTest.php
@@ -5,55 +5,123 @@
  */
 namespace Magento\Payment\Test\Unit\Model\Checks\CanUseForCountry;
 
+use Magento\Directory\Helper\Data;
+use Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * CountryProviderTest contains tests for CountryProvider class
+ */
 class CountryProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider
+     * @var CountryProvider
      */
-    protected $model;
+    private $countryProvider;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    protected $directoryMock;
+    private $directory;
+
+    /**
+     * @var Quote|MockObject
+     */
+    private $quote;
 
     protected function setUp()
     {
-        $this->directoryMock = $this->getMock('Magento\Directory\Helper\Data', [], [], '', false, false);
-        $this->model = new \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider($this->directoryMock);
+        $this->directory = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getDefaultCountry'])
+            ->getMock();
+
+        $this->quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBillingAddress', 'getShippingAddress'])
+            ->getMock();
+
+        $this->countryProvider = new CountryProvider($this->directory);
     }
 
-    public function testGetCountryForNonVirtualQuote()
+    /**
+     * @covers \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider::getCountry
+     */
+    public function testGetCountry()
     {
-        $quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false, false);
-        $quoteMock->expects($this->once())->method('isVirtual')->willReturn(false);
-        $addressMock = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false, false);
-        $addressMock->expects($this->once())->method('getCountry')->will($this->returnValue(1));
-        $quoteMock->expects($this->once())->method('getShippingAddress')->will($this->returnValue($addressMock));
-        $this->assertEquals(1, $this->model->getCountry($quoteMock));
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountry'])
+            ->getMock();
+
+        $this->quote->expects(static::once())
+            ->method('getBillingAddress')
+            ->willReturn($address);
+
+        $this->quote->expects(static::never())
+            ->method('getShippingAddress');
+
+        $address->expects(static::exactly(2))
+            ->method('getCountry')
+            ->willReturn('UK');
+        $this->directory->expects(static::never())
+            ->method('getDefaultCountry');
+
+        static::assertEquals('UK', $this->countryProvider->getCountry($this->quote));
     }
 
-    public function testGetCountryForVirtualQuoteWhenBillingAddressNotExist()
+    /**
+     * @covers \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider::getCountry
+     */
+    public function testGetCountryForBillingAddressWithoutCountry()
     {
-        $quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false, false);
-        $quoteMock->expects($this->once())->method('isVirtual')->willReturn(true);
-        $addressMock = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false, false);
-        $addressMock->expects($this->never())->method('getCountry');
-        $quoteMock->expects($this->never())->method('getShippingAddress');
-        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn(null);
-        $this->directoryMock->expects($this->once())->method('getDefaultCountry')->willReturn(10);
-        $this->assertEquals(10, $this->model->getCountry($quoteMock));
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountry'])
+            ->getMock();
+
+        $this->quote->expects(static::never())
+            ->method('getShippingAddress');
+        $this->quote->expects(static::once())
+            ->method('getBillingAddress')
+            ->willReturn($address);
+
+        $address->expects(static::once())
+            ->method('getCountry')
+            ->willReturn(null);
+        $this->directory->expects(static::once())
+            ->method('getDefaultCountry')
+            ->willReturn('US');
+        static::assertEquals('US', $this->countryProvider->getCountry($this->quote));
     }
 
-    public function testGetCountryForVirtualQuoteWhenBillingAddressExist()
+    /**
+     * @covers \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider::getCountry
+     */
+    public function testGetCountryShippingAddress()
     {
-        $quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false, false);
-        $quoteMock->expects($this->once())->method('isVirtual')->willReturn(true);
-        $addressMock = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false, false);
-        $addressMock->expects($this->once())->method('getCountry')->willReturn(10);
-        $quoteMock->expects($this->never())->method('getShippingAddress');
-        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($addressMock);
-        $this->directoryMock->expects($this->never())->method('getDefaultCountry');
-        $this->assertEquals(10, $this->model->getCountry($quoteMock));
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountry'])
+            ->getMock();
+
+        $this->quote->expects(static::once())
+            ->method('getBillingAddress')
+            ->willReturn(null);
+
+        $this->quote->expects(static::once())
+            ->method('getShippingAddress')
+            ->willReturn($address);
+
+        $address->expects(static::exactly(2))
+            ->method('getCountry')
+            ->willReturn('CA');
+
+        $this->directory->expects(static::never())
+            ->method('getDefaultCountry');
+
+        static::assertEquals('CA', $this->countryProvider->getCountry($this->quote));
     }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountryTest.php
index 2742f152b4f74..0842bc6a6f887 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountryTest.php
@@ -28,7 +28,7 @@ class CanUseForCountryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->countryProvider = $this->getMock(
-            'Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider',
+            \Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider::class,
             [],
             [],
             '',
@@ -44,12 +44,12 @@ protected function setUp()
      */
     public function testIsApplicable($expectation)
     {
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
 
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $paymentMethod->expects($this->once())->method('canUseForCountry')->with(
             self::EXPECTED_COUNTRY_ID
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
index a3b6c6db899a6..7b8d2587520dc 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
@@ -32,17 +32,17 @@ protected function setUp()
     public function testIsApplicable($expectation)
     {
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $paymentMethod->expects($this->once())->method('canUseForCurrency')->with(
             self::EXPECTED_CURRENCY_CODE
         )->will($this->returnValue($expectation));
 
-        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
         $store = $this->getMockBuilder(
-            'Magento\Store\Model\Store'
+            \Magento\Store\Model\Store::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $store->expects($this->once())->method('getBaseCurrencyCode')->will(
             $this->returnValue(self::EXPECTED_CURRENCY_CODE)
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
index 54f69431ff4a5..5d30493e485db 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
@@ -26,11 +26,11 @@ protected function setUp()
      */
     public function testIsApplicable($expectation)
     {
-        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $paymentMethod->expects($this->once())->method('canUseInternal')->will(
             $this->returnValue($expectation)
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
index e369d6e9550a7..8ce5abe8c180a 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
@@ -16,15 +16,15 @@ class CompositeTest extends \PHPUnit_Framework_TestCase
      */
     public function testIsApplicable($expectation)
     {
-        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
         $specification = $this->getMockBuilder(
-            'Magento\Payment\Model\Checks\SpecificationInterface'
+            \Magento\Payment\Model\Checks\SpecificationInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $specification->expects($this->once())->method('isApplicable')->with($paymentMethod, $quote)->will(
             $this->returnValue($expectation)
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
index 898076d54f180..63aa63d96ed31 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
@@ -23,19 +23,19 @@ class SpecificationFactoryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_compositeFactory = $this->getMockBuilder(
-            'Magento\Payment\Model\Checks\CompositeFactory'
+            \Magento\Payment\Model\Checks\CompositeFactory::class
         )->disableOriginalConstructor()->setMethods(['create'])->getMock();
     }
 
     public function testCreate()
     {
         $specification = $this->getMockBuilder(
-            'Magento\Payment\Model\Checks\SpecificationInterface'
+            \Magento\Payment\Model\Checks\SpecificationInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $specificationMapping = [self::SPECIFICATION_KEY => $specification];
 
         $expectedComposite = $this->getMockBuilder(
-            'Magento\Payment\Model\Checks\Composite'
+            \Magento\Payment\Model\Checks\Composite::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $modelFactory = new SpecificationFactory($this->_compositeFactory, $specificationMapping);
         $this->_compositeFactory->expects($this->once())->method('create')->with(
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
index acb786d0b796a..0adf1cb386455 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
@@ -28,7 +28,7 @@ class TotalMinMaxTest extends \PHPUnit_Framework_TestCase
     public function testIsApplicable($baseGrandTotal, $expectation)
     {
         $paymentMethod = $this->getMockBuilder(
-            '\Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $paymentMethod->expects($this->at(0))->method('getConfigData')->with(
             TotalMinMax::MIN_ORDER_TOTAL
@@ -37,7 +37,7 @@ public function testIsApplicable($baseGrandTotal, $expectation)
             TotalMinMax::MAX_ORDER_TOTAL
         )->will($this->returnValue(self::PAYMENT_MAX_TOTAL));
 
-        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')->disableOriginalConstructor()->setMethods(
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->setMethods(
             ['getBaseGrandTotal', '__wakeup']
         )->getMock();
         $quote->expects($this->once())->method('getBaseGrandTotal')->will($this->returnValue($baseGrandTotal));
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
index 2b816a6151211..af6d7e78c2555 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
@@ -18,7 +18,7 @@ class ZeroTotalTest extends \PHPUnit_Framework_TestCase
      */
     public function testIsApplicable($code, $total, $expectation)
     {
-        $paymentMethod = $this->getMockBuilder('\Magento\Payment\Model\MethodInterface')
+        $paymentMethod = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -29,7 +29,7 @@ public function testIsApplicable($code, $total, $expectation)
                 ->will($this->returnValue($code));
         }
 
-        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBaseGrandTotal', '__wakeup'])
             ->getMock();
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
index 665d5c6e882c7..9a744a94a2aa5 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
@@ -19,7 +19,7 @@ class SchemaLocatorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $moduleReader = $this->getMockBuilder(
-            'Magento\Framework\Module\Dir\Reader'
+            \Magento\Framework\Module\Dir\Reader::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $moduleReader->expects($this->once())->method('getModuleDir')->with('etc', 'Magento_Payment')->will(
             $this->returnValue(self::MODULE_DIR_PATH)
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
index 67de175ca0147..7d0224a46be7c 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
@@ -27,7 +27,7 @@ class AllmethodsTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_paymentData = $this->getMockBuilder(
-            'Magento\Payment\Helper\Data'
+            \Magento\Payment\Helper\Data::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
         $this->_model = new Allmethods($this->_paymentData);
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
index 87d32873be24e..58a9826c1ee89 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
@@ -25,7 +25,7 @@ class CctypeTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_paymentConfig = $this->getMockBuilder(
-            'Magento\Payment\Model\Config'
+            \Magento\Payment\Model\Config::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
         $this->_model = new Cctype($this->_paymentConfig);
diff --git a/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
index 2a07b2ae14db0..dd3cd3e3b52f2 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
@@ -13,6 +13,9 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Class ConfigTest
+ */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Payment\Model\Config */
@@ -43,7 +46,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      *
      * @var array
      */
-    protected $paymentMethodsList = [
+    private $paymentMethodsList = [
         'not_active_method' => ['active' => 0],
         'active_method_no_model' => ['active' => 1],
         'active_method' => ['active' => 1, 'model' => 'model_name'],
@@ -97,20 +100,20 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->scopeConfig = $this->getMock(
-            'Magento\Framework\App\Config\ScopeConfigInterface',
+            \Magento\Framework\App\Config\ScopeConfigInterface::class,
             [],
             [],
             '',
             false
         );
-        $this->paymentMethodFactory = $this->getMock('Magento\Payment\Model\Method\Factory', [], [], '', false);
-        $this->localeResolver = $this->getMock('Magento\Framework\Locale\ResolverInterface', [], [], '', false);
-        $this->dataStorage = $this->getMock('Magento\Framework\Config\DataInterface', [], [], '', false);
-        $this->date = $this->getMock('Magento\Framework\Stdlib\DateTime\DateTime', [], [], '', false);
+        $this->paymentMethodFactory = $this->getMock(\Magento\Payment\Model\Method\Factory::class, [], [], '', false);
+        $this->localeResolver = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class, [], [], '', false);
+        $this->dataStorage = $this->getMock(\Magento\Framework\Config\DataInterface::class, [], [], '', false);
+        $this->date = $this->getMock(\Magento\Framework\Stdlib\DateTime\DateTime::class, [], [], '', false);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->config = $this->objectManagerHelper->getObject(
-            'Magento\Payment\Model\Config',
+            \Magento\Payment\Model\Config::class,
             [
                 'scopeConfig' => $this->scopeConfig,
                 'paymentMethodFactory' => $this->paymentMethodFactory,
@@ -122,6 +125,7 @@ protected function setUp()
     }
 
     /**
+     * @covers \Magento\Payment\Model\Config::getActiveMethods
      * @param bool $isActive
      * @dataProvider getActiveMethodsDataProvider
      */
diff --git a/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php b/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
index 72a6e3eda5507..84412a32b9212 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
@@ -34,22 +34,28 @@ class InfoTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->contextMock = $this->getMock('Magento\Framework\Model\Context', [], [], '', false);
-        $this->registryMock = $this->getMock('Magento\Framework\Registry');
-        $this->paymentHelperMock = $this->getMock('Magento\Payment\Helper\Data', ['getMethodInstance'], [], '', false);
+        $this->contextMock = $this->getMock(\Magento\Framework\Model\Context::class, [], [], '', false);
+        $this->registryMock = $this->getMock(\Magento\Framework\Registry::class);
+        $this->paymentHelperMock = $this->getMock(
+            \Magento\Payment\Helper\Data::class,
+            ['getMethodInstance'],
+            [],
+            '',
+            false
+        );
         $this->encryptorInterfaceMock = $this->getMock(
-            'Magento\Framework\Encryption\EncryptorInterface',
+            \Magento\Framework\Encryption\EncryptorInterface::class,
             [],
             [],
             '',
             false
         );
-        $this->methodInstanceMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
+        $this->methodInstanceMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->info = $this->objectManagerHelper->getObject(
-            'Magento\Payment\Model\Info',
+            \Magento\Payment\Model\Info::class,
             [
                 'context' => $this->contextMock,
                 'registry' => $this->registryMock,
@@ -138,7 +144,7 @@ public function testGetMethodInstanceWithNoMethod()
         $this->info->setData('method', false);
         $this->info->getMethodInstance();
     }
-    
+
     public function testGetMethodInstanceRequestedMethod()
     {
         $code = 'real_method';
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
index 22c35df17e897..511d2821828dc 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
@@ -15,6 +15,7 @@
  * Class AbstractMethodTest
  *
  * Test for class \Magento\Payment\Model\Method\AbstractMethod
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AbstractMethodTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,24 +46,24 @@ class AbstractMethodTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->setMethods(['getValue'])
             ->getMockForAbstractClass();
-        $this->eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
+        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
             ->setMethods(['dispatch'])
             ->getMockForAbstractClass();
-        $this->quoteMock = $this->getMockBuilder('Magento\Quote\Api\Data\CartInterface')
+        $this->quoteMock = $this->getMockBuilder(\Magento\Quote\Api\Data\CartInterface::class)
             ->setMethods(['getStoreId'])
             ->getMockForAbstractClass();
-        $contextMock = $this->getMockBuilder('Magento\Framework\Model\Context')
+        $contextMock = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
             ->disableOriginalConstructor()
             ->setMethods(['getEventDispatcher'])
             ->getMock();
         $contextMock->expects($this->once())
             ->method('getEventDispatcher')
             ->willReturn($this->eventManagerMock);
-        $this->loggerMock = $this->getMockBuilder('\Magento\Payment\Model\Method\Logger')
-            ->setConstructorArgs([$this->getMockForAbstractClass('Psr\Log\LoggerInterface')])
+        $this->loggerMock = $this->getMockBuilder(\Magento\Payment\Model\Method\Logger::class)
+            ->setConstructorArgs([$this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class)])
             ->setMethods(['debug'])
             ->getMock();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
index 9489219ed7aa2..d8fefb7345e0f 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
@@ -13,34 +13,40 @@
 use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\ValidatorInterface;
 use Magento\Payment\Gateway\Validator\ValidatorPoolInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\Adapter;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class AdapterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | ManagerInterface
+     * @var MockObject|ManagerInterface
      */
     private $eventManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | ValueHandlerPoolInterface
+     * @var MockObject|ValueHandlerPoolInterface
      */
     private $valueHandlerPool;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | ValidatorPoolInterface
+     * @var MockObject|ValidatorPoolInterface
      */
     private $validatorPool;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | CommandPoolInterface
+     * @var MockObject|CommandPoolInterface
      */
     private $commandPool;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | PaymentDataObjectFactory
+     * @var MockObject|PaymentDataObjectFactory
      */
     private $paymentDataObjectFactory;
 
@@ -66,21 +72,11 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->eventManager = $this->getMock(
-            'Magento\Framework\Event\ManagerInterface'
-        );
-        $this->valueHandlerPool = $this->getMock(
-            'Magento\Payment\Gateway\Config\ValueHandlerPoolInterface'
-        );
-        $this->validatorPool = $this->getMock(
-            'Magento\Payment\Gateway\Validator\ValidatorPoolInterface'
-        );
-        $this->commandPool = $this->getMock(
-            'Magento\Payment\Gateway\Command\CommandPoolInterface'
-        );
-        $this->paymentDataObjectFactory = $this->getMockBuilder(
-            'Magento\Payment\Gateway\Data\PaymentDataObjectFactory'
-        )
+        $this->eventManager = $this->getMock(ManagerInterface::class);
+        $this->valueHandlerPool = $this->getMock(ValueHandlerPoolInterface::class);
+        $this->validatorPool = $this->getMock(ValidatorPoolInterface::class);
+        $this->commandPool = $this->getMock(CommandPoolInterface::class);
+        $this->paymentDataObjectFactory = $this->getMockBuilder(PaymentDataObjectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -100,11 +96,12 @@ protected function setUp()
         );
     }
 
+    /**
+     * @covers \Magento\Payment\Model\Method\Adapter::isAvailable
+     */
     public function testIsAvailableNotActive()
     {
-        $activeValueHandler = $this->getMock(
-            'Magento\Payment\Gateway\Config\ValueHandlerInterface'
-        );
+        $activeValueHandler = $this->getMock(ValueHandlerInterface::class);
 
         $this->valueHandlerPool->expects(static::once())
             ->method('get')
@@ -121,17 +118,16 @@ public function testIsAvailableNotActive()
         static::assertFalse($this->adapter->isAvailable(null));
     }
 
+    /**
+     * @covers \Magento\Payment\Model\Method\Adapter::isAvailable
+     */
     public function testIsAvailableEmptyQuote()
     {
-        $activeValueHandler = $this->getMock(
-            'Magento\Payment\Gateway\Config\ValueHandlerInterface'
-        );
-        $availabilityValidator = $this->getMock(
-            'Magento\Payment\Gateway\Validator\ValidatorInterface'
-        );
-        $paymentDO = $this->getMock('Magento\Payment\Gateway\Data\PaymentDataObjectInterface');
-        $validationResult = $this->getMock('Magento\Payment\Gateway\Validator\ResultInterface');
-        $paymentInfo = $this->getMock('Magento\Payment\Model\InfoInterface');
+        $activeValueHandler = $this->getMock(ValueHandlerInterface::class);
+        $availabilityValidator = $this->getMock(ValidatorInterface::class);
+        $paymentDO = $this->getMock(PaymentDataObjectInterface::class);
+        $validationResult = $this->getMock(ResultInterface::class);
+        $paymentInfo = $this->getMock(InfoInterface::class);
 
         $this->valueHandlerPool->expects(static::once())
             ->method('get')
@@ -164,24 +160,49 @@ public function testIsAvailableEmptyQuote()
         static::assertTrue($this->adapter->isAvailable(null));
     }
 
+    /**
+     * @covers \Magento\Payment\Model\Method\Adapter::isAvailable
+     */
+    public function testIsAvailableWithEmptyInfoInstance()
+    {
+        $activeValueHandler = $this->getMock(ValueHandlerInterface::class);
+        $this->valueHandlerPool->expects(static::once())
+            ->method('get')
+            ->with('active')
+            ->willReturn($activeValueHandler);
+        $activeValueHandler->expects(static::once())
+            ->method('handle')
+            ->with(['field' => 'active'])
+            ->willReturn(true);
+
+        $this->validatorPool->expects(static::never())
+            ->method('get')
+            ->with('availability');
+
+        $this->eventManager->expects(static::once())
+            ->method('dispatch');
+
+        static::assertTrue($this->adapter->isAvailable(null));
+    }
+
     public function testExecuteCommandWithCommandExecutor()
     {
-        /** @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject $eventManager */
+        /** @var ManagerInterface|MockObject $eventManager */
         $eventManager = $this->getMock(
             ManagerInterface::class
         );
 
-        /** @var ValueHandlerPoolInterface|\PHPUnit_Framework_MockObject_MockObject $valueHandlerPool */
+        /** @var ValueHandlerPoolInterface|MockObject $valueHandlerPool */
         $valueHandlerPool = $this->getMock(
             ValueHandlerPoolInterface::class
         );
 
-        /** @var CommandManagerInterface|\PHPUnit_Framework_MockObject_MockObject $commandManager */
+        /** @var CommandManagerInterface|MockObject $commandManager */
         $commandManager = $this->getMock(
             CommandManagerInterface::class
         );
 
-        /** @var PaymentDataObjectFactory|\PHPUnit_Framework_MockObject_MockObject $paymentDataObjectFactory */
+        /** @var PaymentDataObjectFactory|MockObject $paymentDataObjectFactory */
         $paymentDataObjectFactory = $this->getMockBuilder(
             PaymentDataObjectFactory::class
         )
@@ -229,25 +250,17 @@ public function testExecuteCommandWithCommandExecutor()
 
     public function testExecuteCommandWithCommandPool()
     {
-        /** @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject $eventManager */
-        $eventManager = $this->getMock(
-            ManagerInterface::class
-        );
+        /** @var ManagerInterface|MockObject $eventManager */
+        $eventManager = $this->getMock(ManagerInterface::class);
 
-        /** @var ValueHandlerPoolInterface|\PHPUnit_Framework_MockObject_MockObject $valueHandlerPool */
-        $valueHandlerPool = $this->getMock(
-            ValueHandlerPoolInterface::class
-        );
+        /** @var ValueHandlerPoolInterface|MockObject $valueHandlerPool */
+        $valueHandlerPool = $this->getMock(ValueHandlerPoolInterface::class);
 
-        /** @var CommandPoolInterface|\PHPUnit_Framework_MockObject_MockObject $commandPool */
-        $commandPool = $this->getMock(
-            CommandPoolInterface::class
-        );
+        /** @var CommandPoolInterface|MockObject $commandPool */
+        $commandPool = $this->getMock(CommandPoolInterface::class);
 
-        /** @var PaymentDataObjectFactory|\PHPUnit_Framework_MockObject_MockObject $paymentDataObjectFactory */
-        $paymentDataObjectFactory = $this->getMockBuilder(
-            PaymentDataObjectFactory::class
-        )
+        /** @var PaymentDataObjectFactory|MockObject $paymentDataObjectFactory */
+        $paymentDataObjectFactory = $this->getMockBuilder(PaymentDataObjectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php
index b46d237fd8d11..712994f933f11 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php
@@ -21,16 +21,16 @@ protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->_objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->_factory = $objectManagerHelper->getObject(
-            'Magento\Payment\Model\Method\Factory',
+            \Magento\Payment\Model\Method\Factory::class,
             ['objectManager' => $this->_objectManagerMock]
         );
     }
 
     public function testCreateMethod()
     {
-        $className = 'Magento\Payment\Model\Method\AbstractMethod';
+        $className = \Magento\Payment\Model\Method\AbstractMethod::class;
         $methodMock = $this->getMock($className, [], [], '', false);
         $this->_objectManagerMock->expects(
             $this->once()
@@ -48,7 +48,7 @@ public function testCreateMethod()
 
     public function testCreateMethodWithArguments()
     {
-        $className = 'Magento\Payment\Model\Method\AbstractMethod';
+        $className = \Magento\Payment\Model\Method\AbstractMethod::class;
         $data = ['param1', 'param2'];
         $methodMock = $this->getMock($className, [], [], '', false);
         $this->_objectManagerMock->expects(
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
index 59dafd905db20..2dc274aa089f9 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
@@ -8,6 +8,9 @@
 
 namespace Magento\Payment\Test\Unit\Model\Method;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FreeTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Payment\Model\Method\Free */
@@ -21,26 +24,39 @@ class FreeTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $paymentData  = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
-        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
-        $this->currencyPrice = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
+        $paymentData  = $this->getMock(\Magento\Payment\Helper\Data::class, [], [], '', false);
+        $this->scopeConfig = $this->getMock(
+            \Magento\Framework\App\Config\ScopeConfigInterface::class,
+            [],
+            [],
+            '',
+            false
+        );
+        $this->currencyPrice = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
+            ->getMock();
 
-        $context = $this->getMock('\Magento\Framework\Model\Context', ['getEventDispatcher'], [], '', false);
-        $eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
+        $context = $this->getMock(\Magento\Framework\Model\Context::class, ['getEventDispatcher'], [], '', false);
+        $eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
         $context->expects($this->any())->method('getEventDispatcher')->willReturn($eventManagerMock);
 
-        $registry = $this->getMock('\Magento\Framework\Registry', [], [], '', false);
+        $registry = $this->getMock(\Magento\Framework\Registry::class, [], [], '', false);
         $extensionAttributesFactory = $this->getMock(
-            'Magento\Framework\Api\ExtensionAttributesFactory',
+            \Magento\Framework\Api\ExtensionAttributesFactory::class,
+            [],
+            [],
+            '',
+            false
+        );
+        $customAttributeFactory = $this->getMock(
+            \Magento\Framework\Api\AttributeValueFactory::class,
             [],
             [],
             '',
             false
         );
-        $customAttributeFactory = $this->getMock('\Magento\Framework\Api\AttributeValueFactory', [], [], '', false);
 
-        $loggerMock = $this->getMockBuilder('\Magento\Payment\Model\Method\Logger')
-            ->setConstructorArgs([$this->getMockForAbstractClass('Psr\Log\LoggerInterface')])
+        $loggerMock = $this->getMockBuilder(\Magento\Payment\Model\Method\Logger::class)
+            ->setConstructorArgs([$this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class)])
             ->getMock();
 
         $this->methodFree = new \Magento\Payment\Model\Method\Free(
@@ -86,7 +102,7 @@ public function testIsAvailable($grandTotal, $isActive, $notEmptyQuote, $result)
     {
         $quote = null;
         if ($notEmptyQuote) {
-            $quote = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
+            $quote = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
             $quote->expects($this->any())
                 ->method('__call')
                 ->with($this->equalTo('getGrandTotal'))
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/LoggerTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/LoggerTest.php
index 3a8107d0ba678..5d9720c7896e4 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/LoggerTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/LoggerTest.php
@@ -19,7 +19,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->loggerMock = $this->getMockForAbstractClass('Psr\Log\LoggerInterface');
+        $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
         $this->logger = new Logger($this->loggerMock);
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/CompositeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/CompositeTest.php
index fd905ab7612a4..d7c8928622535 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/CompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/CompositeTest.php
@@ -18,7 +18,7 @@ class CompositeTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->factoryMock = $this->getMock(
-            'Magento\Payment\Model\Method\Specification\Factory',
+            \Magento\Payment\Model\Method\Specification\Factory::class,
             [],
             [],
             '',
@@ -35,7 +35,7 @@ protected function createComposite($specifications = [])
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         return $objectManager->getObject(
-            'Magento\Payment\Model\Method\Specification\Composite',
+            \Magento\Payment\Model\Method\Specification\Composite::class,
             ['factory' => $this->factoryMock, 'specifications' => $specifications]
         );
     }
@@ -50,7 +50,7 @@ public function testComposite($firstSpecificationResult, $secondSpecificationRes
     {
         $method = 'method-name';
 
-        $specificationFirst = $this->getMock('Magento\Payment\Model\Method\SpecificationInterface');
+        $specificationFirst = $this->getMock(\Magento\Payment\Model\Method\SpecificationInterface::class);
         $specificationFirst->expects(
             $this->once()
         )->method(
@@ -61,7 +61,7 @@ public function testComposite($firstSpecificationResult, $secondSpecificationRes
             $this->returnValue($firstSpecificationResult)
         );
 
-        $specificationSecond = $this->getMock('Magento\Payment\Model\Method\SpecificationInterface');
+        $specificationSecond = $this->getMock(\Magento\Payment\Model\Method\SpecificationInterface::class);
         $specificationSecond->expects(
             $this->any()
         )->method(
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php
index a5e878bd22f73..fbf0a79961448 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php
@@ -22,18 +22,18 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->factory = $objectManagerHelper->getObject(
-            'Magento\Payment\Model\Method\Specification\Factory',
+            \Magento\Payment\Model\Method\Specification\Factory::class,
             ['objectManager' => $this->objectManagerMock]
         );
     }
 
     public function testCreateMethod()
     {
-        $className = 'Magento\Payment\Model\Method\SpecificationInterface';
+        $className = \Magento\Payment\Model\Method\SpecificationInterface::class;
         $methodMock = $this->getMock($className);
         $this->objectManagerMock->expects(
             $this->once()
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/SubstitutionTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/SubstitutionTest.php
index 1edfea43da258..0f60dce0d8e3a 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/SubstitutionTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/SubstitutionTest.php
@@ -21,13 +21,13 @@ class SubstitutionTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $this->objectManager->getObject('Magento\Payment\Model\Method\Substitution');
+        $this->model = $this->objectManager->getObject(\Magento\Payment\Model\Method\Substitution::class);
     }
 
     public function testGetTitle()
     {
         $infoMock = $this->getMockBuilder(
-            'Magento\Payment\Model\Info'
+            \Magento\Payment\Model\Info::class
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
diff --git a/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php b/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
index b1e5bedb5a250..872782407c129 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Payment\Test\Unit\Model;
 
-use Magento\Payment\Model\Method\Free;
-use \Magento\Payment\Model\MethodList;
+use Magento\Payment\Model\MethodList;
+use Magento\Payment\Model\Method\AbstractMethod;
 
 class MethodListTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,9 +24,14 @@ class MethodListTest extends \PHPUnit_Framework_TestCase
     protected $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Payment\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var \Magento\Payment\Model\Method\InstanceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $paymentHelperMock;
+    private $paymentMethodInstanceFactory;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -36,52 +41,80 @@ class MethodListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->paymentHelperMock = $this->getMock('\Magento\Payment\Helper\Data', [], [], '', false);
+
+        $this->paymentMethodList = $this->getMockBuilder(\Magento\Payment\Api\PaymentMethodListInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->paymentMethodInstanceFactory = $this->getMockBuilder(
+            \Magento\Payment\Model\Method\InstanceFactory::class
+        )->disableOriginalConstructor()->getMock();
+
         $this->specificationFactoryMock = $this->getMock(
-            '\Magento\Payment\Model\Checks\SpecificationFactory', [], [], '', false
+            \Magento\Payment\Model\Checks\SpecificationFactory::class, [], [], '', false
         );
         $this->methodList = $this->objectManager->getObject(
-            'Magento\Payment\Model\MethodList',
+            \Magento\Payment\Model\MethodList::class,
             [
-                'paymentHelper' => $this->paymentHelperMock,
                 'specificationFactory' => $this->specificationFactoryMock
             ]
         );
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->methodList,
+            'paymentMethodList',
+            $this->paymentMethodList
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->methodList,
+            'paymentMethodInstanceFactory',
+            $this->paymentMethodInstanceFactory
+        );
     }
 
     public function testGetAvailableMethods()
     {
         $storeId = 1;
-        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
+        $quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
         $quoteMock->expects($this->once())->method('getStoreId')->will($this->returnValue($storeId));
         $quoteMock->expects($this->atLeastOnce())
             ->method('getPayment')
-            ->will($this->returnValue($this->getMock('\Magento\Quote\Model\Quote\Payment', [], [], '', false)));
+            ->will($this->returnValue($this->getMock(\Magento\Quote\Model\Quote\Payment::class, [], [], '', false)));
 
-        $methodMock = $this->getMock('Magento\Payment\Model\Method\AbstractMethod', [], [], '', false);
+        $methodInstanceMock = $this->getMock(\Magento\Payment\Model\Method\AbstractMethod::class, [], [], '', false);
+        $methodInstanceMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
 
-        $compositeMock = $this->getMock('\Magento\Payment\Model\Checks\Composite', [], [], '', false);
+        $compositeMock = $this->getMock(\Magento\Payment\Model\Checks\Composite::class, [], [], '', false);
         $compositeMock->expects($this->atLeastOnce())
             ->method('isApplicable')
-            ->with($methodMock, $quoteMock)
+            ->with($methodInstanceMock, $quoteMock)
             ->will($this->returnValue(true));
 
         $this->specificationFactoryMock->expects($this->atLeastOnce())
             ->method('create')
+            ->with([
+                AbstractMethod::CHECK_USE_CHECKOUT,
+                AbstractMethod::CHECK_USE_FOR_COUNTRY,
+                AbstractMethod::CHECK_USE_FOR_CURRENCY,
+                AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX
+            ])
             ->will($this->returnValue($compositeMock));
 
-        $storeMethods = [$methodMock];
-
-        $this->paymentHelperMock->expects($this->once())
-            ->method('getStoreMethods')
-            ->with($storeId, $quoteMock)
-            ->will($this->returnValue($storeMethods));
+        $methodMock = $this->getMockForAbstractClass(\Magento\Payment\Api\Data\PaymentMethodInterface::class);
+        $this->paymentMethodList->expects($this->once())
+            ->method('getActiveList')
+            ->willReturn([$methodMock]);
+        $this->paymentMethodInstanceFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($methodInstanceMock);
 
-        $methodMock->expects($this->atLeastOnce())
+        $methodInstanceMock->expects($this->atLeastOnce())
             ->method('setInfoInstance')
-            ->with($this->getMock('\Magento\Quote\Model\Quote\Payment', [], [], '', false))
+            ->with($this->getMock(\Magento\Quote\Model\Quote\Payment::class, [], [], '', false))
             ->will($this->returnSelf());
 
-        $this->assertEquals([$methodMock], $this->methodList->getAvailableMethods($quoteMock));
+        $this->assertEquals([$methodInstanceMock], $this->methodList->getAvailableMethods($quoteMock));
     }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Model/PaymentMethodListTest.php b/app/code/Magento/Payment/Test/Unit/Model/PaymentMethodListTest.php
new file mode 100644
index 0000000000000..c41e5ac2a1aac
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Unit/Model/PaymentMethodListTest.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class PaymentMethodListTest.
+ */
+class PaymentMethodListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Payment\Model\PaymentMethodList|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $methodFactoryMock;
+
+    /**
+     * @var \Magento\Payment\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * Setup.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->methodFactoryMock = $this->getMockBuilder(\Magento\Payment\Api\Data\PaymentMethodInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->helperMock = $this->getMockBuilder(\Magento\Payment\Helper\Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->paymentMethodList = $this->objectManagerHelper->getObject(
+            \Magento\Payment\Model\PaymentMethodList::class,
+            [
+                'methodFactory' => $this->methodFactoryMock,
+                'helper' => $this->helperMock
+            ]
+        );
+    }
+
+    /**
+     * Setup getList method.
+     *
+     * @param array $paymentMethodConfig
+     * @param array $methodInstancesMap
+     * @return void
+     */
+    private function setUpGetList($paymentMethodConfig, $methodInstancesMap)
+    {
+        $this->helperMock->expects($this->once())
+            ->method('getPaymentMethods')
+            ->willReturn($paymentMethodConfig);
+        $this->helperMock->expects($this->any())
+            ->method('getMethodInstance')
+            ->willReturnMap($methodInstancesMap);
+
+        $this->methodFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturnCallback(function ($data) {
+                $paymentMethod = $this->getMockBuilder(\Magento\Payment\Api\Data\PaymentMethodInterface::class)
+                    ->getMockForAbstractClass();
+                $paymentMethod->expects($this->any())
+                    ->method('getCode')
+                    ->willReturn($data['code']);
+                $paymentMethod->expects($this->any())
+                    ->method('getIsActive')
+                    ->willReturn($data['isActive']);
+
+                return $paymentMethod;
+            });
+    }
+
+    /**
+     * Test getList.
+     *
+     * @param int $storeId
+     * @param array $paymentMethodConfig
+     * @param array $methodInstancesMap
+     * @param array $expected
+     * @return void
+     *
+     * @dataProvider getListDataProvider
+     */
+    public function testGetList($storeId, $paymentMethodConfig, $methodInstancesMap, $expected)
+    {
+        $this->setUpGetList($paymentMethodConfig, $methodInstancesMap);
+
+        $codes = array_map(
+            function ($method) {
+                return $method->getCode();
+            },
+            $this->paymentMethodList->getList($storeId)
+        );
+
+        $this->assertEquals($expected, $codes);
+    }
+
+    /**
+     * Data provider for getList.
+     *
+     * @return array
+     */
+    public function getListDataProvider()
+    {
+        return [
+            [
+                1,
+                ['method_code_1' => [], 'method_code_2' => []],
+                [
+                    ['method_code_1', $this->mockPaymentMethodInstance(1, 10, 'method_code_1', 'title', true)],
+                    ['method_code_2', $this->mockPaymentMethodInstance(1, 5, 'method_code_2', 'title', true)]
+                ],
+                ['method_code_2', 'method_code_1']
+            ]
+        ];
+    }
+
+    /**
+     * Test getActiveList.
+     *
+     * @param int $storeId
+     * @param array $paymentMethodConfig
+     * @param array $methodInstancesMap
+     * @param array $expected
+     * @return void
+     *
+     * @dataProvider getActiveListDataProvider
+     */
+    public function testGetActiveList($storeId, $paymentMethodConfig, $methodInstancesMap, $expected)
+    {
+        $this->setUpGetList($paymentMethodConfig, $methodInstancesMap);
+
+        $codes = array_map(
+            function ($method) {
+                return $method->getCode();
+            },
+            $this->paymentMethodList->getActiveList($storeId)
+        );
+
+        $this->assertEquals($expected, $codes);
+    }
+
+    /**
+     * Data provider for getActiveList.
+     *
+     * @return array
+     */
+    public function getActiveListDataProvider()
+    {
+        return [
+            [
+                1,
+                ['method_code_1' => [], 'method_code_2' => []],
+                [
+                    ['method_code_1', $this->mockPaymentMethodInstance(1, 10, 'method_code_1', 'title', false)],
+                    ['method_code_2', $this->mockPaymentMethodInstance(1, 5, 'method_code_2', 'title', true)]
+                ],
+                ['method_code_2']
+            ]
+        ];
+    }
+
+    /**
+     * Mock payment method instance.
+     *
+     * @param int $storeId
+     * @param int $sortOrder
+     * @param string $code
+     * @param string $title
+     * @param bool $isActive
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function mockPaymentMethodInstance($storeId, $sortOrder, $code, $title, $isActive)
+    {
+        $paymentMethodInstance = $this->getMockBuilder(\Magento\Payment\Model\Method\AbstractMethod::class)
+            ->setMethods(['getCode', 'getTitle', 'isActive', 'getConfigData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $paymentMethodInstance->expects($this->any())
+            ->method('getConfigData')
+            ->willReturnMap([
+                ['sort_order', $storeId, $sortOrder]
+            ]);
+        $paymentMethodInstance->expects($this->any())
+            ->method('getCode')
+            ->willReturn($code);
+        $paymentMethodInstance->expects($this->any())
+            ->method('getTitle')
+            ->willReturn($title);
+        $paymentMethodInstance->expects($this->any())
+            ->method('isActive')
+            ->willReturn($isActive);
+
+        return $paymentMethodInstance;
+    }
+}
diff --git a/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/GroupListTest.php b/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/GroupListTest.php
index 63b3bf4d94cc4..4049cdb3d2151 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/GroupListTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/GroupListTest.php
@@ -20,7 +20,7 @@ class GroupListTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->helperMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->helperMock = $this->getMock(\Magento\Payment\Helper\Data::class, [], [], '', false);
         $this->groupArrayModel = new \Magento\Payment\Model\ResourceModel\Grid\GroupList($this->helperMock);
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/TypeListTest.php b/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/TypeListTest.php
index e509c30741959..c42c2e0c26c83 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/TypeListTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/ResourceModel/Grid/TypeListTest.php
@@ -20,7 +20,7 @@ class TypeListTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->helperMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->helperMock = $this->getMock(\Magento\Payment\Helper\Data::class, [], [], '', false);
         $this->typesArrayModel = new \Magento\Payment\Model\ResourceModel\Grid\TypeList($this->helperMock);
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
index 6380e7013d5fd..13e8775fa6b24 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
@@ -46,7 +46,7 @@ class CctypeTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_paymentConfig = $this->getMockBuilder(
-            'Magento\Payment\Model\Config'
+            \Magento\Payment\Model\Config::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
         $this->_model = new Cctype($this->_paymentConfig);
diff --git a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
index d6336d6cd04df..be6cc1957a31d 100644
--- a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
@@ -26,12 +26,12 @@ protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->salesOrderBeforeSaveObserver = $this->objectManagerHelper->getObject(
-            'Magento\Payment\Observer\SalesOrderBeforeSaveObserver',
+            \Magento\Payment\Observer\SalesOrderBeforeSaveObserver::class,
             []
         );
 
         $this->observerMock = $this->getMockBuilder(
-            'Magento\Framework\Event\Observer'
+            \Magento\Framework\Event\Observer::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
     }
 
@@ -131,7 +131,7 @@ public function testSalesOrderBeforeSaveSetForced()
     private function _prepareEventMockWithMethods($methodsList)
     {
         $this->eventMock = $this->getMockBuilder(
-            'Magento\Framework\Event'
+            \Magento\Framework\Event::class
         )->disableOriginalConstructor()->setMethods($methodsList)->getMock();
         $this->observerMock->expects($this->any())->method('getEvent')->will($this->returnValue($this->eventMock));
     }
@@ -145,15 +145,15 @@ private function _prepareEventMockWithMethods($methodsList)
      */
     private function _getPreparedOrderMethod($methodCode, $orderMethods = [])
     {
-        $order = $this->getMockBuilder('Magento\Sales\Model\Order')->disableOriginalConstructor()->setMethods(
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)->disableOriginalConstructor()->setMethods(
             array_merge(['__wakeup', 'getPayment'], $orderMethods)
         )->getMock();
         $paymentMock = $this->getMockBuilder(
-            'Magento\Sales\Model\Order\Payment'
+            \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
         $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $paymentMock->expects($this->once())->method('getMethodInstance')->will($this->returnValue($methodInstance));
         $methodInstance->expects($this->once())->method('getCode')->will($this->returnValue($methodCode));
diff --git a/app/code/Magento/Payment/Test/Unit/Observer/UpdateOrderStatusForPaymentMethodsObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/UpdateOrderStatusForPaymentMethodsObserverTest.php
index 781a7f9a43429..bf666dd76f55c 100644
--- a/app/code/Magento/Payment/Test/Unit/Observer/UpdateOrderStatusForPaymentMethodsObserverTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Observer/UpdateOrderStatusForPaymentMethodsObserverTest.php
@@ -37,13 +37,19 @@ class UpdateOrderStatusForPaymentMethodsObserverTest extends \PHPUnit_Framework_
 
     protected function setUp()
     {
-        $this->orderConfigMock = $this->getMock('Magento\Sales\Model\Order\Config', [], [], '', false);
-        $this->paymentConfigMock = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
-        $this->coreResourceConfigMock = $this->getMock('Magento\Config\Model\ResourceModel\Config', [], [], '', false);
+        $this->orderConfigMock = $this->getMock(\Magento\Sales\Model\Order\Config::class, [], [], '', false);
+        $this->paymentConfigMock = $this->getMock(\Magento\Payment\Model\Config::class, [], [], '', false);
+        $this->coreResourceConfigMock = $this->getMock(
+            \Magento\Config\Model\ResourceModel\Config::class,
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->updateOrderStatusForPaymentMethodsObserver = $this->objectManagerHelper->getObject(
-            'Magento\Payment\Observer\UpdateOrderStatusForPaymentMethodsObserver',
+            \Magento\Payment\Observer\UpdateOrderStatusForPaymentMethodsObserver::class,
             [
                 'salesOrderConfig' => $this->orderConfigMock,
                 'paymentConfig' => $this->paymentConfigMock,
@@ -52,7 +58,7 @@ protected function setUp()
         );
 
         $this->observerMock = $this->getMockBuilder(
-            'Magento\Framework\Event\Observer'
+            \Magento\Framework\Event\Observer::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
     }
 
@@ -99,7 +105,7 @@ public function testUpdateOrderStatusForPaymentMethodsNewState()
     private function _prepareEventMockWithMethods($methodsList)
     {
         $this->eventMock = $this->getMockBuilder(
-            'Magento\Framework\Event'
+            \Magento\Framework\Event::class
         )->disableOriginalConstructor()->setMethods($methodsList)->getMock();
         $this->observerMock->expects($this->any())->method('getEvent')->will($this->returnValue($this->eventMock));
     }
@@ -112,7 +118,7 @@ private function _prepareEventMockWithMethods($methodsList)
     private function _getPreparedActiveMethods()
     {
         $method1 = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $method1->expects($this->once())->method('getConfigData')->with('order_status')->will(
             $this->returnValue(self::ORDER_STATUS)
@@ -122,7 +128,7 @@ private function _getPreparedActiveMethods()
         );
 
         $method2 = $this->getMockBuilder(
-            'Magento\Payment\Model\MethodInterface'
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $method2->expects($this->once())->method('getConfigData')->with('order_status')->will(
             $this->returnValue('not_a_status')
diff --git a/app/code/Magento/Payment/etc/di.xml b/app/code/Magento/Payment/etc/di.xml
index 73f8e2a76334b..c12c2d2cfd51c 100644
--- a/app/code/Magento/Payment/etc/di.xml
+++ b/app/code/Magento/Payment/etc/di.xml
@@ -6,6 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Payment\Api\Data\PaymentMethodInterface" type="Magento\Payment\Model\PaymentMethod"/>
+    <preference for="Magento\Payment\Api\PaymentMethodListInterface" type="Magento\Payment\Model\PaymentMethodList"/>
     <preference for="Magento\Payment\Gateway\Validator\ResultInterface" type="Magento\Payment\Gateway\Validator\Result"/>
     <preference for="Magento\Payment\Gateway\ConfigFactoryInterface" type="Magento\Payment\Gateway\Config\ConfigFactory" />
     <preference for="Magento\Payment\Gateway\Command\CommandManagerPoolInterface" type="Magento\Payment\Gateway\Command\CommandManagerPool" />
diff --git a/app/code/Magento/Payment/view/adminhtml/web/transparent.js b/app/code/Magento/Payment/view/adminhtml/web/transparent.js
index cf60a0dcee97c..b94e9bd4b2673 100644
--- a/app/code/Magento/Payment/view/adminhtml/web/transparent.js
+++ b/app/code/Magento/Payment/view/adminhtml/web/transparent.js
@@ -6,12 +6,14 @@
 define([
     'jquery',
     'mage/template',
-    'Magento_Ui/js/modal/alert'
+    'Magento_Ui/js/modal/alert',
+    'Magento_Payment/js/model/credit-card-validation/validator'
 ], function ($, mageTemplate, alert) {
     'use strict';
 
     $.widget('mage.transparent', {
         options: {
+            editFormSelector: '#edit_form',
             hiddenFormTmpl:
                 '<form target="<%= data.target %>" action="<%= data.action %>"' +
                 'method="POST" hidden' +
@@ -33,37 +35,51 @@ define([
          * @private
          */
         _create: function () {
+            this.hiddenFormTmpl = mageTemplate(this.options.hiddenFormTmpl);
 
-            /**
-             * @param {Object} event
-             * @param {String} method
-             */
-            var prepare = function (event, method) {
-                if (method === this.options.gateway) {
-                    $('#edit_form')
-                        .off('submitOrder')
-                        .on('submitOrder.' +  this.options.gateway, this._orderSave.bind(this));
-                } else {
-                    $('#edit_form')
-                        .off('submitOrder.' + this.options.gateway);
-                }
-            },
-                $editForm = $('#edit_form');
+            $(this.options.editFormSelector).on('changePaymentMethod', this._setPlaceOrderHandler.bind(this));
+            $(this.options.editFormSelector).trigger('changePaymentMethod', [
+                $(this.options.editFormSelector).find(':radio[name="payment[method]"]:checked').val()
+            ]);
+        },
 
-            this.hiddenFormTmpl = mageTemplate(this.options.hiddenFormTmpl);
-            $editForm.on('changePaymentMethod', prepare.bind(this));
-
-            $editForm.trigger(
-                'changePaymentMethod',
-                [
-                    $editForm.find(':radio[name="payment[method]"]:checked').val()
-                ]
-            );
+        /**
+         * Handler for form submit.
+         *
+         * @param {Object} event
+         * @param {String} method
+         */
+        _setPlaceOrderHandler: function (event, method) {
+            if (method === this.options.gateway) {
+                $(this.options.editFormSelector)
+                    .off('submitOrder')
+                    .on('submitOrder.' +  this.options.gateway, this._placeOrderHandler.bind(this));
+            } else {
+                $(this.options.editFormSelector)
+                    .off('submitOrder.' + this.options.gateway);
+            }
+        },
+
+        /**
+         * Handler for form submit to call gateway for credit card validation.
+         *
+         * @return {Boolean}
+         * @private
+         */
+        _placeOrderHandler: function () {
+            if ($(this.options.editFormSelector).valid()) {
+                this._orderSave();
+            } else {
+                $('body').trigger('processStop');
+            }
+
+            return false;
         },
 
         /**
-         * handler for Place Order button to call gateway for credit card validation
-         * Save order and generate post data for gateway call
+         * Handler for Place Order button to call gateway for credit card validation.
+         * Save order and generate post data for gateway call.
+         *
          * @private
          */
         _orderSave: function () {
@@ -91,12 +107,16 @@ define([
                     } else {
                         this._processErrors(response);
                     }
+                },
+                complete: function () {
+                    $('body').trigger('processStop');
                 }
             });
         },
 
         /**
-         * Post data to gateway for credit card validation
+         * Post data to gateway for credit card validation.
+         *
          * @param {Object} response
          * @private
          */
@@ -133,7 +153,7 @@ define([
         },
 
         /**
-         * Add credit card fields to post data for gateway
+         * Add credit card fields to post data for gateway.
          *
          * @param {Object} response
          * @private
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-data.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-data.js
similarity index 92%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-data.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-data.js
index 64a00a2b3d67f..5e4ccb061985c 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-data.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-data.js
@@ -6,14 +6,15 @@
 /*global alert*/
 define(
     [],
-    function() {
+    function () {
         'use strict';
+
         return {
             creditCard: null,
             creditCardNumber: null,
             expirationMonth: null,
             expirationYear: null,
             cvvCode: null
-        }
+        };
     }
 );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
similarity index 91%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
index 60d278c45b795..43521190004cb 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
@@ -13,6 +13,13 @@ define(
     function (utils, luhn10, creditCardTypes) {
         'use strict';
 
+        /**
+         * Validation result wrapper
+         * @param {Object} card
+         * @param {Boolean} isPotentiallyValid
+         * @param {Boolean} isValid
+         * @returns {Object}
+         */
         function resultWrapper(card, isPotentiallyValid, isValid) {
             return {
                 card: card,
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
similarity index 83%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
index 5635d6d3ae0a1..07e192c4b3f1f 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
@@ -11,6 +11,7 @@ define(
     ],
     function ($, utils) {
         'use strict';
+
         var types = [
             {
                 title: 'Visa',
@@ -26,7 +27,7 @@ define(
             {
                 title: 'MasterCard',
                 type: 'MC',
-                pattern: '^5([1-5]\\d*)?$',
+                pattern: '^(?:5[1-5][0-9]{2}|222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}$',
                 gaps: [4, 8, 12],
                 lengths: [16],
                 code: {
@@ -49,9 +50,9 @@ define(
             {
                 title: 'Diners',
                 type: 'DN',
-                pattern: '^3((0([0-5]\\d*)?)|[689]\\d*)?$',
+                pattern: '^(3(0[0-5]|095|6|[8-9]))\\d*$',
                 gaps: [4, 10],
-                lengths: [14],
+                lengths: [14, 16, 17, 18, 19],
                 code: {
                     name: 'CVV',
                     size: 3
@@ -60,9 +61,9 @@ define(
             {
                 title: 'Discover',
                 type: 'DI',
-                pattern: '^6(0|01|011\\d*|5\\d*|4|4[4-9]\\d*)?$',
+                pattern: '^(6011(0|[2-4]|74|7[7-9]|8[6-9]|9)|6(4[4-9]|5))\\d*$',
                 gaps: [4, 8, 12],
-                lengths: [16],
+                lengths: [16, 17, 18, 19],
                 code: {
                     name: 'CID',
                     size: 3
@@ -71,9 +72,9 @@ define(
             {
                 title: 'JCB',
                 type: 'JCB',
-                pattern: '^((2|21|213|2131\\d*)|(1|18|180|1800\\d*)|(3|35\\d*))$',
+                pattern: '^35(2[8-9]|[3-8])\\d*$',
                 gaps: [4, 8, 12],
-                lengths: [16],
+                lengths: [16, 17, 18, 19],
                 code: {
                     name: 'CVV',
                     size: 3
@@ -82,7 +83,7 @@ define(
             {
                 title: 'UnionPay',
                 type: 'UN',
-                pattern: '^6(2\\d*)?$',
+                pattern: '^(622(1(2[6-9]|[3-9])|[3-8]|9([[0-1]|2[0-5]))|62[4-6]|628([2-8]))\\d*?$',
                 gaps: [4, 8, 12],
                 lengths: [16, 17, 18, 19],
                 code: {
@@ -113,7 +114,13 @@ define(
                 }
             }
         ];
+
         return {
+            /**
+             * Get credit card type
+             * @param {String} cardNumber
+             * @returns {Array}
+             */
             getCardTypes: function (cardNumber) {
                 var i, value,
                     result = [];
@@ -133,8 +140,9 @@ define(
                         result.push($.extend(true, {}, value));
                     }
                 }
+
                 return result;
             }
-        }
+        };
     }
 );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
similarity index 71%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
index 54da68c65c06d..e8dc3a35edea9 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
@@ -6,17 +6,19 @@
 /*global alert*/
 define(
     [],
-    function() {
+    function () {
         'use strict';
+
         /**
          * Luhn algorithm verification
          */
-        return function(a, b, c, d, e) {
-            for(d = +a[b = a.length-1], e = 0; b--;) {
+        return function (a, b, c, d, e) {
+            for (d = +a[b = a.length - 1], e = 0; b--;) {
                 c = +a[b];
                 d += ++e % 2 ? 2 * c % 10 + (c > 4) : c;
             }
-            return !(d%10)
+
+            return !(d % 10);
         };
     }
 );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/cvv-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
similarity index 81%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/cvv-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
index 5688f50aa865b..1a8b8df2c220f 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/cvv-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
@@ -6,9 +6,15 @@
 /*global alert*/
 define(
     [],
-    function() {
+    function () {
         'use strict';
 
+        /**
+         * Validation result wrapper
+         * @param {Boolean} isValid
+         * @param {Boolean} isPotentiallyValid
+         * @returns {Object}
+         */
         function resultWrapper(isValid, isPotentiallyValid) {
             return {
                 isValid: isValid,
@@ -20,19 +26,23 @@ define(
          * CVV number validation
          * validate digit count fot CVV code
          */
-        return function(value, maxLength) {
+        return function (value, maxLength) {
             var DEFAULT_LENGTH = 3;
+
             maxLength = maxLength || DEFAULT_LENGTH;
 
             if (!/^\d*$/.test(value)) {
                 return resultWrapper(false, false);
             }
+
             if (value.length === maxLength) {
                 return resultWrapper(true, true);
             }
+
             if (value.length < maxLength) {
                 return resultWrapper(false, true);
             }
+
             if (value.length > maxLength) {
                 return resultWrapper(false, false);
             }
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator.js
similarity index 81%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator.js
index 6661a595b8bc2..5e73f87f4e9ea 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator.js
@@ -11,9 +11,17 @@ define(
         'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator',
         'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator'
     ],
-    function(utils, parseDate, expirationMonth, expirationYear) {
+    function (utils, parseDate, expirationMonth, expirationYear) {
         'use strict';
 
+        /**
+         * Validation result wrapper
+         * @param {Boolean} isValid
+         * @param {Boolean} isPotentiallyValid
+         * @param {String} month
+         * @param {String} year
+         * @returns {Object}
+         */
         function resultWrapper(isValid, isPotentiallyValid, month, year) {
             return {
                 isValid: isValid,
@@ -23,7 +31,7 @@ define(
             };
         }
 
-        return function(value) {
+        return function (value) {
             var date,
                 monthValid,
                 yearValid;
@@ -46,6 +54,6 @@ define(
             }
 
             return resultWrapper(false, false, null, null);
-        }
+        };
     }
 );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
similarity index 79%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
index 03b4ebcdec683..fcf4100c18d3b 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
@@ -9,6 +9,12 @@ define(
     function () {
         'use strict';
 
+        /**
+         * Validation result wrapper
+         * @param {Boolean} isValid
+         * @param {Boolean} isPotentiallyValid
+         * @returns {Object}
+         */
         function resultWrapper(isValid, isPotentiallyValid) {
             return {
                 isValid: isValid,
@@ -20,7 +26,7 @@ define(
             var month,
                 monthValid;
 
-            if ((value.replace(/\s/g, '') === '') || (value === '0')) {
+            if (value.replace(/\s/g, '') === '' || value === '0') {
                 return resultWrapper(false, true);
             }
 
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
similarity index 82%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
index 38494ccbe9c06..1116288f6edff 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
@@ -6,9 +6,15 @@
 /*global alert*/
 define(
     [],
-    function() {
+    function () {
         'use strict';
 
+        /**
+         * Validation result wrapper
+         * @param {Boolean} isValid
+         * @param {Boolean} isPotentiallyValid
+         * @returns {Object}
+         */
         function resultWrapper(isValid, isPotentiallyValid) {
             return {
                 isValid: isValid,
@@ -16,7 +22,7 @@ define(
             };
         }
 
-        return function(value) {
+        return function (value) {
             var currentYear = new Date().getFullYear(),
                 len = value.length,
                 valid,
@@ -36,6 +42,7 @@ define(
 
             value = parseInt(value, 10);
             valid = value >= currentYear && value <= currentYear + expMaxLifetime;
+
             return resultWrapper(valid, valid);
         };
     }
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
similarity index 78%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
index 057eb1491f27c..6e445f779b7d5 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
@@ -6,9 +6,10 @@
 /*global alert*/
 define(
     [],
-    function() {
+    function () {
         'use strict';
-        return function(value) {
+
+        return function (value) {
             var month, len;
 
             if (value.match('/')) {
@@ -20,13 +21,13 @@ define(
                 };
             }
 
-            len = (value[0] === '0' || value.length > 5 || value.length === 4 || value.length === 3) ? 2 : 1;
+            len = value[0] === '0' || value.length > 5 || value.length === 4 || value.length === 3 ? 2 : 1;
             month = value.substr(0, len);
 
             return {
                 month: month,
                 year: value.substr(month.length, 4)
             };
-        }
+        };
     }
 );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
similarity index 74%
rename from app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js
rename to app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
index e859a03491cba..9720a2fcf058c 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
@@ -5,6 +5,8 @@
 /*jshint browser:true jquery:true*/
 /*global alert*/
 (function (factory) {
+    'use strict';
+
     if (typeof define === 'function' && define.amd) {
         define([
             'jquery',
@@ -12,13 +14,14 @@
             'Magento_Payment/js/model/credit-card-validation/credit-card-number-validator',
             'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator',
             'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator',
-            'Magento_Payment/js/model/credit-card-validation/credit-card-data'
+            'Magento_Payment/js/model/credit-card-validation/credit-card-data',
+            'mage/translate'
         ], factory);
     } else {
         factory(jQuery);
     }
 }(function ($, cvvValidator, creditCardNumberValidator, expirationDateValidator, monthValidator, creditCardData) {
-    "use strict";
+    'use strict';
 
     $.each({
         'validate-card-type': [
@@ -37,59 +40,65 @@
                             return true;
                         }
                     }
+
                     return false;
                 }
             },
-            'Please enter a valid credit card type number.'
+            $.mage.__('Please enter a valid credit card type number.')
         ],
         'validate-card-number': [
+
             /**
              * Validate credit card number based on mod 10
-             * @param number - credit card number
-             * @return {boolean}
+             * @param {String} number - credit card number
+             * @return {Boolean}
              */
-                function (number) {
+            function (number) {
                 return creditCardNumberValidator(number).isValid;
             },
-            'Please enter a valid credit card number.'
+            $.mage.__('Please enter a valid credit card number.')
         ],
         'validate-card-date': [
+
             /**
              * Validate credit card number based on mod 10
-             * @param date - month
-             * @return {boolean}
+             * @param {String} date - month
+             * @return {Boolean}
              */
-                function (date) {
+            function (date) {
                 return monthValidator(date).isValid;
             },
-            'Incorrect credit card expiration month.'
+            $.mage.__('Incorrect credit card expiration month.')
         ],
         'validate-card-cvv': [
+
             /**
              * Validate credit card number based on mod 10
-             * @param cvv - month
-             * @return {boolean}
+             * @param {String} cvv - month
+             * @return {Boolean}
              */
-                function (cvv) {
+            function (cvv) {
                 var maxLength = creditCardData.creditCard ? creditCardData.creditCard.code.size : 3;
+
                 return cvvValidator(cvv, maxLength).isValid;
             },
-            'Please enter a valid credit card verification number.'
+            $.mage.__('Please enter a valid credit card verification number.')
         ],
         'validate-card-year': [
+
             /**
              * Validate credit card number based on mod 10
-             * @param date - month
-             * @return {boolean}
+             * @param {String} date - month
+             * @return {Boolean}
              */
-                function (date) {
+            function (date) {
                 return monthValidator(date).isValid;
             },
-            'Incorrect credit card expiration year.'
+            $.mage.__('Incorrect credit card expiration year.')
         ]
 
     }, function (i, rule) {
         rule.unshift(i);
         $.validator.addMethod.apply($.validator, rule);
     });
-}));
\ No newline at end of file
+}));
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
index 0a3de4115b24a..d1fb33e902f85 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
@@ -3,34 +3,42 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
+use Magento\Backend\Block\Template;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+
 /**
- * Renderer for PayPal banner in System Configuration
- * @author      Magento Core Team <core@magentocommerce.com>
+ * Class Hint adds "Configuration Details" link to payment configuration.
+ * `<comment>` node must be defined in `<group>` node and contain some link.
  */
-class Hint extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Hint extends Template implements RendererInterface
 {
     /**
      * @var string
+     * @deprecated
      */
     protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml';
 
     /**
-     * Render fieldset html
-     *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    public function render(AbstractElement $element)
     {
-        $elementOriginalData = $element->getOriginalData();
-        if (isset($elementOriginalData['help_link'])) {
-            $this->setHelpLink($elementOriginalData['help_link']);
+        $html = '';
+
+        if ($element->getComment()) {
+            $html .= sprintf('<tr id="row_%s">', $element->getHtmlId());
+            $html .= '<td colspan="1"><p class="note"><span>';
+            $html .= sprintf(
+                '<a href="%s" target="_blank">Configuration Details</a>',
+                $element->getComment()
+            );
+            $html .= '</span></p></td></tr>';
         }
-        return $this->toHtml();
+
+        return $html;
     }
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index d49403f94ebe1..725ebb2282418 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -78,17 +78,10 @@ protected function _isPaymentEnabled($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
-        $html = '<div class="config-heading" ><div class="heading"><strong>' . $element->getLegend();
+        $html = '<div class="config-heading" >';
 
         $groupConfig = $element->getGroup();
 
-        $html .= '</strong>';
-
-        if ($element->getComment()) {
-            $html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
-        }
-        $html .= '</div>';
-
         $disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
         $disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
         $htmlId = $element->getHtmlId();
@@ -121,6 +114,13 @@ protected function _getHeaderTitleHtml($element)
             ) . '</a>';
         }
 
+        $html .= '</div>';
+        $html .= '<div class="heading"><strong>' . $element->getLegend() . '</strong>';
+
+        if ($element->getComment()) {
+            $html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
+        }
+        $html .= '<div class="config-alt"></div>';
         $html .= '</div></div>';
 
         return $html;
@@ -149,4 +149,33 @@ protected function _isCollapseState($element)
     {
         return false;
     }
+
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function _getExtraJs($element)
+    {
+        $script = "require(['jquery', 'prototype'], function(jQuery){
+            window.paypalToggleSolution = function (id, url) {
+                var doScroll = false;
+                Fieldset.toggleCollapse(id, url);
+                if ($(this).hasClassName(\"open\")) {
+                    $$(\".with-button button.button\").each(function(anotherButton) {
+                        if (anotherButton != this && $(anotherButton).hasClassName(\"open\")) {
+                            $(anotherButton).click();
+                            doScroll = true;
+                        }
+                    }.bind(this));
+                }
+                if (doScroll) {
+                    var pos = Element.cumulativeOffset($(this));
+                    window.scrollTo(pos[0], pos[1] - 45);
+                }
+            }
+        });";
+
+        return $this->_jsHelper->getScript($script);
+    }
 }
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 04620e2d15d31..e02615d24ad3d 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1299,7 +1299,7 @@ public function getWppCcTypesAsOptionArray()
     public function getWppPeCcTypesAsOptionArray()
     {
         return $this->_cctypeFactory->create()->setAllowedTypes(
-            ['VI', 'MC', 'SM', 'SO', 'OT', 'AE']
+            ['VI', 'MC', 'SM', 'SO', 'AE']
         )->toOptionArray();
     }
 
@@ -1310,7 +1310,7 @@ public function getWppPeCcTypesAsOptionArray()
      */
     public function getPayflowproCcTypesAsOptionArray()
     {
-        return $this->_cctypeFactory->create()->setAllowedTypes(['AE', 'VI', 'MC', 'JCB', 'DI'])->toOptionArray();
+        return $this->_cctypeFactory->create()->setAllowedTypes(['AE', 'VI', 'MC', 'JCB', 'DI', 'DN'])->toOptionArray();
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
index 2767e438d50c0..52f46a8411c02 100644
--- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Paypal\Model\Config;
 
+use Magento\Config\Model\Config\ScopeDefiner;
+use Magento\Config\Model\Config\Structure;
+use Magento\Config\Model\Config\Structure\Element\Section;
+use Magento\Config\Model\Config\Structure\ElementInterface;
+use Magento\Paypal\Helper\Backend as BackendHelper;
+
 class StructurePlugin
 {
     /**
@@ -13,12 +19,12 @@ class StructurePlugin
     const REQUEST_PARAM_COUNTRY = 'paypal_country';
 
     /**
-     * @var \Magento\Paypal\Helper\Backend
+     * @var BackendHelper
      */
     protected $_helper;
 
     /**
-     * @var \Magento\Config\Model\Config\ScopeDefiner
+     * @var ScopeDefiner
      */
     protected $_scopeDefiner;
 
@@ -40,12 +46,12 @@ class StructurePlugin
     ];
 
     /**
-     * @param \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner
-     * @param \Magento\Paypal\Helper\Backend $helper
+     * @param ScopeDefiner $scopeDefiner
+     * @param BackendHelper $helper
      */
     public function __construct(
-        \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner,
-        \Magento\Paypal\Helper\Backend $helper
+        ScopeDefiner $scopeDefiner,
+        BackendHelper $helper
     ) {
         $this->_scopeDefiner = $scopeDefiner;
         $this->_helper = $helper;
@@ -69,14 +75,14 @@ public static function getPaypalConfigCountries($addOther = false)
     /**
      * Substitute payment section with PayPal configs
      *
-     * @param \Magento\Config\Model\Config\Structure $subject
+     * @param Structure $subject
      * @param \Closure $proceed
      * @param array $pathParts
-     * @return \Magento\Config\Model\Config\Structure\ElementInterface
+     * @return ElementInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundGetElementByPathParts(
-        \Magento\Config\Model\Config\Structure $subject,
+        Structure $subject,
         \Closure $proceed,
         array $pathParts
     ) {
@@ -89,10 +95,11 @@ public function aroundGetElementByPathParts(
                 $pathParts[0] = 'payment_other';
             }
         }
-        /** @var \Magento\Config\Model\Config\Structure\ElementInterface $result */
+        /** @var ElementInterface $result */
         $result = $proceed($pathParts);
         if ($isSectionChanged && isset($result)) {
-            if ($result instanceof \Magento\Config\Model\Config\Structure\Element\Section) {
+            if ($result instanceof Section) {
+                $this->restructurePayments($result);
                 $result->setData(array_merge(
                     $result->getData(),
                     ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true]
@@ -101,4 +108,63 @@ public function aroundGetElementByPathParts(
         }
         return $result;
     }
+
+    /**
+     * Changes payment config structure.
+     * Groups which have `displayIn` element, transfer to appropriate group.
+     * Groups without `displayIn` transfer to other payment methods group.
+     *
+     * @param Section $result
+     * @return void
+     */
+    private function restructurePayments(Section $result)
+    {
+        $sectionMap = [
+            'account' => [],
+            'recommended_solutions' => [],
+            'other_paypal_payment_solutions' => [],
+            'other_payment_methods' => []
+        ];
+
+        $configuration = $result->getData();
+
+        foreach ($configuration['children'] as $section => $data) {
+            if (array_key_exists($section, $sectionMap)) {
+                $sectionMap[$section] = $data;
+            } elseif ($displayIn = $this->getDisplayInSection($section, $data)) {
+                $sectionMap[$displayIn['parent']]['children'][$displayIn['section']] = $displayIn['data'];
+            } else {
+                $sectionMap['other_payment_methods']['children'][$section] = $data;
+            }
+        }
+
+        $configuration['children'] = $sectionMap;
+        $result->setData($configuration, $this->_scopeDefiner->getScope());
+    }
+
+    /**
+     * Recursive search of `displayIn` element in node children
+     *
+     * @param string $section
+     * @param array $data
+     * @return array|null
+     */
+    private function getDisplayInSection($section, $data)
+    {
+        if (is_array($data) && array_key_exists('displayIn', $data)) {
+            return [
+                'parent' => $data['displayIn'],
+                'section' => $section,
+                'data' => $data
+            ];
+        }
+
+        if (array_key_exists('children', $data)) {
+            foreach ($data['children'] as $childSection => $childData) {
+                return $this->getDisplayInSection($childSection, $childData);
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index 05609ee5ee88f..df9611743f87d 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -184,6 +184,7 @@ public function authorize(InfoInterface $payment, $amount)
         $this->createPaymentToken($payment, $token);
 
         $payment->unsAdditionalInformation(self::CC_DETAILS);
+        $payment->unsAdditionalInformation(self::PNREF);
 
         return $this;
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php
new file mode 100644
index 0000000000000..5d639afb9c346
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class HintTest
+ */
+class HintTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Hint
+     */
+    private $block;
+
+    /**
+     * @var AbstractElement|MockObject
+     */
+    private $element;
+
+    protected function setUp()
+    {
+        $om = new ObjectManager($this);
+
+        $this->element = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment', 'getHtmlId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->block = $om->getObject(Hint::class);
+    }
+
+    /**
+     * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render
+     */
+    public function testRender()
+    {
+        $expected = '<tr id="row_payment"><td colspan="1"><p class="note"><span>';
+        $expected .= '<a href="http://test.com" target="_blank">Configuration Details</a>';
+        $expected .= '</span></p></td></tr>';
+
+        $this->element->expects(static::exactly(2))
+            ->method('getComment')
+            ->willReturn('http://test.com');
+
+        $this->element->expects(static::once())
+            ->method('getHtmlId')
+            ->willReturn('payment');
+
+        static::assertSame($expected, $this->block->render($this->element));
+    }
+
+    /**
+     * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render
+     */
+    public function testRenderEmptyComment()
+    {
+        $this->element->expects(static::once())
+            ->method('getComment')
+            ->willReturn('');
+
+        $this->element->expects(static::never())
+            ->method('getHtmlId');
+
+        static::assertSame('', $this->block->render($this->element));
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
index 0c4e4218d293d..c97269287c736 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
@@ -136,15 +136,31 @@ public function testAroundGetSectionByPathParts($pathParts, $countryCode, $expec
         $getElementByPathParts = function ($pathParts) use ($self, $expectedPathParts, $result) {
             $self->assertEquals($expectedPathParts, $pathParts);
             $scope = 'any scope';
-            $self->_scopeDefiner->expects($self->once())
+            $sectionMap = [
+                'account' => [],
+                'recommended_solutions' => [],
+                'other_paypal_payment_solutions' => [],
+                'other_payment_methods' => []
+            ];
+            $self->_scopeDefiner->expects($self->any())
                 ->method('getScope')
                 ->will($self->returnValue($scope));
-            $result->expects($self->once())
+            $result->expects($self->at(0))
                 ->method('getData')
-                ->will($self->returnValue([]));
-            $result->expects($self->once())
+                ->will($self->returnValue(['children' => []]));
+            $result->expects($self->at(2))
+                ->method('getData')
+                ->will($self->returnValue(['children' => $sectionMap]));
+            $result->expects($self->at(1))
+                ->method('setData')
+                ->with(['children' => $sectionMap], $scope)
+                ->will($self->returnSelf());
+            $result->expects($self->at(3))
                 ->method('setData')
-                ->with(['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true], $scope)
+                ->with(['children' => $sectionMap,
+                    'showInDefault' => true,
+                    'showInWebsite' => true,
+                    'showInStore' => true], $scope)
                 ->will($self->returnSelf());
             return $result;
         };
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index bbbb3ea187d18..c72b0b4b49694 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
@@ -8,7 +8,7 @@
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
+use Magento\Vault\Model\CreditCardTokenFactory;
 
 /**
  * Class TransparentTest
@@ -49,7 +49,7 @@ class TransparentTest extends \PHPUnit_Framework_TestCase
     protected $addressShippingMock;
 
     /**
-     * @var PaymentTokenInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CreditCardTokenFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $paymentTokenFactory;
 
@@ -66,7 +66,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->paymentTokenFactory = $this->getMockBuilder('\Magento\Vault\Api\Data\PaymentTokenInterfaceFactory')
+        $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -425,6 +425,13 @@ public function testAuthorize()
             ->method('setVaultPaymentToken')
             ->with($paymentTokenMock);
 
+        $this->paymentMock->expects($this->at(8))
+            ->method('unsAdditionalInformation')
+            ->with(Transparent::CC_DETAILS);
+        $this->paymentMock->expects($this->at(9))
+            ->method('unsAdditionalInformation')
+            ->with(Transparent::PNREF);
+
         $this->assertSame($this->object, $this->object->authorize($this->paymentMock, 33));
     }
 }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/di.xml b/app/code/Magento/Paypal/etc/adminhtml/di.xml
index 0ae9d9569969d..186649b01a22f 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/di.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/di.xml
@@ -42,6 +42,7 @@
     </type>
     <type name="Magento\Paypal\Model\Payflow\Transparent">
         <arguments>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\CreditCardTokenFactory</argument>
             <argument name="data" xsi:type="array">
                 <item name="formBlockType" xsi:type="string">Magento\Paypal\Block\Adminhtml\Payflowpro\CcForm</item>
             </argument>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 4fdee80a457bc..c4fe3def36c25 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -8,10 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="paypal_notice" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup</help_url>
-            </group>
             <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Merchant Location</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -24,6 +20,21 @@
                     <config_path>paypal/general/merchant_country</config_path>
                 </field>
             </group>
+            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Recommended Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+            </group>
+            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other PayPal Payment Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
+            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other Payment Methods:</label>
+                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
             <include path="Magento_Paypal::system/paypal_payflowpro.xml"/>
@@ -38,21 +49,33 @@
                 </group>
             </group>
         </section>
-        <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+        <section id="payment_us" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                    <attribute type="shared">0</attribute>
+                    <attribute type="activity_path">payment/paypal_express/active</attribute>
+                    <attribute type="activity_path">payment/payflow_express/active</attribute>
+                    <attribute type="displayIn">recommended_solutions</attribute>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <include path="Magento_Paypal::system/payflow_advanced.xml"/>
-                <group id="wpp_usuk" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-                    <label>Payments Pro (Includes Express Checkout)</label>
+                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
+                    <label>Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                    <more_url>https://www.paypal.com/us/webapps/mpp/paypal-payments-pro?partner_id=NB9WWHYEMVUMS</more_url>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <field id="enable_paypal_payflow">
                             <attribute type="shared">0</attribute>
@@ -70,6 +93,9 @@
                     <label>Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Payments Standard</label>
@@ -88,42 +114,40 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_payment_gateways" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Payment Gateways</label>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Process payments using your own internet merchant account.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <include path="Magento_Paypal::system/paypal_payflowpro_with_express_checkout.xml"/>
                 <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
-                    <attribute type="shared">0</attribute>
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                </group>
-            </group>
         </section>
         <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
+                    <group id="express_checkout_required">
+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
+                    </group>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <group id="wpp_usuk" translate="comment" sortOrder="20">
                     <fieldset_css>pp-general-uk</fieldset_css>
-                    <more_url>https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm</more_url>
                     <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
                     <comment>Accept payments with a completely customizable checkout page.</comment>
                     <group id="wpp_required_settings">
@@ -137,6 +161,9 @@
                     <label>Website Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
@@ -155,31 +182,16 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
         </section>
         <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="express_checkout_de" extends="payment_all_paypal/express_checkout">
+            <group id="paypal_payment_solutions" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <group id="express_checkout_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
@@ -194,17 +206,35 @@
             </group>
         </section>
         <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>PayPal Express Checkout</label>
+                <fieldset_css>complex paypal-express-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                 <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout">
+                <attribute type="displayIn">recommended_solutions</attribute>
+                <group id="express_checkout_required">
+                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
+                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Choose a secure bundled payment solution for your business.</comment>
+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
+                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Website Payments Standard</label>
+                    <fieldset_css>complex</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
@@ -222,21 +252,34 @@
                         <label>Basic Settings - PayPal Website Payments Standard</label>
                     </group>
                 </group>
-                <group id="express_checkout_other" extends="payment_all_paypal/express_checkout">
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
+            </group>
+            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Process payments using your own internet merchant account.</comment>
+                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
             </group>
         </section>
         <section id="payment_ca" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other">
+                <attribute type="activity_path">payment/paypal_express/active</attribute>
+                <attribute type="activity_path">payment/payflow_express/active</attribute>
+            </group>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="20"/>
-                <group id="wpp_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20">
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
                     <label>Website Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <group id="paypal_payflow_api_settings">
                             <label>Payments Pro</label>
@@ -254,76 +297,76 @@
                         <label>Basic Settings - PayPal Payments Pro</label>
                     </group>
                 </group>
-                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30"/>
-                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="40">
+                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
+                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
                     <group id="payflow_link_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                 </group>
-                <group id="express_checkout_other" sortOrder="50">
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                </group>
             </group>
         </section>
         <section id="payment_au" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="10"/>
-                <group id="express_checkout_other" sortOrder="40"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other" sortOrder="12"/>
+                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
                 <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30"/>
             </group>
         </section>
         <section id="payment_jp" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Website Payments Plus</label>
                 </group>
             </group>
         </section>
         <section id="payment_fr" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Integral Evolution</label>
                 </group>
             </group>
         </section>
         <section id="payment_it" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pro</label>
                 </group>
             </group>
         </section>
         <section id="payment_es" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pasarela integral</label>
                 </group>
             </group>
         </section>
         <section id="payment_hk" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
             </group>
         </section>
         <section id="payment_nz" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
-                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro" sortOrder="10"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 8972bcbc5def5..90cb60186e34e 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -9,10 +9,13 @@
     <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
         <label>Express Checkout</label>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>pp-method-express</fieldset_css>
+        <fieldset_css>paypal-other-section</fieldset_css>
         <comment>Add PayPal as an additional payment method to your checkout page.</comment>
         <attribute type="activity_path">payment/paypal_express/active</attribute>
-        <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-express-checkout?partner_id=NB9WWHYEMVUMS</more_url>
+        <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
+            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+        </group>
         <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -20,7 +23,8 @@
                 <label>Express Checkout</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
-                    <label>Email Associated with PayPal Merchant Account</label>
+                    <label>Email Associated with PayPal Merchant Account (Optional)</label>
+                    <frontend_class>not-required</frontend_class>
                     <comment>
                         <![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
                     </comment>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index fdb3d0e08df73..c6b29b094f896 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -7,12 +7,15 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="payflow_advanced" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-        <label>Payments Advanced (Includes Express Checkout)</label>
-        <fieldset_css>pp-method-general</fieldset_css>
+        <label>Payments Advanced</label>
+        <fieldset_css>paypal-other-section</fieldset_css>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payments-advanced?partner_id=NB9WWHYEMVUMS</more_url>
-        <comment>Accept payments with a PCI-compliant checkout that keeps customers on your site.</comment>
+        <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
         <attribute type="activity_path">payment/payflow_advanced/active</attribute>
+        <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
+            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+        </group>
         <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index f6f2829b11424..4167ea92c1b46 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -7,12 +7,15 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="payflow_link" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-        <label>Payflow Link (Includes Express Checkout)</label>
+        <label>Payflow Link</label>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>pp-method-payflow</fieldset_css>
-        <comment>Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.</comment>
+        <fieldset_css>paypal-other-section</fieldset_css>
+        <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
         <attribute type="activity_path">payment/payflow_link/active</attribute>
-        <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payflow-link?partner_id=NB9WWHYEMVUMS</more_url>
+        <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
+            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+        </group>
         <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index 2f92c17c142aa..37141f40549c9 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -8,11 +8,15 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="payments_pro_hosted_solution" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
         <label>Website Payments Pro Hosted Solution</label>
-        <fieldset_css>pp-method-general</fieldset_css>
+        <fieldset_css>paypal-other-section</fieldset_css>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
         <attribute type="activity_path">payment/hosted_pro/active</attribute>
-        <comment>Accept payments with a PCI compliant checkout that keeps customers on your site.</comment>
+        <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
         <attribute type="paypal_ec_separate">1</attribute>
+        <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+        </group>
         <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml
index 570d09201ff1e..a70d8531f2165 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml
@@ -6,10 +6,8 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="payments_pro_hosted_solution_with_express_checkout" translate="labelcomment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
-        <label>Website Payments Pro Hosted Solution (Includes Express Checkout)</label>
-        <fieldset_css>pp-general-uk</fieldset_css>
-        <more_url>https://cms.paypal.com/cms_content/GB/en_GB/files/developer/HostedSolution.pdf</more_url>
+    <group id="payments_pro_hosted_solution_with_express_checkout" translate="label comment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
+        <label>Website Payments Pro Hosted Solution</label>
         <attribute type="paypal_ec_separate">0</attribute>
         <group id="pphs_required_settings">
             <group id="pphs_required_settings_pphs" translate="label">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index 2150d5dcb392b..98f340f0a2711 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -9,11 +9,14 @@
     <group id="paypal_payflowpro" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
         <label>Payflow Pro</label>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>pp-method-payflow</fieldset_css>
-        <comment>Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.</comment>
+        <fieldset_css>paypal-other-section</fieldset_css>
+        <comment><![CDATA[Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
         <attribute type="activity_path">payment/payflowpro/active</attribute>
-        <more_url>https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS</more_url>
         <attribute type="paypal_ec_separate">1</attribute>
+        <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+            <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
+            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+        </group>
         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -81,7 +84,7 @@
                 </requires>
             </field>
             <field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
-                <label>Vault enabled</label>
+                <label>Vault Enabled</label>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <config_path>payment/payflowpro_cc_vault/active</config_path>
                 <attribute type="shared">1</attribute>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index d347ecd9c532a..3e8b6d0ef47ca 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -7,7 +7,7 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
-        <label>Payflow Pro (Includes Express Checkout)</label>
+        <label>Payflow Pro</label>
         <attribute type="paypal_ec_separate">0</attribute>
         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
diff --git a/app/code/Magento/Paypal/etc/di.xml b/app/code/Magento/Paypal/etc/di.xml
index 8c340b2ba2d85..83162c727c7b6 100644
--- a/app/code/Magento/Paypal/etc/di.xml
+++ b/app/code/Magento/Paypal/etc/di.xml
@@ -176,7 +176,11 @@
             </argument>
         </arguments>
     </type>
-
+    <type name="Magento\Paypal\Model\Payflow\Transparent">
+        <arguments>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\CreditCardTokenFactory</argument>
+        </arguments>
+    </type>
     <type name="Magento\Config\Model\Config\Export\ExcludeList">
         <arguments>
             <argument name="configs" xsi:type="array">
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index ad97afb85e65e..5c3bf52d825b9 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -677,4 +677,6 @@ User,User
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
-"payflowpro","Payflow Pro"
\ No newline at end of file
+"payflowpro","Payflow Pro"
+"Payments Pro","Payments Pro"
+"Website Payments Pro","Website Payments Pro"
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
index 0258bcc0f4e2d..148d8f8a4c3fc 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
@@ -23,23 +23,3 @@ if ($helpLink):
 <?php
 endif;
 ?>
-<script>
-require(['jquery', 'prototype'], function(jQuery){
-    window.paypalToggleSolution = function (id, url) {
-        var doScroll = false;
-        Fieldset.toggleCollapse(id, url);
-        if ($(this).hasClassName("open")) {
-            $$(".with-button button.button").each(function(anotherButton) {
-                if (anotherButton != this && $(anotherButton).hasClassName("open")) {
-                    $(anotherButton).click();
-                    doScroll = true;
-                }
-            }.bind(this));
-        }
-        if (doScroll) {
-            var pos = Element.cumulativeOffset($(this));
-            window.scrollTo(pos[0], pos[1] - 45);
-        }
-    }
-});
-</script>
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg b/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg
new file mode 100644
index 0000000000000..962e7d36b6c16
Binary files /dev/null and b/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png
new file mode 100644
index 0000000000000..780c84f6c563d
Binary files /dev/null and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png
new file mode 100644
index 0000000000000..040f73c6c1dc2
Binary files /dev/null and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/styles.css b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
index d97033bd388d2..9119a2e317fb7 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
@@ -14,3 +14,21 @@
 .payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;}
 .payflow-settings-notice .important-label {color:#f00;}
 .payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
+.paypal-express-section .heading {background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
+.paypal-express-section .button-container {float: right;}
+.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;}
+.paypal-express-section .link-more {margin-left: 5px;}
+.paypal-other-section .button-container {float: right; margin: 1rem 0 0 !important;}
+.paypal-other-section > .entry-edit-head > a::before {left: auto !important; right: 1.3rem !important;}
+.paypal-all-in-one-section > .entry-edit-head {background: url("images/AM_mc_vs_dc_ae.jpg") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
+.paypal-gateways-section > .entry-edit-head {background: url("images/pp-payflow-mark.png") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
+.paypal-top-section > .entry-edit-head.admin__collapsible-block {border-bottom: 0;}
+.paypal-top-section.active > .entry-edit-head.admin__collapsible-block {border-bottom: 1px solid #ccc;}
+.paypal-top-section > .admin__collapsible-block > a {font-size: 1.4rem; font-weight: normal; text-transform: uppercase;}
+.paypal-recommended-header > .admin__collapsible-block > a::before {content: "" !important;}
+.paypal-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
+.paypal-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
+.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
+.payments-other-header > .admin__collapsible-block > a {display: inline-block;}
+.payments-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
+.payments-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index da1da321fe621..4d85a3abcca0c 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -51,8 +51,8 @@
                 <input type="checkbox"
                        name="vault[is_enabled]"
                        class="checkbox-inline"
-                       data-bind="attr: {'id': getCode() + '_vault_enabler'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
-                <label class="label" data-bind="attr: {'for': getCode() + '_vault_enabler'}">
+                       data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
+                <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
                     <span><!-- ko i18n: 'Save credit card information for future use.'--><!-- /ko --></span>
                 </label>
             </div>
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index bee30355e69e5..fde151914b92a 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -769,7 +769,7 @@ public function canReorderIgnoreSalable()
      */
     protected function _canReorder($ignoreSalable = false)
     {
-        if ($this->canUnhold() || $this->isPaymentReview() || !$this->getCustomerId()) {
+        if ($this->canUnhold() || $this->isPaymentReview()) {
             return false;
         }
 
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
index 67291b9372421..5bef05e6f28e0 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
@@ -10,6 +10,9 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 
+/**
+ * Class AuthorizeCommand
+ */
 class AuthorizeCommand implements CommandInterface
 {
     /**
@@ -23,29 +26,22 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
         $state = Order::STATE_PROCESSING;
         $status = false;
         $formattedAmount = $order->getBaseCurrency()->formatTxt($amount);
+
         if ($payment->getIsTransactionPending()) {
             $state = Order::STATE_PAYMENT_REVIEW;
-            $message = __(
-                'We will authorize %1 after the payment is approved at the payment gateway.',
-                $formattedAmount
-            );
+            $message = 'We will authorize %1 after the payment is approved at the payment gateway.';
         } else {
-            if ($payment->getIsFraudDetected()) {
-                $state = Order::STATE_PROCESSING;
-                $message = __(
-                    'Order is suspended as its authorizing amount %1 is suspected to be fraudulent.',
-                    $formattedAmount
-                );
-            } else {
-                $message = __('Authorized amount of %1', $formattedAmount);
-            }
+            $message = 'Authorized amount of %1.';
         }
+
         if ($payment->getIsFraudDetected()) {
+            $state = Order::STATE_PAYMENT_REVIEW;
             $status = Order::STATUS_FRAUD;
+            $message .= ' Order is suspended as its authorizing amount %1 is suspected to be fraudulent.';
         }
         $this->setOrderStateAndStatus($order, $status, $state);
 
-        return $message;
+        return __($message, $formattedAmount);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
index 5639de4433f93..d2c7e2a7e71b3 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
@@ -9,6 +9,9 @@
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order as SalesOrder;
 
+/**
+ * Class CaptureCommand
+ */
 class CaptureCommand implements CommandInterface
 {
     /**
@@ -24,22 +27,23 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
         $state = SalesOrder::STATE_PROCESSING;
         $status = false;
         $formattedAmount = $order->getBaseCurrency()->formatTxt($amount);
+
         if ($payment->getIsTransactionPending()) {
-            $message = __(
-                'An amount of %1 will be captured after being approved at the payment gateway.',
-                $formattedAmount
-            );
             $state = SalesOrder::STATE_PAYMENT_REVIEW;
-            if ($payment->getIsFraudDetected()) {
-                $status = SalesOrder::STATUS_FRAUD;
-            }
+            $message = 'An amount of %1 will be captured after being approved at the payment gateway.';
         } else {
             // normal online capture: invoice is marked as "paid"
-            $message = __('Captured amount of %1 online', $formattedAmount);
+            $message = 'Captured amount of %1 online.';
+        }
+
+        if ($payment->getIsFraudDetected()) {
+            $state = SalesOrder::STATE_PAYMENT_REVIEW;
+            $status = SalesOrder::STATUS_FRAUD;
+            $message .= ' Order is suspended as its capturing amount %1 is suspected to be fraudulent.';
         }
         $this->setOrderStateAndStatus($order, $status, $state);
 
-        return $message;
+        return __($message, $formattedAmount);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php
new file mode 100644
index 0000000000000..ae75fcb8ee2b0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Order\Payment\State;
+
+use Magento\Directory\Model\Currency;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Config;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\State\AuthorizeCommand;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class AuthorizeCommandTest
+ * @see \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand
+ */
+class AuthorizeCommandTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Payment|MockObject
+     */
+    private $payment;
+
+    /**
+     * @var Order|MockObject
+     */
+    private $order;
+
+    /**
+     * @var Currency|MockObject
+     */
+    private $currency;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var AuthorizeCommand
+     */
+    private $command;
+
+    /**
+     * @var int
+     */
+    private $amount = 45;
+
+    protected function setUp()
+    {
+        $this->currency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['formatTxt'])
+            ->getMock();
+
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStateDefaultStatus'])
+            ->getMock();
+
+        $this->payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIsTransactionPending', 'getIsFraudDetected'])
+            ->getMock();
+        $this->order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus'])
+            ->getMock();
+
+        $this->order->expects(static::once())
+            ->method('getBaseCurrency')
+            ->willReturn($this->currency);
+        $this->currency->expects(static::once())
+            ->method('formatTxt')
+            ->with($this->amount)
+            ->willReturn($this->amount);
+
+        $this->command = new AuthorizeCommand();
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute
+     */
+    public function testExecute()
+    {
+        $message = __('Authorized amount of %1.', $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(false);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(false);
+
+        $this->order->expects(static::once())
+            ->method('getConfig')
+            ->willReturn($this->config);
+        $this->config->expects(static::once())
+            ->method('getStateDefaultStatus')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturn(Order::STATE_PROCESSING);
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATE_PROCESSING);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute
+     */
+    public function testExecutePendingTransaction()
+    {
+        $message = __('We will authorize %1 after the payment is approved at the payment gateway.', $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(true);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(false);
+
+        $this->order->expects(static::once())
+            ->method('getConfig')
+            ->willReturn($this->config);
+        $this->config->expects(static::once())
+            ->method('getStateDefaultStatus')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturn(Order::STATE_PAYMENT_REVIEW);
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATE_PAYMENT_REVIEW);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute
+     */
+    public function testExecutePendingTransactionFraud()
+    {
+        $expectedMessage = 'We will authorize %1 after the payment is approved at the payment gateway. ';
+        $expectedMessage .= 'Order is suspended as its authorizing amount %1 is suspected to be fraudulent.';
+        $message = __($expectedMessage, $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(true);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(true);
+
+        $this->order->expects(static::never())
+            ->method('getConfig');
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATUS_FRAUD);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute
+     */
+    public function testExecuteFraud()
+    {
+        $message = __(
+            'Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.',
+            $this->amount
+        );
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(false);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(true);
+
+        $this->order->expects(static::never())
+            ->method('getConfig');
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATUS_FRAUD);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php
new file mode 100644
index 0000000000000..50ddfe7132564
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Order\Payment\State;
+
+use Magento\Directory\Model\Currency;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Config;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\State\CaptureCommand;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class CaptureCommandTest
+ */
+class CaptureCommandTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Payment|MockObject
+     */
+    private $payment;
+
+    /**
+     * @var Order|MockObject
+     */
+    private $order;
+
+    /**
+     * @var Currency|MockObject
+     */
+    private $currency;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var CaptureCommand
+     */
+    private $command;
+
+    /**
+     * @var int
+     */
+    private $amount = 45;
+
+    protected function setUp()
+    {
+        $this->currency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['formatTxt'])
+            ->getMock();
+
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStateDefaultStatus'])
+            ->getMock();
+
+        $this->payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIsTransactionPending', 'getIsFraudDetected'])
+            ->getMock();
+        $this->order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus'])
+            ->getMock();
+
+        $this->order->expects(static::once())
+            ->method('getBaseCurrency')
+            ->willReturn($this->currency);
+        $this->currency->expects(static::once())
+            ->method('formatTxt')
+            ->with($this->amount)
+            ->willReturn($this->amount);
+
+        $this->command = new CaptureCommand();
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute
+     */
+    public function testExecute()
+    {
+        $message = __('Captured amount of %1 online.', $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(false);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(false);
+
+        $this->order->expects(static::once())
+            ->method('getConfig')
+            ->willReturn($this->config);
+        $this->config->expects(static::once())
+            ->method('getStateDefaultStatus')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturn(Order::STATE_PROCESSING);
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATE_PROCESSING);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute
+     */
+    public function testExecutePendingTransaction()
+    {
+        $message = __('An amount of %1 will be captured after being approved at the payment gateway.', $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(true);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(false);
+
+        $this->order->expects(static::once())
+            ->method('getConfig')
+            ->willReturn($this->config);
+        $this->config->expects(static::once())
+            ->method('getStateDefaultStatus')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturn(Order::STATE_PAYMENT_REVIEW);
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATE_PAYMENT_REVIEW);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute
+     */
+    public function testExecutePendingTransactionFraud()
+    {
+        $expectedMessage = 'An amount of %1 will be captured after being approved at the payment gateway. ';
+        $expectedMessage .= 'Order is suspended as its capturing amount %1 is suspected to be fraudulent.';
+        $message = __($expectedMessage, $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(true);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(true);
+
+        $this->order->expects(static::never())
+            ->method('getConfig');
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATUS_FRAUD);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute
+     */
+    public function testExecuteFraud()
+    {
+        $expectedMessage = 'Captured amount of %1 online. ';
+        $expectedMessage .= 'Order is suspended as its capturing amount %1 is suspected to be fraudulent.';
+        $message = __($expectedMessage, $this->amount);
+
+        $this->payment->expects(static::once())
+            ->method('getIsTransactionPending')
+            ->willReturn(false);
+        $this->payment->expects(static::once())
+            ->method('getIsFraudDetected')
+            ->willReturn(true);
+
+        $this->order->expects(static::never())
+            ->method('getConfig');
+
+        $this->order->expects(static::once())
+            ->method('setState')
+            ->with(Order::STATE_PAYMENT_REVIEW)
+            ->willReturnSelf();
+        $this->order->expects(static::once())
+            ->method('setStatus')
+            ->with(Order::STATUS_FRAUD);
+
+        $actual = $this->command->execute($this->payment, $this->amount, $this->order);
+        static::assertEquals($message, $actual);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index 399092745977a..dbce9d875e3da 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -5,8 +5,12 @@
  */
 namespace Magento\Sales\Test\Unit\Model;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Item;
 
 /**
  * Test class for \Magento\Sales\Model\Order
@@ -63,6 +67,11 @@ class OrderTest extends \PHPUnit_Framework_TestCase
      */
     protected $salesOrderCollectionMock;
 
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRepository;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -101,6 +110,17 @@ protected function setUp()
             '',
             false
         );
+        $this->item = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'isDeleted',
+                'getQtyToInvoice',
+                'getParentItemId',
+                'getQuoteItemId',
+                'getLockedDoInvoice',
+                'getProductId'
+            ])
+            ->getMock();
         $this->salesOrderCollectionMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Collection')
             ->disableOriginalConstructor()
             ->setMethods(['addFieldToFilter', 'load', 'getFirstItem'])
@@ -112,6 +132,9 @@ protected function setUp()
         $collection->expects($this->any())
             ->method('getItems')
             ->willReturn([$this->item]);
+        $collection->expects(self::any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->item]));
         $this->orderItemCollectionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($collection);
@@ -126,6 +149,9 @@ protected function setUp()
             ['round']
         );
 
+        $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
         $this->incrementId = '#00000001';
         $this->eventManager = $this->getMock('Magento\Framework\Event\Manager', [], [], '', false);
         $context = $this->getMock('Magento\Framework\Model\Context', ['getEventDispatcher'], [], '', false);
@@ -142,7 +168,8 @@ protected function setUp()
                 'context' => $context,
                 'historyCollectionFactory' => $this->historyCollectionFactoryMock,
                 'salesOrderCollectionFactory' => $this->salesOrderCollectionFactoryMock,
-                'priceCurrency' => $this->priceCurrency
+                'priceCurrency' => $this->priceCurrency,
+                'productRepository' => $this->productRepository
             ]
         );
     }
@@ -368,6 +395,113 @@ public function testCanEditIfHasInvoices()
         $this->assertFalse($this->order->canEdit());
     }
 
+    /**
+     * @covers \Magento\Sales\Model\Order::canReorder
+     */
+    public function testCanReorder()
+    {
+        $productId = 1;
+
+        $this->order->setState(Order::STATE_PROCESSING);
+        $this->order->setActionFlag(Order::ACTION_FLAG_REORDER, true);
+
+        $this->item->expects(static::once())
+            ->method('getProductId')
+            ->willReturn($productId);
+
+        $product = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(['isSalable'])
+            ->getMockForAbstractClass();
+        $product->expects(static::once())
+            ->method('isSalable')
+            ->willReturn(true);
+
+        $this->productRepository->expects(static::once())
+            ->method('getById')
+            ->with($productId, false)
+            ->willReturn($product);
+
+        $this->assertTrue($this->order->canReorder());
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order::canReorder
+     */
+    public function testCanReorderIsPaymentReview()
+    {
+        $this->order->setState(Order::STATE_PAYMENT_REVIEW);
+
+        $this->assertFalse($this->order->canReorder());
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order::canReorder
+     */
+    public function testCanReorderFlagReorderFalse()
+    {
+        $this->order->setState(Order::STATE_PROCESSING);
+        $this->order->setActionFlag(Order::ACTION_FLAG_REORDER, false);
+
+        $this->assertFalse($this->order->canReorder());
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order::canReorder
+     */
+    public function testCanReorderProductNotExists()
+    {
+        $productId = 1;
+
+        $this->order->setState(Order::STATE_PROCESSING);
+        $this->order->setActionFlag(Order::ACTION_FLAG_REORDER, true);
+
+        $this->item->expects(static::once())
+            ->method('getProductId')
+            ->willReturn($productId);
+
+        $product = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(['isSalable'])
+            ->getMockForAbstractClass();
+        $product->expects(static::never())
+            ->method('isSalable');
+
+        $this->productRepository->expects(static::once())
+            ->method('getById')
+            ->with($productId, false)
+            ->willThrowException(new NoSuchEntityException(__('Requested product doesn\'t exist')));
+
+        $this->assertFalse($this->order->canReorder());
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\Order::canReorder
+     */
+    public function testCanReorderProductNotSalable()
+    {
+        $productId = 1;
+
+        $this->order->setState(Order::STATE_PROCESSING);
+        $this->order->setActionFlag(Order::ACTION_FLAG_REORDER, true);
+
+        $this->item->expects(static::once())
+            ->method('getProductId')
+            ->willReturn($productId);
+
+        $product = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(['isSalable'])
+            ->getMockForAbstractClass();
+        $product->expects(static::once())
+            ->method('isSalable')
+            ->willReturn(false);
+
+        $this->productRepository->expects(static::once())
+            ->method('getById')
+            ->with($productId, false)
+            ->willReturn($product);
+
+        $this->assertFalse($this->order->canReorder());
+    }
+
     public function testCanCancelCanReviewPayment()
     {
         $paymentMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment')
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index 9eb38b8488025..b285a2fa33202 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -352,10 +352,14 @@ Mixed,Mixed
 "The payment disallows storing objects.","The payment disallows storing objects."
 "The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet."
 "We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway."
+"We will authorize %1 after the payment is approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","We will authorize %1 after the payment is approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent."
 "Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Order is suspended as its authorizing amount %1 is suspected to be fraudulent."
-"Authorized amount of %1","Authorized amount of %1"
+"Authorized amount of %1.","Authorized amount of %1."
+"Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent."
 "An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway."
-"Captured amount of %1 online","Captured amount of %1 online"
+"An amount of %1 will be captured after being approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","An amount of %1 will be captured after being approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent."
+"Captured amount of %1 online.","Captured amount of %1 online."
+"Captured amount of %1 online. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Captured amount of %1 online. Order is suspended as its authorizing amount %1 is suspected to be fraudulent."
 "The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway."
 "Ordered amount of %1","Ordered amount of %1"
 "Registered notification about captured amount of %1.","Registered notification about captured amount of %1."
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
index ed5744feb6ce8..d1e294c9a8f0c 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
@@ -17,16 +17,20 @@ define(
         'mage/storage',
         'Magento_Checkout/js/action/get-payment-information',
         'Magento_Checkout/js/model/totals',
-        'mage/translate'
+        'mage/translate',
+        'Magento_Checkout/js/model/full-screen-loader'
     ],
-    function ($, quote, urlManager, errorProcessor, messageContainer, storage, getPaymentInformationAction, totals, $t) {
+    function ($, quote, urlManager, errorProcessor, messageContainer, storage, getPaymentInformationAction, totals, $t,
+              fullScreenLoader) {
         'use strict';
 
-        return function (isApplied, isLoading) {
+        return function (isApplied) {
             var quoteId = quote.getQuoteId(),
                 url = urlManager.getCancelCouponUrl(quoteId),
                 message = $t('Your coupon was successfully removed.');
+
             messageContainer.clear();
+            fullScreenLoader.startLoader();
 
             return storage.delete(
                 url,
@@ -39,6 +43,7 @@ define(
                     $.when(deferred).done(function () {
                         isApplied(false);
                         totals.isLoading(false);
+                        fullScreenLoader.stopLoader();
                     });
                     messageContainer.addSuccessMessage({
                         'message': message
@@ -47,12 +52,9 @@ define(
             ).fail(
                 function (response) {
                     totals.isLoading(false);
+                    fullScreenLoader.stopLoader();
                     errorProcessor.process(response, messageContainer);
                 }
-            ).always(
-                function () {
-                    isLoading(false);
-                }
             );
         };
     }
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
index 606fe4013ea76..a2b7ff19f2139 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
@@ -18,25 +18,22 @@ define(
         'mage/storage',
         'mage/translate',
         'Magento_Checkout/js/action/get-payment-information',
-        'Magento_Checkout/js/model/totals'
+        'Magento_Checkout/js/model/totals',
+        'Magento_Checkout/js/model/full-screen-loader'
     ],
     function (
-        ko,
-        $,
-        quote,
-        urlManager,
-        errorProcessor,
-        messageContainer,
-        storage,
-        $t,
-        getPaymentInformationAction,
-        totals
+        ko, $, quote, urlManager, errorProcessor, messageContainer, storage, $t, getPaymentInformationAction, totals,
+        fullScreenLoader
     ) {
         'use strict';
-        return function (couponCode, isApplied, isLoading) {
-            var quoteId = quote.getQuoteId();
-            var url = urlManager.getApplyCouponUrl(couponCode, quoteId);
-            var message = $t('Your coupon was successfully applied.');
+
+        return function (couponCode, isApplied) {
+            var quoteId = quote.getQuoteId(),
+                url = urlManager.getApplyCouponUrl(couponCode, quoteId),
+                message = $t('Your coupon was successfully applied.');
+
+            fullScreenLoader.startLoader();
+
             return storage.put(
                 url,
                 {},
@@ -45,19 +42,22 @@ define(
                 function (response) {
                     if (response) {
                         var deferred = $.Deferred();
-                        isLoading(false);
+
                         isApplied(true);
                         totals.isLoading(true);
                         getPaymentInformationAction(deferred);
                         $.when(deferred).done(function () {
+                            fullScreenLoader.stopLoader();
                             totals.isLoading(false);
                         });
-                        messageContainer.addSuccessMessage({'message': message});
+                        messageContainer.addSuccessMessage({
+                            'message': message
+                        });
                     }
                 }
             ).fail(
                 function (response) {
-                    isLoading(false);
+                    fullScreenLoader.stopLoader();
                     totals.isLoading(false);
                     errorProcessor.process(response, messageContainer);
                 }
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js b/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
index 8e8c0798ff3b5..6dc973a7a1e42 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
@@ -13,49 +13,53 @@ define(
     ],
     function ($, ko, Component, quote, setCouponCodeAction, cancelCouponAction) {
         'use strict';
-        var totals = quote.getTotals();
-        var couponCode = ko.observable(null);
+
+        var totals = quote.getTotals(),
+            couponCode = ko.observable(null),
+            isApplied = ko.observable(couponCode() != null);
+
         if (totals()) {
             couponCode(totals()['coupon_code']);
         }
-        var isApplied = ko.observable(couponCode() != null);
-        var isLoading = ko.observable(false);
+
         return Component.extend({
             defaults: {
                 template: 'Magento_SalesRule/payment/discount'
             },
             couponCode: couponCode,
+
             /**
              * Applied flag
              */
             isApplied: isApplied,
-            isLoading: isLoading,
+
             /**
              * Coupon code application procedure
              */
             apply: function() {
                 if (this.validate()) {
-                    isLoading(true);
-                    setCouponCodeAction(couponCode(), isApplied, isLoading);
+                    setCouponCodeAction(couponCode(), isApplied);
                 }
             },
+
             /**
              * Cancel using coupon
              */
             cancel: function() {
                 if (this.validate()) {
-                    isLoading(true);
                     couponCode('');
-                    cancelCouponAction(isApplied, isLoading);
+                    cancelCouponAction(isApplied);
                 }
             },
+
             /**
              * Coupon form validation
              *
-             * @returns {boolean}
+             * @returns {Boolean}
              */
-            validate: function() {
+            validate: function () {
                 var form = '#discount-form';
+
                 return $(form).validation() && $(form).validation('isValid');
             }
         });
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index d6bc4c764d571..4ba38906fe9c1 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -15,7 +15,7 @@
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
-        <form class="form form-discount" id="discount-form" data-bind="blockLoader: isLoading">
+        <form class="form form-discount" id="discount-form">
             <div class="payment-option-inner">
                 <div class="field">
                     <label class="label" for="discount-code">
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Date.php b/app/code/Magento/Ui/Component/Filters/Type/Date.php
index f670f826e4e20..f5d392ea51365 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Date.php
@@ -23,6 +23,13 @@ class Date extends AbstractFilter
      */
     protected $wrappedComponent;
 
+    /**
+     * Date format
+     *
+     * @var string
+     */
+    protected static $dateFormat = 'Y-m-d H:i:s';
+
     /**
      * Prepare component configuration
      *
@@ -96,7 +103,7 @@ protected function applyFilterByType($type, $value)
         if (!empty($value)) {
             $filter = $this->filterBuilder->setConditionType($type)
                 ->setField($this->getName())
-                ->setValue($value->format('Y-m-d H:i:s'))
+                ->setValue($value->format(static::$dateFormat))
                 ->create();
 
             $this->getContext()->getDataProvider()->addFilter($filter);
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
index 49133721369c8..493b8c78f0cdf 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
@@ -268,6 +268,14 @@ define([
 
             _.each(grouped, this.updateRegion, this);
 
+            _.each(this.regions, function (items) {
+                var hasObsoleteComponents = items().length && !_.intersection(_elems, items()).length;
+
+                if (hasObsoleteComponents) {
+                    items.removeAll();
+                }
+            });
+
             this.elems(_elems);
 
             return this;
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
new file mode 100644
index 0000000000000..2969eca4f5eba
--- /dev/null
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Api\Data;
+
+/**
+ * Interface PaymentTokenInterfaceFactory
+ * @api
+ */
+interface PaymentTokenInterfaceFactory
+{
+    /**
+     * Create payment token entity
+     * @return PaymentTokenInterface
+     */
+    public function create();
+
+    /**
+     * Return type of payment token
+     * @return string
+     */
+    public function getType();
+}
\ No newline at end of file
diff --git a/app/code/Magento/Vault/Api/PaymentMethodListInterface.php b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
new file mode 100644
index 0000000000000..f9d3e628594ef
--- /dev/null
+++ b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Api;
+
+use Magento\Vault\Model\VaultPaymentInterface;
+
+/**
+ * Contains methods to retrieve vault payment methods
+ * This interface is consistent with \Magento\Payment\Api\PaymentMethodListInterface
+ * @api
+ */
+interface PaymentMethodListInterface
+{
+    /**
+     * Get list of available vault payments
+     * @param int $storeId
+     * @return VaultPaymentInterface[]
+     */
+    public function getList($storeId);
+
+    /**
+     * Get list of enabled in the configuration vault payments
+     * @param int $storeId
+     * @return VaultPaymentInterface[]
+     */
+    public function getActiveList($storeId);
+}
diff --git a/app/code/Magento/Vault/Block/AbstractCardRenderer.php b/app/code/Magento/Vault/Block/AbstractCardRenderer.php
index c18408cea8e7c..0d6f3f3a9e37e 100644
--- a/app/code/Magento/Vault/Block/AbstractCardRenderer.php
+++ b/app/code/Magento/Vault/Block/AbstractCardRenderer.php
@@ -7,24 +7,13 @@
 
 use Magento\Framework\View\Element\Template;
 use Magento\Payment\Model\CcConfigProvider;
-use Magento\Vault\Api\Data\PaymentTokenInterface;
 
 /**
  * Class AbstractCardRenderer
  * @api
  */
-abstract class AbstractCardRenderer extends Template implements CardRendererInterface
+abstract class AbstractCardRenderer extends AbstractTokenRenderer implements CardRendererInterface
 {
-    /**
-     * @var PaymentTokenInterface|null
-     */
-    private $token;
-
-    /**
-     * @var array|null
-     */
-    private $tokenDetails;
-
     /**
      * @var CcConfigProvider
      */
@@ -46,39 +35,6 @@ public function __construct(
         $this->iconsProvider = $iconsProvider;
     }
 
-    /**
-     * Renders specified token
-     *
-     * @param PaymentTokenInterface $token
-     * @return string
-     */
-    public function render(PaymentTokenInterface $token)
-    {
-        $this->token = $token;
-        $this->tokenDetails = json_decode($this->getToken()->getTokenDetails() ?: '{}', true);
-        $result = $this->toHtml();
-        $this->token = null;
-        $this->tokenDetails = null;
-
-        return $result;
-    }
-
-    /**
-     * @return PaymentTokenInterface
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTokenDetails()
-    {
-        return $this->tokenDetails;
-    }
-
     /**
      * @param string $type
      * @return array
diff --git a/app/code/Magento/Vault/Block/AbstractTokenRenderer.php b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
new file mode 100644
index 0000000000000..15df2e772a342
--- /dev/null
+++ b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\Customer\IconInterface;
+
+/**
+ * Class AbstractTokenRenderer
+ * @api
+ */
+abstract class AbstractTokenRenderer extends Template implements TokenRendererInterface, IconInterface
+{
+    /**
+     * @var PaymentTokenInterface|null
+     */
+    private $token;
+
+    /**
+     * @var array|null
+     */
+    private $tokenDetails;
+
+    /**
+     * Renders specified token
+     *
+     * @param PaymentTokenInterface $token
+     * @return string
+     */
+    public function render(PaymentTokenInterface $token)
+    {
+        $this->token = $token;
+        $this->tokenDetails = json_decode($this->getToken()->getTokenDetails() ?: '{}', true);
+        return $this->toHtml();
+    }
+
+    /**
+     * @return PaymentTokenInterface|null
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
+    /**
+     * @return array|null
+     */
+    protected function getTokenDetails()
+    {
+        return $this->tokenDetails;
+    }
+}
diff --git a/app/code/Magento/Vault/Block/CardRendererInterface.php b/app/code/Magento/Vault/Block/CardRendererInterface.php
index e94354ba72c4e..65e6ad6424b86 100644
--- a/app/code/Magento/Vault/Block/CardRendererInterface.php
+++ b/app/code/Magento/Vault/Block/CardRendererInterface.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Vault\Block;
 
-use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\Customer\IconInterface;
 
 /**
  * Interface CardRendererInterface
  * @api
  */
-interface CardRendererInterface extends TokenRendererInterface
+interface CardRendererInterface extends TokenRendererInterface, IconInterface
 {
     /**
      * @return string
@@ -22,24 +22,4 @@ public function getNumberLast4Digits();
      * @return string
      */
     public function getExpDate();
-
-    /**
-     * @return string
-     */
-    public function getIconUrl();
-
-    /**
-     * @return int
-     */
-    public function getIconHeight();
-
-    /**
-     * @return int
-     */
-    public function getIconWidth();
-
-    /**
-     * @return PaymentTokenInterface
-     */
-    public function getToken();
 }
diff --git a/app/code/Magento/Vault/Block/Customer/AccountTokens.php b/app/code/Magento/Vault/Block/Customer/AccountTokens.php
new file mode 100644
index 0000000000000..37fd5f33bd54d
--- /dev/null
+++ b/app/code/Magento/Vault/Block/Customer/AccountTokens.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Block\Customer;
+
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+
+/**
+ * Class AccountTokens
+ */
+class AccountTokens extends PaymentTokens
+{
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT;
+    }
+}
diff --git a/app/code/Magento/Vault/Block/Customer/CreditCards.php b/app/code/Magento/Vault/Block/Customer/CreditCards.php
new file mode 100644
index 0000000000000..67b156266a10c
--- /dev/null
+++ b/app/code/Magento/Vault/Block/Customer/CreditCards.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Block\Customer;
+
+use Magento\Vault\Model\CreditCardTokenFactory;
+
+/**
+ * Class CreditCards
+ */
+class CreditCards extends PaymentTokens
+{
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD;
+    }
+}
diff --git a/app/code/Magento/Vault/Block/Customer/IconInterface.php b/app/code/Magento/Vault/Block/Customer/IconInterface.php
new file mode 100644
index 0000000000000..c0fa462d97d65
--- /dev/null
+++ b/app/code/Magento/Vault/Block/Customer/IconInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Block\Customer;
+
+/**
+ * Interface IconInterface
+ */
+interface IconInterface
+{
+    /**
+     * Get url to icon
+     * @return string
+     */
+    public function getIconUrl();
+
+    /**
+     * Get width of icon
+     * @return int
+     */
+    public function getIconHeight();
+
+    /**
+     * Get height of icon
+     * @return int
+     */
+    public function getIconWidth();
+}
\ No newline at end of file
diff --git a/app/code/Magento/Vault/Block/Customer/PaymentTokens.php b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
new file mode 100644
index 0000000000000..b7727aa678a9b
--- /dev/null
+++ b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Block\Customer;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\TokenRendererInterface;
+use Magento\Vault\Model\CustomerTokenManagement;
+
+/**
+ * Class PaymentTokens
+ */
+abstract class PaymentTokens extends Template
+{
+    /**
+     * @var PaymentTokenInterface[]
+     */
+    private $customerTokens;
+
+    /**
+     * @var CustomerTokenManagement
+     */
+    private $customerTokenManagement;
+
+    /**
+     * PaymentTokens constructor.
+     * @param Template\Context $context
+     * @param CustomerTokenManagement $customerTokenManagement
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        CustomerTokenManagement $customerTokenManagement,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->customerTokenManagement = $customerTokenManagement;
+    }
+
+    /**
+     * Get type of token
+     * @return string
+     */
+    abstract function getType();
+
+    /**
+     * @return PaymentTokenInterface[]
+     */
+    public function getPaymentTokens()
+    {
+        $tokens = [];
+        /** @var PaymentTokenInterface $token */
+        foreach ($this->getCustomerTokens() as $token) {
+            if ($token->getType() === $this->getType()) {
+                $tokens[] = $token;
+            }
+        };
+        return $tokens;
+    }
+
+    /**
+     * @param PaymentTokenInterface $token
+     * @return string
+     */
+    public function renderTokenHtml(PaymentTokenInterface $token)
+    {
+        foreach ($this->getChildNames() as $childName) {
+            $childBlock = $this->getChildBlock($childName);
+            if ($childBlock instanceof TokenRendererInterface && $childBlock->canRender($token)) {
+                return $childBlock->render($token);
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Checks if customer tokens exists
+     * @return bool
+     */
+    public function isExistsCustomerTokens()
+    {
+        return !empty($this->getCustomerTokens());
+    }
+
+    /**
+     * Get customer session tokens
+     * @return PaymentTokenInterface[]
+     */
+    private function getCustomerTokens()
+    {
+        if (empty($this->customerTokens)) {
+            $this->customerTokens = $this->customerTokenManagement->getCustomerSessionTokens();
+        }
+        return $this->customerTokens;
+    }
+}
diff --git a/app/code/Magento/Vault/Block/TokenRendererInterface.php b/app/code/Magento/Vault/Block/TokenRendererInterface.php
index 62d3effc801a3..040790202c3f6 100644
--- a/app/code/Magento/Vault/Block/TokenRendererInterface.php
+++ b/app/code/Magento/Vault/Block/TokenRendererInterface.php
@@ -28,4 +28,10 @@ public function canRender(PaymentTokenInterface $token);
      * @return string
      */
     public function render(PaymentTokenInterface $token);
+
+    /**
+     * Get payment token
+     * @return PaymentTokenInterface|null
+     */
+    public function getToken();
 }
diff --git a/app/code/Magento/Vault/Controller/Cards/DeleteAction.php b/app/code/Magento/Vault/Controller/Cards/DeleteAction.php
index d1d12e541a09d..041fba82a6508 100644
--- a/app/code/Magento/Vault/Controller/Cards/DeleteAction.php
+++ b/app/code/Magento/Vault/Controller/Cards/DeleteAction.php
@@ -133,7 +133,7 @@ private function createErrorResponse($errorCode)
     private function createSuccessMessage()
     {
         $this->messageManager->addSuccessMessage(
-            __('Credit Card was successfully removed')
+            __('Stored Payment Method was successfully removed')
         );
         return $this->_redirect('vault/cards/listaction');
     }
diff --git a/app/code/Magento/Vault/Controller/Cards/ListAction.php b/app/code/Magento/Vault/Controller/Cards/ListAction.php
index 22d5666d21020..f4ad8f8487eba 100644
--- a/app/code/Magento/Vault/Controller/Cards/ListAction.php
+++ b/app/code/Magento/Vault/Controller/Cards/ListAction.php
@@ -41,7 +41,7 @@ public function __construct(
     public function execute()
     {
         $resultPage = $this->pageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('My Credit Cards'));
+        $resultPage->getConfig()->getTitle()->set(__('Stored Payment Methods'));
 
         return $resultPage;
     }
diff --git a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
new file mode 100644
index 0000000000000..24bd03d42bb20
--- /dev/null
+++ b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
+
+/**
+ * Class AbstractPaymentTokenFactory
+ * @api
+ */
+abstract class AbstractPaymentTokenFactory implements PaymentTokenInterfaceFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * AccountPaymentTokenFactory constructor.
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create payment token entity
+     * @return PaymentTokenInterface
+     */
+    public function create()
+    {
+        /** @var PaymentTokenInterface $paymentToken */
+        $paymentToken = $this->objectManager->create(PaymentTokenInterface::class);
+        $paymentToken->setType($this->getType());
+        return $paymentToken;
+    }
+}
diff --git a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
new file mode 100644
index 0000000000000..553b922bf7387
--- /dev/null
+++ b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model;
+
+/**
+ * Class AccountPaymentTokenFactory
+ * @api
+ */
+class AccountPaymentTokenFactory extends AbstractPaymentTokenFactory
+{
+    /**
+     * @var string
+     */
+    const TOKEN_TYPE_ACCOUNT = 'account';
+
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return self::TOKEN_TYPE_ACCOUNT;
+    }
+}
diff --git a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
new file mode 100644
index 0000000000000..e1de0354cc37b
--- /dev/null
+++ b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model;
+
+/**
+ * Class CreditCardTokenFactory
+ * @api
+ */
+class CreditCardTokenFactory extends AbstractPaymentTokenFactory
+{
+    /**
+     * @var string
+     */
+    const TOKEN_TYPE_CREDIT_CARD = 'card';
+
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return self::TOKEN_TYPE_CREDIT_CARD;
+    }
+}
diff --git a/app/code/Magento/Vault/Model/Method/Vault.php b/app/code/Magento/Vault/Model/Method/Vault.php
index f089603915b5d..ca6fe06f91eef 100644
--- a/app/code/Magento/Vault/Model/Method/Vault.php
+++ b/app/code/Magento/Vault/Model/Method/Vault.php
@@ -5,17 +5,16 @@
  */
 namespace Magento\Vault\Model\Method;
 
-use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Payment\Gateway\Command;
-use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
 use Magento\Payment\Gateway\ConfigFactoryInterface;
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
@@ -114,6 +113,7 @@ final class Vault implements VaultPaymentInterface
      * @param PaymentTokenManagementInterface $tokenManagement
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
      * @param string $code
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -274,7 +274,12 @@ public function canVoid()
      */
     public function canUseInternal()
     {
-        return $this->getVaultProvider()->canUseInternal();
+        $isInternalAllowed = $this->getConfiguredValue('can_use_internal');
+        // if config has't been specified for Vault, need to check payment provider option
+        if ($isInternalAllowed === null) {
+            return $this->getVaultProvider()->canUseInternal();
+        }
+        return (bool) $isInternalAllowed;
     }
 
     /**
@@ -452,19 +457,17 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     /**
      * @param OrderPaymentInterface $orderPayment
      * @return void
-     * @throws \LogicException
      */
     private function attachTokenExtensionAttribute(OrderPaymentInterface $orderPayment)
     {
         $additionalInformation = $orderPayment->getAdditionalInformation();
-
-        if (empty($additionalInformation[PaymentTokenInterface::CUSTOMER_ID]) ||
-            empty($additionalInformation[PaymentTokenInterface::PUBLIC_HASH])
-        ) {
-            throw new \LogicException('Customer and public hash should be defined');
+        if (empty($additionalInformation[PaymentTokenInterface::PUBLIC_HASH])) {
+            throw new \LogicException('Public hash should be defined');
         }
 
-        $customerId = $additionalInformation[PaymentTokenInterface::CUSTOMER_ID];
+        $customerId = isset($additionalInformation[PaymentTokenInterface::CUSTOMER_ID]) ?
+            $additionalInformation[PaymentTokenInterface::CUSTOMER_ID] : null;
+
         $publicHash = $additionalInformation[PaymentTokenInterface::PUBLIC_HASH];
 
         $paymentToken = $this->tokenManagement->getByPublicHash($publicHash, $customerId);
@@ -579,7 +582,8 @@ public function assignData(\Magento\Framework\DataObject $data)
      */
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
-        return $this->getVaultProvider()->isAvailable($quote);
+        return $this->getVaultProvider()->isAvailable($quote)
+            && $this->config->getValue(self::$activeKey, $this->getStore() ?: ($quote ? $quote->getStoreId() : null));
     }
 
     /**
diff --git a/app/code/Magento/Vault/Model/PaymentMethodList.php b/app/code/Magento/Vault/Model/PaymentMethodList.php
new file mode 100644
index 0000000000000..bec073df79711
--- /dev/null
+++ b/app/code/Magento/Vault/Model/PaymentMethodList.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model;
+
+use Magento\Payment\Api\Data\PaymentMethodInterface;
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Payment\Model\Method\InstanceFactory;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Vault\Api\PaymentMethodListInterface as VaultPaymentMethodListInterface;
+
+/**
+ * Contains methods to retrieve configured vault payments
+ */
+class PaymentMethodList implements VaultPaymentMethodListInterface
+{
+    /**
+     * @var InstanceFactory
+     */
+    private $instanceFactory;
+
+    /**
+     * @var PaymentMethodListInterface
+     */
+    private $paymentMethodList;
+
+    /**
+     * PaymentMethodList constructor.
+     * @param PaymentMethodListInterface $paymentMethodList
+     * @param InstanceFactory $instanceFactory
+     */
+    public function __construct(PaymentMethodListInterface $paymentMethodList, InstanceFactory $instanceFactory)
+    {
+        $this->instanceFactory = $instanceFactory;
+        $this->paymentMethodList = $paymentMethodList;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList($storeId)
+    {
+        return $this->filterList($this->paymentMethodList->getList($storeId));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getActiveList($storeId)
+    {
+        return $this->filterList($this->paymentMethodList->getActiveList($storeId));
+    }
+
+    /**
+     * Filter vault methods from payments
+     * @param PaymentMethodInterface[] $list
+     * @return VaultPaymentInterface[]
+     */
+    private function filterList(array $list)
+    {
+        $paymentMethods = array_map(
+            function (PaymentMethodInterface $paymentMethod) {
+                return $this->instanceFactory->create($paymentMethod);
+            },
+            $list
+        );
+
+        $availableMethods = array_filter(
+            $paymentMethods,
+            function (MethodInterface $methodInstance) {
+                return $methodInstance instanceof VaultPaymentInterface;
+            }
+        );
+        return array_values($availableMethods);
+    }
+}
diff --git a/app/code/Magento/Vault/Model/PaymentTokenManagement.php b/app/code/Magento/Vault/Model/PaymentTokenManagement.php
index 510dc4cea3162..f4a445b35fb34 100644
--- a/app/code/Magento/Vault/Model/PaymentTokenManagement.php
+++ b/app/code/Magento/Vault/Model/PaymentTokenManagement.php
@@ -128,26 +128,37 @@ public function getListByCustomerId($customerId)
      */
     public function getVisibleAvailableTokens($customerId)
     {
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::CUSTOMER_ID)
-            ->setValue($customerId)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::IS_VISIBLE)
-            ->setValue(1)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::IS_ACTIVE)
-            ->setValue(1)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::EXPIRES_AT)
-            ->setConditionType('gt')
-            ->setValue(
-                $this->dateTimeFactory->create(
-                    'now',
-                    new \DateTimeZone('UTC')
-                )->format('Y-m-d 00:00:00')
-            )
-            ->create();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)
-            ->create();
+        $customerFilter = [
+            $this->filterBuilder->setField(PaymentTokenInterface::CUSTOMER_ID)
+                ->setValue($customerId)
+                ->create()
+            ];
+        $visibleFilter = [
+            $this->filterBuilder->setField(PaymentTokenInterface::IS_VISIBLE)
+                ->setValue(1)
+                ->create()
+            ];
+        $isActiveFilter = [
+            $this->filterBuilder->setField(PaymentTokenInterface::IS_ACTIVE)
+                ->setValue(1)
+                ->create()
+            ];
+        $expiresAtFilter = [
+            $this->filterBuilder->setField(PaymentTokenInterface::EXPIRES_AT)
+                ->setConditionType('gt')
+                ->setValue(
+                    $this->dateTimeFactory->create(
+                        'now',
+                        new \DateTimeZone('UTC')
+                    )->format('Y-m-d 00:00:00')
+                )
+                ->create()
+            ];
+        $this->searchCriteriaBuilder->addFilters($customerFilter);
+        $this->searchCriteriaBuilder->addFilters($visibleFilter);
+        $this->searchCriteriaBuilder->addFilters($isActiveFilter);
+        // add filters to different filter groups in order to filter by AND expression
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($expiresAtFilter)->create();
 
         return $this->paymentTokenRepository->getList($searchCriteria)->getItems();
     }
diff --git a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken/Collection.php b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken/Collection.php
index 0e6264ca90e5b..6ac1c8ae342d4 100644
--- a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken/Collection.php
+++ b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken/Collection.php
@@ -5,10 +5,14 @@
  */
 namespace Magento\Vault\Model\ResourceModel\PaymentToken;
 
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Vault\Model\PaymentToken;
+use Magento\Vault\Model\ResourceModel\PaymentToken as ResourcePaymentToken;
+
 /**
  * Vault Payment Tokens collection
  */
-class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+class Collection extends AbstractCollection
 {
     /**
      * Resource initialization
@@ -17,6 +21,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     public function _construct()
     {
-        $this->_init('Magento\Vault\Model\PaymentToken', 'Magento\Vault\Model\ResourceModel\PaymentToken');
+        $this->_init(PaymentToken::class, ResourcePaymentToken::class);
     }
 }
diff --git a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
index 81fb24d14bcbd..f3a2cbfa78739 100644
--- a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
@@ -8,11 +8,15 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Payment\Helper\Data;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentTokenManagementInterface;
 use Magento\Vault\Api\PaymentTokenRepositoryInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
@@ -65,6 +69,16 @@ final class TokensConfigProvider
      */
     private $paymentDataHelper;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var PaymentTokenManagementInterface
+     */
+    private $paymentTokenManagement;
+
     /**
      * Constructor
      *
@@ -103,9 +117,6 @@ public function getTokensComponents($vaultPaymentCode)
         $result = [];
 
         $customerId = $this->session->getCustomerId();
-        if (!$customerId) {
-            return $result;
-        }
 
         $vaultPayment = $this->getVaultPayment($vaultPaymentCode);
         if ($vaultPayment === null) {
@@ -118,26 +129,58 @@ public function getTokensComponents($vaultPaymentCode)
             return $result;
         }
 
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::CUSTOMER_ID)
-            ->setValue($customerId)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::PAYMENT_METHOD_CODE)
-            ->setValue($vaultProviderCode)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::IS_ACTIVE)
-            ->setValue(1)
-            ->create();
-        $filters[] = $this->filterBuilder->setField(PaymentTokenInterface::EXPIRES_AT)
-            ->setConditionType('gt')
-            ->setValue(
-                $this->dateTimeFactory->create(
-                    'now',
-                    new \DateTimeZone('UTC')
-                )->format('Y-m-d 00:00:00')
-            )
-            ->create();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)
-            ->create();
+        if ($customerId) {
+            $this->searchCriteriaBuilder->addFilters(
+                [
+                    $this->filterBuilder->setField(PaymentTokenInterface::CUSTOMER_ID)
+                    ->setValue($customerId)
+                    ->create(),
+                ]
+            );
+        } else {
+            try {
+                $this->searchCriteriaBuilder->addFilters(
+                    [
+                        $this->filterBuilder->setField(PaymentTokenInterface::ENTITY_ID)
+                            ->setValue($this->getPaymentTokenEntityId())
+                            ->create(),
+                    ]
+                );
+            } catch (InputException $e) {
+                return $result;
+            } catch (NoSuchEntityException $e) {
+                return $result;
+            }
+        }
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder->setField(PaymentTokenInterface::PAYMENT_METHOD_CODE)
+                    ->setValue($vaultProviderCode)
+                    ->create(),
+                ]
+        );
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder->setField(PaymentTokenInterface::IS_ACTIVE)
+                    ->setValue(1)
+                    ->create(),
+                ]
+        );
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder->setField(PaymentTokenInterface::EXPIRES_AT)
+                    ->setConditionType('gt')
+                    ->setValue(
+                        $this->dateTimeFactory->create(
+                            'now',
+                            new \DateTimeZone('UTC')
+                        )->format('Y-m-d 00:00:00')
+                    )
+                    ->create(),
+                ]
+        );
+
+        $searchCriteria = $this->searchCriteriaBuilder->create();
 
         foreach ($this->paymentTokenRepository->getList($searchCriteria)->getItems() as $token) {
             $result[] = $componentProvider->getComponentForToken($token);
@@ -162,7 +205,7 @@ private function getComponentProvider($vaultProviderCode)
 
     /**
      * Get active vault payment by code
-     * @param $vaultPaymentCode
+     * @param string $vaultPaymentCode
      * @return VaultPaymentInterface|null
      */
     private function getVaultPayment($vaultPaymentCode)
@@ -172,6 +215,34 @@ private function getVaultPayment($vaultPaymentCode)
         return $vaultPayment->isActive($storeId) ? $vaultPayment : null;
     }
 
+    /**
+     * Returns payment token entity id by order payment id
+     * @return int|null
+     */
+    private function getPaymentTokenEntityId()
+    {
+        $paymentToken = $this->getPaymentTokenManagement()->getByPaymentId($this->getOrderPaymentEntityId());
+        if ($paymentToken === null) {
+            throw new NoSuchEntityException(__('No available payment tokens for specified order payment.'));
+        }
+        return $paymentToken->getEntityId();
+    }
+
+    /**
+     * Returns order payment entity id
+     * Using 'getReordered' for Reorder action
+     * Using 'getOrder' for Edit action
+     * @return int
+     */
+    private function getOrderPaymentEntityId()
+    {
+        $orderId = $this->session->getReordered()
+            ?: $this->session->getOrder()->getEntityId();
+        $order = $this->getOrderRepository()->get($orderId);
+
+        return (int) $order->getPayment()->getEntityId();
+    }
+
     /**
      * Get payment data helper instance
      * @return Data
@@ -184,4 +255,34 @@ private function getPaymentDataHelper()
         }
         return $this->paymentDataHelper;
     }
+
+    /**
+     * Returns order repository instance
+     * @return OrderRepositoryInterface
+     * @deprecated
+     */
+    private function getOrderRepository()
+    {
+        if ($this->orderRepository === null) {
+            $this->orderRepository = ObjectManager::getInstance()
+                ->get(OrderRepositoryInterface::class);
+        }
+
+        return $this->orderRepository;
+    }
+
+    /**
+     * Returns payment token management instance
+     * @return PaymentTokenManagementInterface
+     * @deprecated
+     */
+    private function getPaymentTokenManagement()
+    {
+        if ($this->paymentTokenManagement === null) {
+            $this->paymentTokenManagement = ObjectManager::getInstance()
+                ->get(PaymentTokenManagementInterface::class);
+        }
+
+        return $this->paymentTokenManagement;
+    }
 }
diff --git a/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
index 434a5875b5bb1..40343c29620e1 100644
--- a/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php
@@ -7,10 +7,9 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Payment\Helper\Data;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Vault\Api\PaymentMethodListInterface;
 use Magento\Vault\Model\CustomerTokenManagement;
-use Magento\Vault\Model\VaultPaymentInterface;
 
 /**
  * Class ConfigProvider
@@ -39,9 +38,9 @@ final class TokensConfigProvider implements ConfigProviderInterface
     private $customerTokenManagement;
 
     /**
-     * @var Data
+     * @var PaymentMethodListInterface
      */
-    private $paymentDataHelper;
+    private $vaultPaymentList;
 
     /**
      * Constructor
@@ -84,8 +83,10 @@ public function getConfig()
 
             $componentProvider = $providers[$paymentCode];
             $component = $componentProvider->getComponentForToken($token);
-            $vaultPayments[$paymentCode . '_item_' . $i] = [
-                'config' => $component->getConfig(),
+            $config = $component->getConfig();
+            $vaultPaymentCode = !empty($config['code']) ? $config['code'] : $paymentCode;
+            $vaultPayments[$vaultPaymentCode . '_' . $i] = [
+                'config' => $config,
                 'component' => $component->getName()
             ];
         }
@@ -98,21 +99,17 @@ public function getConfig()
     }
 
     /**
-     * Get list of available vault ui token providers
+     * Get list of available vault ui token providers.
+     *
      * @return TokenUiComponentProviderInterface[]
      */
     private function getComponentProviders()
     {
         $providers = [];
         $storeId = $this->storeManager->getStore()->getId();
-        $paymentMethods = $this->getPaymentDataHelper()->getStoreMethods($storeId);
+        $vaultPaymentMethods = $this->getVaultPaymentList()->getActiveList($storeId);
 
-        foreach ($paymentMethods as $method) {
-            /** VaultPaymentInterface $method */
-            if (!$method instanceof VaultPaymentInterface || !$method->isActive($storeId)) {
-                continue;
-            }
-            
+        foreach ($vaultPaymentMethods as $method) {
             $providerCode = $method->getProviderCode();
             $componentProvider = $this->getComponentProvider($providerCode);
             if ($componentProvider === null) {
@@ -139,15 +136,15 @@ private function getComponentProvider($vaultProviderCode)
     }
 
     /**
-     * Get payment data helper instance
-     * @return Data
+     * Get instance of vault payment list instance
+     * @return PaymentMethodListInterface
      * @deprecated
      */
-    private function getPaymentDataHelper()
+    private function getVaultPaymentList()
     {
-        if ($this->paymentDataHelper === null) {
-            $this->paymentDataHelper = ObjectManager::getInstance()->get(Data::class);
+        if ($this->vaultPaymentList === null) {
+            $this->vaultPaymentList = ObjectManager::getInstance()->get(PaymentMethodListInterface::class);
         }
-        return $this->paymentDataHelper;
+        return $this->vaultPaymentList;
     }
 }
diff --git a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
index 8bf88e7a94f50..bc3110a101452 100644
--- a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
@@ -8,9 +8,8 @@
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Session\SessionManagerInterface;
-use Magento\Payment\Helper\Data;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Vault\Model\VaultPaymentInterface;
+use Magento\Vault\Api\PaymentMethodListInterface;
 
 class VaultConfigProvider implements ConfigProviderInterface
 {
@@ -32,9 +31,9 @@ class VaultConfigProvider implements ConfigProviderInterface
     private $session;
 
     /**
-     * @var Data
+     * @var PaymentMethodListInterface
      */
-    private $paymentDataHelper;
+    private $vaultPaymentList;
 
     /**
      * VaultConfigProvider constructor.
@@ -57,9 +56,9 @@ public function __construct(
     public function getConfig()
     {
         $availableMethods = [];
-        $vaultPayments = $this->getVaultPaymentMethodList();
-        $customerId = $this->session->getCustomerId();
         $storeId = $this->storeManager->getStore()->getId();
+        $vaultPayments = $this->getVaultPaymentList()->getActiveList($storeId);
+        $customerId = $this->session->getCustomerId();
 
         foreach ($vaultPayments as $method) {
             $availableMethods[$method->getCode()] = [
@@ -73,36 +72,15 @@ public function getConfig()
     }
 
     /**
-     * Get list of active Vault payment methods
-     * @return array
-     */
-    private function getVaultPaymentMethodList()
-    {
-        $availableMethods = [];
-        $storeId = $this->storeManager->getStore()->getId();
-
-        $paymentMethods = $this->getPaymentDataHelper()->getStoreMethods($storeId);
-        foreach ($paymentMethods as $method) {
-            /** VaultPaymentInterface $method */
-            if (!$method instanceof VaultPaymentInterface) {
-                continue;
-            }
-            $availableMethods[] = $method;
-        }
-
-        return $availableMethods;
-    }
-
-    /**
-     * Get payment data helper instance
-     * @return Data
+     * Get vault payment list instance
+     * @return PaymentMethodListInterface
      * @deprecated
      */
-    private function getPaymentDataHelper()
+    private function getVaultPaymentList()
     {
-        if ($this->paymentDataHelper === null) {
-            $this->paymentDataHelper = ObjectManager::getInstance()->get(Data::class);
+        if ($this->vaultPaymentList === null) {
+            $this->vaultPaymentList = ObjectManager::getInstance()->get(PaymentMethodListInterface::class);
         }
-        return $this->paymentDataHelper;
+        return $this->vaultPaymentList;
     }
 }
diff --git a/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php b/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
index 13ae2e8110f9f..7601d49b9fe84 100644
--- a/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
+++ b/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
@@ -57,10 +57,7 @@ public function execute(Observer $observer)
         }
 
         $quote = $paymentModel->getQuote();
-        $customerId = $quote->getCustomer()->getId();
-        if ($customerId === null) {
-            return;
-        }
+        $customerId = (int) $quote->getCustomer()->getId();
 
         $paymentToken = $this->paymentTokenManagement->getByPublicHash($tokenPublicHash, $customerId);
         if ($paymentToken === null) {
diff --git a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
index 810a8c5242da8..710b765d11eff 100644
--- a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
+++ b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
@@ -10,6 +10,8 @@
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionFactory;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
 
 /**
  * Plugin for loading vault payment extension attribute to order/payment entity
@@ -17,7 +19,7 @@
 class PaymentVaultAttributesLoad
 {
     /**
-     * @var \Magento\Sales\Api\Data\OrderPaymentExtensionFactory
+     * @var OrderPaymentExtensionFactory
      */
     protected $paymentExtensionFactory;
 
@@ -27,11 +29,11 @@ class PaymentVaultAttributesLoad
     protected $paymentTokenManagement;
 
     /**
-     * @param \Magento\Sales\Api\Data\OrderPaymentExtensionFactory $paymentExtensionFactory
+     * @param OrderPaymentExtensionFactory $paymentExtensionFactory
      * @param PaymentTokenManagement|PaymentTokenManagementInterface $paymentTokenManagement
      */
     public function __construct(
-        \Magento\Sales\Api\Data\OrderPaymentExtensionFactory $paymentExtensionFactory,
+        OrderPaymentExtensionFactory $paymentExtensionFactory,
         PaymentTokenManagementInterface $paymentTokenManagement
     ) {
         $this->paymentExtensionFactory = $paymentExtensionFactory;
@@ -42,16 +44,13 @@ public function __construct(
      * Load vault payment extension attribute to order/payment entity
      *
      * @param OrderPaymentInterface $payment
-     * @param \Closure $proceed
+     * @param OrderPaymentExtensionInterface|null $paymentExtension
      * @return OrderPaymentExtensionInterface
      */
-    public function aroundGetExtensionAttributes(
+    public function afterGetExtensionAttributes(
         OrderPaymentInterface $payment,
-        \Closure $proceed
+        OrderPaymentExtensionInterface $paymentExtension = null
     ) {
-        /** @var OrderPaymentExtensionInterface $paymentExtension */
-        $paymentExtension = $proceed();
-
         if ($paymentExtension === null) {
             $paymentExtension = $this->paymentExtensionFactory->create();
         }
@@ -59,7 +58,7 @@ public function aroundGetExtensionAttributes(
         $paymentToken = $paymentExtension->getVaultPaymentToken();
         if ($paymentToken === null) {
             $paymentToken = $this->paymentTokenManagement->getByPaymentId($payment->getEntityId());
-            if ($paymentToken instanceof \Magento\Vault\Api\Data\PaymentTokenInterface) {
+            if ($paymentToken instanceof PaymentTokenInterface) {
                 $paymentExtension->setVaultPaymentToken($paymentToken);
             }
             $payment->setExtensionAttributes($paymentExtension);
diff --git a/app/code/Magento/Vault/Setup/UpgradeData.php b/app/code/Magento/Vault/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..757b5f4d3167c
--- /dev/null
+++ b/app/code/Magento/Vault/Setup/UpgradeData.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Setup;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\CreditCardTokenFactory;
+
+/**
+ * Class UpgradeData
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @inheritdoc
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+        $connection = $this->getConnection();
+
+        // data update for Vault module < 2.0.1
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            // update sets credit card as default token type
+            $connection->update($setup->getTable(InstallSchema::PAYMENT_TOKEN_TABLE), [
+                PaymentTokenInterface::TYPE => CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD
+            ], PaymentTokenInterface::TYPE . ' = ""');
+        }
+
+        // data update for Vault module < 2.0.2
+        if (version_compare($context->getVersion(), '2.0.2', '<')) {
+            // update converts additional info with token metadata to single dimensional array
+            $select = $connection->select()
+                ->from($setup->getTable('sales_order_payment'), 'entity_id')
+                ->columns(['additional_information'])
+                ->where('additional_information LIKE ?', '%token_metadata%');
+
+            $items = $connection->fetchAll($select);
+            foreach ($items as $item) {
+                $additionalInfo = unserialize($item['additional_information']);
+                $additionalInfo[PaymentTokenInterface::CUSTOMER_ID] =
+                    $additionalInfo['token_metadata'][PaymentTokenInterface::CUSTOMER_ID];
+                $additionalInfo[PaymentTokenInterface::PUBLIC_HASH] =
+                    $additionalInfo['token_metadata'][PaymentTokenInterface::PUBLIC_HASH];
+                unset($additionalInfo['token_metadata']);
+
+                $connection->update(
+                    $setup->getTable('sales_order_payment'),
+                    ['additional_information' => serialize($additionalInfo)],
+                    ['entity_id = ?' => $item['entity_id']]
+                );
+            }
+        }
+
+        $setup->endSetup();
+    }
+
+    /**
+     * Tries to get connection for scalable sales DB, otherwise returns default connection
+     * @return AdapterInterface
+     */
+    private function getConnection()
+    {
+        if ($this->connection === null) {
+            /** @var ResourceConnection $conn */
+            $conn = ObjectManager::getInstance()->get(ResourceConnection::class);
+            try {
+                $this->connection = $conn->getConnectionByName('sales');
+            } catch (\DomainException $e) {
+                $this->connection = $conn->getConnection();
+            }
+        }
+
+        return $this->connection;
+    }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Block/Customer/AccountTokensTest.php b/app/code/Magento/Vault/Test/Unit/Block/Customer/AccountTokensTest.php
new file mode 100644
index 0000000000000..d2de86c58c0b7
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Unit/Block/Customer/AccountTokensTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Unit\Block\Customer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\Customer\AccountTokens;
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+use Magento\Vault\Model\CreditCardTokenFactory;
+use Magento\Vault\Model\CustomerTokenManagement;
+use Magento\Vault\Model\PaymentToken;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class AccountTokensTest
+ */
+class AccountTokensTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var CustomerTokenManagement|MockObject
+     */
+    private $tokenManagement;
+
+    /**
+     * @var AccountTokens
+     */
+    private $block;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->tokenManagement = $this->getMockBuilder(CustomerTokenManagement::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerSessionTokens'])
+            ->getMock();
+
+        $this->block = $this->objectManager->getObject(AccountTokens::class, [
+            'customerTokenManagement' => $this->tokenManagement
+        ]);
+    }
+
+    /**
+     * @covers \Magento\Vault\Block\Customer\AccountTokens::getPaymentTokens
+     */
+    public function testGetPaymentTokens()
+    {
+        $cardToken = $this->objectManager->getObject(PaymentToken::class, [
+            'data' => [PaymentTokenInterface::TYPE => CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD]
+        ]);
+        $token = $this->objectManager->getObject(PaymentToken::class, [
+            'data' => [PaymentTokenInterface::TYPE => AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT]
+        ]);
+        $this->tokenManagement->expects(static::once())
+            ->method('getCustomerSessionTokens')
+            ->willReturn([$cardToken, $token]);
+
+        $actual = $this->block->getPaymentTokens();
+        static::assertCount(1, $actual);
+
+        /** @var PaymentTokenInterface $actualToken */
+        $actualToken = array_pop($actual);
+        static::assertEquals(AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT, $actualToken->getType());
+    }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php b/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php
new file mode 100644
index 0000000000000..ed764d2be1194
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Unit\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+use Magento\Vault\Model\PaymentToken;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class AccountPaymentTokenFactoryTest
+ */
+class AccountPaymentTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var PaymentToken
+     */
+    private $paymentToken;
+
+    /**
+     * @var AccountPaymentTokenFactory
+     */
+    private $factory;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+
+        $this->objectManager = $this->getMock(ObjectManagerInterface::class);
+        $this->factory = new AccountPaymentTokenFactory($this->objectManager);
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\AccountPaymentTokenFactory::create
+     */
+    public function testCreate()
+    {
+        $this->objectManager->expects(static::once())
+            ->method('create')
+            ->willReturn($this->paymentToken);
+
+        /** @var PaymentTokenInterface $paymentToken */
+        $paymentToken = $this->factory->create();
+        static::assertInstanceOf(PaymentTokenInterface::class, $paymentToken);
+        static::assertEquals(AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT, $paymentToken->getType());
+    }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php b/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php
new file mode 100644
index 0000000000000..ed613283c9f14
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Unit\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\CreditCardTokenFactory;
+use Magento\Vault\Model\PaymentToken;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class CreditCardTokenFactoryTest
+ */
+class CreditCardTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var PaymentToken
+     */
+    private $paymentToken;
+
+    /**
+     * @var CreditCardTokenFactory
+     */
+    private $factory;
+    
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+
+        $this->objectManager = $this->getMock(ObjectManagerInterface::class);
+        $this->factory = new CreditCardTokenFactory($this->objectManager);
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\CreditCardTokenFactory::create
+     */
+    public function testCreate()
+    {
+        $this->objectManager->expects(static::once())
+            ->method('create')
+            ->willReturn($this->paymentToken);
+
+        /** @var PaymentTokenInterface $paymentToken */
+        $paymentToken = $this->factory->create();
+        static::assertInstanceOf(PaymentTokenInterface::class, $paymentToken);
+        static::assertEquals(CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD, $paymentToken->getType());
+    }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php b/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
index bc64636b8ff39..ade93c9367858 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
@@ -8,8 +8,12 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Gateway\Command\CommandManagerInterface;
 use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
+use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Model\Order\Payment;
@@ -17,6 +21,7 @@
 use Magento\Vault\Api\PaymentTokenManagementInterface;
 use Magento\Vault\Model\Method\Vault;
 use Magento\Vault\Model\VaultPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class VaultTest
@@ -29,9 +34,15 @@ class VaultTest extends \PHPUnit_Framework_TestCase
      */
     private $objectManager;
 
+    /**
+     * @var MethodInterface|MockObject
+     */
+    private $vaultProvider;
+
     public function setUp()
     {
         $this->objectManager = new ObjectManager($this);
+        $this->vaultProvider = $this->getMock(MethodInterface::class);
     }
 
     /**
@@ -48,11 +59,12 @@ public function testAuthorizeNotOrderPayment()
     }
 
     /**
+     * @param array $additionalInfo
      * @expectedException \LogicException
-     * @expectedExceptionMessage Customer and public hash should be defined
-     * @dataProvider tokenMetadataProvider
+     * @expectedExceptionMessage Public hash should be defined
+     * @dataProvider additionalInfoDataProvider
      */
-    public function testAuthorizeNoTokenMetadata($additionalInfo)
+    public function testAuthorizeNoTokenMetadata(array $additionalInfo)
     {
         $paymentModel = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
@@ -68,17 +80,15 @@ public function testAuthorizeNoTokenMetadata($additionalInfo)
     }
 
     /**
-     * Get list of variations
+     * Get list of additional information variations
      * @return array
      */
-    public function tokenMetadataProvider()
+    public function additionalInfoDataProvider()
     {
         return [
             ['additionalInfo' => []],
+            ['additionalInfo' => ['customer_id' => 1]],
             ['additionalInfo' => ['public_hash' => null]],
-            ['additionalInfo' => ['customer_id' => null]],
-            ['additionalInfo' => ['public_hash' => '1ds23', 'customer_id' => null]],
-            ['additionalInfo' => ['public_hash' => null, 'customer_id' => 1]],
         ];
     }
 
@@ -136,8 +146,6 @@ public function testAuthorize()
         $commandManagerPool = $this->getMock(CommandManagerPoolInterface::class);
         $commandManager = $this->getMock(CommandManagerInterface::class);
 
-        $vaultProvider = $this->getMock(MethodInterface::class);
-
         $tokenManagement = $this->getMock(PaymentTokenManagementInterface::class);
         $token = $this->getMock(PaymentTokenInterface::class);
 
@@ -160,7 +168,7 @@ public function testAuthorize()
             ->method('setVaultPaymentToken')
             ->with($token);
 
-        $vaultProvider->expects(static::atLeastOnce())
+        $this->vaultProvider->expects(static::atLeastOnce())
             ->method('getCode')
             ->willReturn($vaultProviderCode);
         $commandManagerPool->expects(static::once())
@@ -187,7 +195,7 @@ public function testAuthorize()
             [
                 'tokenManagement' => $tokenManagement,
                 'commandManagerPool' => $commandManagerPool,
-                'vaultProvider' => $vaultProvider
+                'vaultProvider' => $this->vaultProvider
             ]
         );
         $model->authorize($paymentModel, $amount);
@@ -225,4 +233,129 @@ public function testCapture()
         $model = $this->objectManager->getObject(Vault::class);
         $model->capture($paymentModel, 0);
     }
+
+    /**
+     * @covers \Magento\Vault\Model\Method\Vault::isAvailable
+     * @dataProvider isAvailableDataProvider
+     */
+    public function testIsAvailable($isAvailableProvider, $isActive, $expected)
+    {
+        $storeId = 1;
+        $quote = $this->getMockForAbstractClass(CartInterface::class);
+        $config = $this->getMockForAbstractClass(ConfigInterface::class);
+
+        $this->vaultProvider->expects(static::once())
+            ->method('isAvailable')
+            ->with($quote)
+            ->willReturn($isAvailableProvider);
+
+        $config->expects(static::any())
+            ->method('getValue')
+            ->with('active', $storeId)
+            ->willReturn($isActive);
+
+        $quote->expects(static::any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+
+        /** @var Vault $model */
+        $model = $this->objectManager->getObject(Vault::class, [
+            'config' => $config,
+            'vaultProvider' => $this->vaultProvider
+        ]);
+        $actual = $model->isAvailable($quote);
+        static::assertEquals($expected, $actual);
+    }
+
+    /**
+     * List of variations for testing isAvailable method
+     * @return array
+     */
+    public function isAvailableDataProvider()
+    {
+        return [
+            ['isAvailableProvider' => true, 'isActiveVault' => false, 'expected' => false],
+            ['isAvailableProvider' => false, 'isActiveVault' => false, 'expected' => false],
+            ['isAvailableProvider' => false, 'isActiveVault' => true, 'expected' => false],
+            ['isAvailableProvider' => true, 'isActiveVault' => true, 'expected' => true],
+        ];
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\Method\Vault::isAvailable
+     */
+    public function testIsAvailableWithoutQuote()
+    {
+        $quote = null;
+        $config = $this->getMockForAbstractClass(ConfigInterface::class);
+
+        $this->vaultProvider->expects(static::once())
+            ->method('isAvailable')
+            ->with($quote)
+            ->willReturn(true);
+
+        $config->expects(static::once())
+            ->method('getValue')
+            ->with('active', $quote)
+            ->willReturn(false);
+
+        /** @var Vault $model */
+        $model = $this->objectManager->getObject(Vault::class, [
+            'config' => $config,
+            'vaultProvider' => $this->vaultProvider
+        ]);
+        static::assertFalse($model->isAvailable($quote));
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\Method\Vault::canUseInternal
+     * @param bool|null $configValue
+     * @param bool|null $paymentValue
+     * @param bool $expected
+     * @dataProvider internalUsageDataProvider
+     */
+    public function testCanUseInternal($configValue, $paymentValue, $expected)
+    {
+        $handlerPool = $this->getMock(ValueHandlerPoolInterface::class);
+        $handler = $this->getMock(ValueHandlerInterface::class);
+
+        $handlerPool->expects(static::once())
+            ->method('get')
+            ->with('can_use_internal')
+            ->willReturn($handler);
+
+        $handler->expects(static::once())
+            ->method('handle')
+            ->with(['field' => 'can_use_internal'], null)
+            ->willReturn($configValue);
+
+        $this->vaultProvider->expects(static::any())
+            ->method('canUseInternal')
+            ->willReturn($paymentValue);
+
+        /** @var Vault $model */
+        $model = $this->objectManager->getObject(Vault::class, [
+            'vaultProvider' => $this->vaultProvider,
+            'valueHandlerPool' => $handlerPool,
+        ]);
+        static::assertEquals($expected, $model->canUseInternal());
+    }
+
+    /**
+     * Get list of variations for testing canUseInternal method
+     * @return array
+     */
+    public function internalUsageDataProvider()
+    {
+        return [
+            ['configValue' => true, 'paymentValue' => true, 'expected' => true],
+            ['configValue' => true, 'paymentValue' => null, 'expected' => true],
+            ['configValue' => true, 'paymentValue' => false, 'expected' => true],
+            ['configValue' => false, 'paymentValue' => true, 'expected' => false],
+            ['configValue' => false, 'paymentValue' => false, 'expected' => false],
+            ['configValue' => null, 'paymentValue' => true, 'expected' => true],
+            ['configValue' => null, 'paymentValue' => false, 'expected' => false],
+            ['configValue' => null, 'paymentValue' => null, 'expected' => false],
+        ];
+    }
 }
diff --git a/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php b/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php
new file mode 100644
index 0000000000000..9e9d426fa8f3a
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Unit\Model;
+
+use Magento\Payment\Api\Data\PaymentMethodInterface;
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Payment\Model\Method\InstanceFactory;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Vault\Model\VaultPaymentInterface;
+use Magento\Vault\Model\PaymentMethodList;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class PaymentMethodListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PaymentMethodListInterface|MockObject
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var InstanceFactory|MockObject
+     */
+    private $instanceFactory;
+
+    /**
+     * @var PaymentMethodList
+     */
+    private $vaultPaymentList;
+
+    protected function setUp()
+    {
+        $this->paymentMethodList = $this->getMock(PaymentMethodListInterface::class);
+        $this->instanceFactory = $this->getMockBuilder(InstanceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->vaultPaymentList = new PaymentMethodList($this->paymentMethodList, $this->instanceFactory);
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\PaymentMethodList::getActiveList
+     */
+    public function testGetActivePaymentList()
+    {
+        $storeId = 1;
+        $vaultPayment = $this->getMock(VaultPaymentInterface::class);
+        $paymentMethodInterface1 = $this->getMock(PaymentMethodInterface::class);
+        $paymentMethodInterface2 = $this->getMock(PaymentMethodInterface::class);
+        $activePayments = [
+            $paymentMethodInterface1,
+            $paymentMethodInterface2
+        ];
+
+        $this->paymentMethodList->expects(static::once())
+            ->method('getActiveList')
+            ->with($storeId)
+            ->willReturn($activePayments);
+
+        $this->instanceFactory->expects(static::exactly(2))
+            ->method('create')
+            ->willReturnMap([
+                [$paymentMethodInterface1, $this->getMock(MethodInterface::class)],
+                [$paymentMethodInterface2, $vaultPayment]
+            ]);
+
+        $vaultPayments = $this->vaultPaymentList->getActiveList($storeId);
+        static::assertCount(1, $vaultPayments);
+        static::assertInstanceOf(VaultPaymentInterface::class, $vaultPayment);
+    }
+}
diff --git a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
index 8c8486407b04d..8784522a80f7a 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
@@ -474,7 +474,7 @@ public function testGetVisibleAvailableTokens()
             ->with('gt')
             ->willReturnSelf();
 
-        $date = $this->getMockBuilder('DateTime')
+        $date = $this->getMockBuilder(\DateTime::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->dateTimeFactory->expects(static::once())
@@ -486,9 +486,9 @@ public function testGetVisibleAvailableTokens()
             ->with('Y-m-d 00:00:00')
             ->willReturn('2015-01-01 00:00:00');
 
-        $this->searchCriteriaBuilder->expects(self::once())
+        $this->searchCriteriaBuilder->expects(self::exactly(4))
             ->method('addFilters')
-            ->with([$customerFilter, $visibilityFilter, $isActiveFilter, $expiresAtFilter])
+            ->withConsecutive($customerFilter, $visibilityFilter, $isActiveFilter, $expiresAtFilter)
             ->willReturnSelf();
 
         $this->searchCriteriaBuilder->expects(self::once())
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
index e54f9cc9c979b..bbac491386c44 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
@@ -10,20 +10,26 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
 use Magento\Payment\Helper\Data;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface;
+use Magento\Vault\Api\PaymentTokenManagementInterface;
 use Magento\Vault\Api\PaymentTokenRepositoryInterface;
 use Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 use Magento\Vault\Model\VaultPaymentInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class TokensConfigProviderTest
@@ -32,6 +38,17 @@
  */
 class TokensConfigProviderTest extends \PHPUnit_Framework_TestCase
 {
+    /**#@+
+     * Global values
+     */
+    const STORE_ID = 1;
+    const ORDER_ID = 2;
+    const ORDER_PAYMENT_ENTITY_ID = 3;
+    const ENTITY_ID = 4;
+    const VAULT_PAYMENT_CODE = 'vault_payment';
+    const VAULT_PROVIDER_CODE = 'payment';
+    /**#@-*/
+
     /**
      * @var PaymentTokenRepositoryInterface|MockObject
      */
@@ -77,11 +94,31 @@ class TokensConfigProviderTest extends \PHPUnit_Framework_TestCase
      */
     private $vaultPayment;
 
+    /**
+     * @var PaymentTokenManagementInterface|MockObject
+     */
+    private $paymentTokenManagement;
+
+    /**
+     * @var OrderRepositoryInterface|MockObject
+     */
+    private $orderRepository;
+
+    /**
+     * @var TokenUiComponentProviderInterface|MockObject
+     */
+    private $tokenComponentProvider;
+
     /**
      * @var ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var TokensConfigProvider
+     */
+    private $configProvider;
+
     protected function setUp()
     {
         $this->paymentTokenRepository = $this->getMockBuilder(PaymentTokenRepositoryInterface::class)
@@ -94,7 +131,7 @@ protected function setUp()
             ->getMock();
         $this->session = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId'])
+            ->setMethods(['getCustomerId', 'getReordered'])
             ->getMock();
         $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
             ->disableOriginalConstructor()
@@ -103,23 +140,54 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getMethodInstance'])
             ->getMock();
+        $this->paymentTokenManagement = $this->getMockBuilder(PaymentTokenManagementInterface::class)
+            ->getMockForAbstractClass();
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
+            ->getMockForAbstractClass();
 
         $this->vaultPayment = $this->getMockForAbstractClass(VaultPaymentInterface::class);
         
         $this->objectManager = new ObjectManager($this);
+
+        $this->initStoreMock();
+
+        $this->tokenComponentProvider = $this->getMock(TokenUiComponentProviderInterface::class);
+
+        $this->configProvider = new TokensConfigProvider(
+            $this->session,
+            $this->paymentTokenRepository,
+            $this->filterBuilder,
+            $this->searchCriteriaBuilder,
+            $this->storeManager,
+            $this->dateTimeFactory,
+            [
+                self::VAULT_PROVIDER_CODE => $this->tokenComponentProvider
+            ]
+        );
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->configProvider,
+            'paymentDataHelper',
+            $this->paymentDataHelper
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->configProvider,
+            'paymentTokenManagement',
+            $this->paymentTokenManagement
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->configProvider,
+            'orderRepository',
+            $this->orderRepository
+        );
     }
 
     /**
      * @covers \Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider::getTokensComponents
      */
-    public function testGetTokensComponents()
+    public function testGetTokensComponentsRegisteredCustomer()
     {
-        $storeId = 1;
-        $customerId = 2;
-        $vaultPaymentCode = 'vault_payment';
-        $vaultProviderCode = 'payment';
-
-        $this->initStoreMock();
+        $customerId = 1;
 
         $this->session->expects(static::once())
             ->method('getCustomerId')
@@ -127,26 +195,26 @@ public function testGetTokensComponents()
 
         $this->paymentDataHelper->expects(static::once())
             ->method('getMethodInstance')
-            ->with($vaultPaymentCode)
+            ->with(self::VAULT_PAYMENT_CODE)
             ->willReturn($this->vaultPayment);
         
         $this->vaultPayment->expects(static::once())
             ->method('isActive')
-            ->with($storeId)
+            ->with(self::STORE_ID)
             ->willReturn(true);
         $this->vaultPayment->expects(static::once())
             ->method('getProviderCode')
-            ->willReturn($vaultProviderCode);
+            ->willReturn(self::VAULT_PROVIDER_CODE);
 
         /** @var PaymentTokenInterface|MockObject $token */
         $token = $this->getMockBuilder(PaymentTokenInterface::class)
             ->getMockForAbstractClass();
 
-        list($tokenUiComponent, $tokenUiComponentProvider) = $this->getTokenUiComponentProvider($token);
+        $tokenUiComponent = $this->getTokenUiComponentProvider($token);
 
-        $searchCriteria = $this->getSearchCriteria($customerId, $vaultProviderCode);
+        $searchCriteria = $this->getSearchCriteria($customerId, self::ENTITY_ID, self::VAULT_PROVIDER_CODE);
 
-        $date = $this->getMockBuilder('DateTime')
+        $date = $this->getMockBuilder(\DateTime::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->dateTimeFactory->expects(static::once())
@@ -169,53 +237,140 @@ public function testGetTokensComponents()
             ->method('getItems')
             ->willReturn([$token]);
 
-        $configProvider = new TokensConfigProvider(
-            $this->session,
-            $this->paymentTokenRepository,
-            $this->filterBuilder,
-            $this->searchCriteriaBuilder,
-            $this->storeManager,
-            $this->dateTimeFactory,
-            [
-                $vaultProviderCode => $tokenUiComponentProvider
-            ]
-        );
-        
-        $this->objectManager->setBackwardCompatibleProperty(
-            $configProvider,
-            'paymentDataHelper',
-            $this->paymentDataHelper
-        );
+        static::assertEquals([$tokenUiComponent], $this->configProvider->getTokensComponents(self::VAULT_PAYMENT_CODE));
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider::getTokensComponents
+     */
+    public function testGetTokensComponentsGuestCustomer()
+    {
+        $customerId = null;
+
+        $this->initStoreMock();
+
+        $this->session->expects(static::once())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+
+        $this->paymentDataHelper->expects(static::once())
+            ->method('getMethodInstance')
+            ->with(self::VAULT_PAYMENT_CODE)
+            ->willReturn($this->vaultPayment);
+
+        $this->vaultPayment->expects(static::once())
+            ->method('isActive')
+            ->with(self::STORE_ID)
+            ->willReturn(true);
+        $this->vaultPayment->expects(static::once())
+            ->method('getProviderCode')
+            ->willReturn(self::VAULT_PROVIDER_CODE);
+
+        /** @var PaymentTokenInterface|MockObject $token */
+        $token = $this->getMockBuilder(PaymentTokenInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->session->expects(static::once())
+            ->method('getReordered')
+            ->willReturn(self::ORDER_ID);
+        $this->orderRepository->expects(static::once())
+            ->method('get')
+            ->with(self::ORDER_ID)
+            ->willReturn($this->getOrderMock());
+        $this->paymentTokenManagement->expects(static::once())
+            ->method('getByPaymentId')
+            ->with(self::ORDER_PAYMENT_ENTITY_ID)
+            ->willReturn($token);
+        $token->expects(static::once())
+            ->method('getEntityId')
+            ->willReturn(self::ENTITY_ID);
+
+        $tokenUiComponent = $this->getTokenUiComponentProvider($token);
+
+        $searchCriteria = $this->getSearchCriteria($customerId, self::ENTITY_ID, self::VAULT_PROVIDER_CODE);
+
+        $date = $this->getMockBuilder('DateTime')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dateTimeFactory->expects(static::once())
+            ->method('create')
+            ->with("now", new \DateTimeZone('UTC'))
+            ->willReturn($date);
+        $date->expects(static::once())
+            ->method('format')
+            ->with('Y-m-d 00:00:00')
+            ->willReturn('2015-01-01 00:00:00');
 
-        static::assertEquals([$tokenUiComponent], $configProvider->getTokensComponents($vaultPaymentCode));
+        $searchResult = $this->getMockBuilder(PaymentTokenSearchResultsInterface::class)
+            ->getMockForAbstractClass();
+        $this->paymentTokenRepository->expects(self::once())
+            ->method('getList')
+            ->with($searchCriteria)
+            ->willReturn($searchResult);
+
+        $searchResult->expects(self::once())
+            ->method('getItems')
+            ->willReturn([$token]);
+
+        static::assertEquals([$tokenUiComponent], $this->configProvider->getTokensComponents(self::VAULT_PAYMENT_CODE));
     }
 
     /**
+     * @param \Exception $exception
      * @covers \Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider::getTokensComponents
+     * @dataProvider getTokensComponentsGuestCustomerExceptionsProvider
      */
-    public function testGetTokensComponentsNotExistsCustomer()
+    public function testGetTokensComponentsGuestCustomerOrderNotFound($exception)
     {
-        $vaultPaymentCode = 'vault_payment';
-        $this->store = $this->getMock(StoreInterface::class);
-        $this->storeManager = $this->getMock(StoreManagerInterface::class);
+        $customerId = null;
 
         $this->session->expects(static::once())
             ->method('getCustomerId')
-            ->willReturn(null);
+            ->willReturn($customerId);
+
+        $this->paymentDataHelper->expects(static::once())
+            ->method('getMethodInstance')
+            ->with(self::VAULT_PAYMENT_CODE)
+            ->willReturn($this->vaultPayment);
 
-        $this->storeManager->expects(static::never())
-            ->method('getStore');
+        $this->vaultPayment->expects(static::once())
+            ->method('isActive')
+            ->with(self::STORE_ID)
+            ->willReturn(true);
+        $this->vaultPayment->expects(static::once())
+            ->method('getProviderCode')
+            ->willReturn(self::VAULT_PROVIDER_CODE);
 
-        $configProvider = new TokensConfigProvider(
-            $this->session,
-            $this->paymentTokenRepository,
-            $this->filterBuilder,
-            $this->searchCriteriaBuilder,
-            $this->storeManager,
-            $this->dateTimeFactory
-        );
+        $this->session->expects(static::once())
+            ->method('getReordered')
+            ->willReturn(self::ORDER_ID);
+        $this->orderRepository->expects(static::once())
+            ->method('get')
+            ->with(self::ORDER_ID)
+            ->willThrowException($exception);
+
+        $this->filterBuilder->expects(static::once())
+            ->method('setField')
+            ->with(PaymentTokenInterface::ENTITY_ID)
+            ->willReturnSelf();
+        $this->filterBuilder->expects(static::never())
+            ->method('setValue');
+        $this->searchCriteriaBuilder->expects(self::never())
+            ->method('addFilters');
+
+        static::assertEmpty($this->configProvider->getTokensComponents(self::VAULT_PAYMENT_CODE));
+    }
 
-        static::assertEmpty($configProvider->getTokensComponents($vaultPaymentCode));
+    /**
+     * Set of catching exception types
+     * @return array
+     */
+    public function getTokensComponentsGuestCustomerExceptionsProvider()
+    {
+        return [
+            [new InputException()],
+            [new NoSuchEntityException()],
+        ];
     }
 
     /**
@@ -223,9 +378,7 @@ public function testGetTokensComponentsNotExistsCustomer()
      */
     public function testGetTokensComponentsEmptyComponentProvider()
     {
-        $storeId = 1;
-        $customerId = 2;
-        $vaultPaymentCode = 'vault_payment';
+        $customerId = 1;
 
         $this->session->expects(static::once())
             ->method('getCustomerId')
@@ -235,12 +388,12 @@ public function testGetTokensComponentsEmptyComponentProvider()
 
         $this->paymentDataHelper->expects(static::once())
             ->method('getMethodInstance')
-            ->with($vaultPaymentCode)
+            ->with(self::VAULT_PAYMENT_CODE)
             ->willReturn($this->vaultPayment);
 
         $this->vaultPayment->expects(static::once())
             ->method('isActive')
-            ->with($storeId)
+            ->with(self::STORE_ID)
             ->willReturn(false);
 
         $this->paymentTokenRepository->expects(static::never())
@@ -261,7 +414,55 @@ public function testGetTokensComponentsEmptyComponentProvider()
             $this->paymentDataHelper
         );
 
-        static::assertEmpty($configProvider->getTokensComponents($vaultPaymentCode));
+        static::assertEmpty($configProvider->getTokensComponents(self::VAULT_PAYMENT_CODE));
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider::getTokensComponents
+     */
+    public function testGetTokensComponentsForGuestCustomerWithoutStoredTokens()
+    {
+        $this->session->expects(static::once())
+            ->method('getCustomerId')
+            ->willReturn(null);
+
+        $this->paymentDataHelper->expects(static::once())
+            ->method('getMethodInstance')
+            ->with(self::VAULT_PAYMENT_CODE)
+            ->willReturn($this->vaultPayment);
+
+        $this->vaultPayment->expects(static::once())
+            ->method('isActive')
+            ->with(self::STORE_ID)
+            ->willReturn(true);
+        $this->vaultPayment->expects(static::once())
+            ->method('getProviderCode')
+            ->willReturn(self::VAULT_PROVIDER_CODE);
+
+        $this->session->expects(static::once())
+            ->method('getReordered')
+            ->willReturn(self::ORDER_ID);
+        $this->orderRepository->expects(static::once())
+            ->method('get')
+            ->with(self::ORDER_ID)
+            ->willReturn($this->getOrderMock());
+
+        $this->paymentTokenManagement->expects(static::once())
+            ->method('getByPaymentId')
+            ->with(self::ORDER_PAYMENT_ENTITY_ID)
+            ->willReturn(null);
+
+        $this->filterBuilder->expects(static::once())
+            ->method('setField')
+            ->with(PaymentTokenInterface::ENTITY_ID)
+            ->willReturnSelf();
+        $this->filterBuilder->expects(static::never())
+            ->method('setValue');
+
+        $this->searchCriteriaBuilder->expects(static::never())
+            ->method('addFilters');
+
+        static::assertEmpty($this->configProvider->getTokensComponents(self::VAULT_PAYMENT_CODE));
     }
 
     /**
@@ -269,36 +470,55 @@ public function testGetTokensComponentsEmptyComponentProvider()
      */
     private function initStoreMock()
     {
-        $storeId = 1;
-
         $this->store = $this->getMock(StoreInterface::class);
-        $this->store->expects(static::once())
+        $this->store->expects(static::any())
             ->method('getId')
-            ->willReturn($storeId);
+            ->willReturn(self::STORE_ID);
 
         $this->storeManager = $this->getMock(StoreManagerInterface::class);
-        $this->storeManager->expects(static::once())
+        $this->storeManager->expects(static::any())
             ->method('getStore')
             ->with(null)
             ->willReturn($this->store);
     }
 
+    /**
+     * Returns order mock with order payment mock
+     * @return OrderInterface
+     */
+    private function getOrderMock()
+    {
+        /** @var OrderInterface|MockObject $order */
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->getMockForAbstractClass();
+
+        $order->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($orderPayment);
+        $orderPayment->expects(static::once())
+            ->method('getEntityId')
+            ->willReturn(self::ORDER_PAYMENT_ENTITY_ID);
+
+        return $order;
+    }
+
     /**
      * Get mock for token ui component provider
      * @param PaymentTokenInterface $token
-     * @return array
+     * @return TokenUiComponentInterface|MockObject
      */
     private function getTokenUiComponentProvider($token)
     {
         $tokenUiComponent = $this->getMock(TokenUiComponentInterface::class);
-
-        $tokenUiComponentProvider = $this->getMock(TokenUiComponentProviderInterface::class);
-        $tokenUiComponentProvider->expects(static::once())
+        $this->tokenComponentProvider->expects(static::once())
             ->method('getComponentForToken')
             ->with($token)
             ->willReturn($tokenUiComponent);
 
-        return [$tokenUiComponent, $tokenUiComponentProvider];
+        return $tokenUiComponent;
     }
 
     /**
@@ -331,16 +551,18 @@ private function createExpectedFilter($field, $value, $atIndex)
     /**
      * Build search criteria
      * @param int $customerId
+     * @param int $entityId
      * @param string $vaultProviderCode
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    private function getSearchCriteria($customerId, $vaultProviderCode)
+    private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
     {
         $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $customerFilter = $this->createExpectedFilter(PaymentTokenInterface::CUSTOMER_ID, $customerId, 0);
+        $customerFilter = $customerId ? $this->createExpectedFilter(PaymentTokenInterface::CUSTOMER_ID, $customerId, 0)
+            : $this->createExpectedFilter(PaymentTokenInterface::ENTITY_ID, $entityId, 0);
         $codeFilter = $this->createExpectedFilter(
             PaymentTokenInterface::PAYMENT_METHOD_CODE,
             $vaultProviderCode,
@@ -360,10 +582,16 @@ private function getSearchCriteria($customerId, $vaultProviderCode)
             ->with('gt')
             ->willReturnSelf();
 
-        $this->searchCriteriaBuilder->expects(self::once())
+        $this->searchCriteriaBuilder->expects(self::exactly(4))
             ->method('addFilters')
-            ->with([$customerFilter, $codeFilter, $expiresAtFilter, $isActiveFilter])
-            ->willReturnSelf();
+            ->willReturnMap(
+                [
+                    [$customerFilter, $this->searchCriteriaBuilder],
+                    [$codeFilter, $this->searchCriteriaBuilder],
+                    [$expiresAtFilter, $this->searchCriteriaBuilder],
+                    [$isActiveFilter, $this->searchCriteriaBuilder],
+                ]
+            );
 
         $this->searchCriteriaBuilder->expects(self::once())
             ->method('create')
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
index e64fff27ff14c..34b7c52404971 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Vault\Test\Unit\Model\Ui;
 
-use Magento\Customer\Model\Session;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Payment\Helper\Data;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentMethodListInterface;
 use Magento\Vault\Model\CustomerTokenManagement;
 use Magento\Vault\Model\Ui\TokensConfigProvider;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
@@ -48,9 +47,9 @@ class TokensConfigProviderTest extends \PHPUnit_Framework_TestCase
     private $customerTokenManagement;
 
     /**
-     * @var Data|MockObject
+     * @var PaymentMethodListInterface|MockObject
      */
-    private $paymentDataHelper;
+    private $vaultPaymentList;
 
     /**
      * @var ObjectManager
@@ -59,15 +58,12 @@ class TokensConfigProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->vaultPayment = $this->getMock(VaultPaymentInterface::class);
+        $this->objectManager = new ObjectManager($this);
+        $this->vaultPaymentList = $this->getMock(PaymentMethodListInterface::class);
+        $this->vaultPayment = $this->getMockForAbstractClass(VaultPaymentInterface::class);
         $this->storeManager = $this->getMock(StoreManagerInterface::class);
         $this->store = $this->getMock(StoreInterface::class);
-        $this->paymentDataHelper = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStoreMethods'])
-            ->getMock();
 
-        $this->objectManager = new ObjectManager($this);
         $this->customerTokenManagement = $this->getMockBuilder(CustomerTokenManagement::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -81,7 +77,7 @@ public function testGetConfig()
         $expectedConfig = [
             'payment' => [
                 'vault' => [
-                    $vaultProviderCode . '_item_' . '0' => [
+                    $vaultProviderCode . '_' . '0' => [
                         'config' => ['token_code' => 'code'],
                         'component' => 'Vendor_Module/js/vault_component'
                     ]
@@ -99,16 +95,12 @@ public function testGetConfig()
         $this->store->expects(static::once())
             ->method('getId')
             ->willReturn($storeId);
-        
-        $this->paymentDataHelper->expects(static::once())
-            ->method('getStoreMethods')
+
+        $this->vaultPaymentList->expects(static::once())
+            ->method('getActiveList')
             ->with($storeId)
             ->willReturn([$this->vaultPayment]);
         
-        $this->vaultPayment->expects(static::once())
-            ->method('isActive')
-            ->with($storeId)
-            ->willReturn(true);
         $this->vaultPayment->expects(static::once())
             ->method('getProviderCode')
             ->willReturn($vaultProviderCode);
@@ -139,11 +131,10 @@ public function testGetConfig()
                 $vaultProviderCode => $tokenUiComponentProvider
             ]
         );
-
         $this->objectManager->setBackwardCompatibleProperty(
             $configProvider,
-            'paymentDataHelper',
-            $this->paymentDataHelper
+            'vaultPaymentList',
+            $this->vaultPaymentList
         );
 
         static::assertEquals($expectedConfig, $configProvider->getConfig());
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/VaultConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/VaultConfigProviderTest.php
index 7d0d8339ab2b1..e9d6af3bec356 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Ui/VaultConfigProviderTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Ui/VaultConfigProviderTest.php
@@ -7,24 +7,18 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Payment\Helper\Data;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Vault\Api\PaymentMethodListInterface;
 use Magento\Vault\Model\Ui\VaultConfigProvider;
 use Magento\Vault\Model\VaultPaymentInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class VaultConfigProviderTest
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class VaultConfigProviderTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var Data|MockObject
-     */
-    private $paymentDataHelper;
-
     /**
      * @var VaultPaymentInterface|MockObject
      */
@@ -45,6 +39,11 @@ class VaultConfigProviderTest extends \PHPUnit_Framework_TestCase
      */
     private $storeManager;
 
+    /**
+     * @var PaymentMethodListInterface|MockObject
+     */
+    private $vaultPaymentList;
+
     /**
      * @var VaultConfigProvider
      */
@@ -52,24 +51,20 @@ class VaultConfigProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->paymentDataHelper = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStoreMethods'])
-            ->getMock();
-
         $this->vaultPayment = $this->getMockForAbstractClass(VaultPaymentInterface::class);
         $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
         $this->store = $this->getMockForAbstractClass(StoreInterface::class);
         $this->session = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->vaultPaymentList = $this->getMock(PaymentMethodListInterface::class);
 
         $objectManager = new ObjectManager($this);
         $this->vaultConfigProvider = new VaultConfigProvider($this->storeManager, $this->session);
         $objectManager->setBackwardCompatibleProperty(
             $this->vaultConfigProvider,
-            'paymentDataHelper',
-            $this->paymentDataHelper
+            'vaultPaymentList',
+            $this->vaultPaymentList
         );
     }
 
@@ -94,16 +89,15 @@ public function testGetConfig($customerId, $vaultEnabled)
         $this->session->expects(static::once())
             ->method('getCustomerId')
             ->willReturn($customerId);
-        $this->storeManager->expects(static::exactly(2))
+        $this->storeManager->expects(static::once())
             ->method('getStore')
             ->willReturn($this->store);
-        $this->store->expects(static::exactly(2))
+        $this->store->expects(static::once())
             ->method('getId')
             ->willReturn($storeId);
 
-        $this->paymentDataHelper->expects(static::once())
-            ->method('getStoreMethods')
-            ->with($storeId)
+        $this->vaultPaymentList->expects(static::once())
+            ->method('getActiveList')
             ->willReturn([$this->vaultPayment]);
 
         $this->vaultPayment->expects(static::once())
diff --git a/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php b/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
index 6281dc83da7fd..d973e1cce5782 100644
--- a/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
@@ -78,44 +78,6 @@ public function testExecuteNotOrderPaymentModel()
         $this->observer->execute($observer);
     }
 
-    public function testExecuteNoCustomerId()
-    {
-        $dataObject = new DataObject(
-            [
-                PaymentInterface::KEY_ADDITIONAL_DATA => [
-                    PaymentTokenInterface::PUBLIC_HASH => 'public_hash_value'
-                ]
-            ]
-        );
-
-        $paymentModel = $this->getMockBuilder(Payment::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $quote = $this->getMock(CartInterface::class);
-        $customer = $this->getMock(CustomerInterface::class);
-
-        $paymentModel->expects(static::once())
-            ->method('getQuote')
-            ->willReturn($quote);
-        $quote->expects(static::once())
-            ->method('getCustomer')
-            ->willReturn($customer);
-        $customer->expects(static::once())
-            ->method('getId')
-            ->willReturn(null);
-
-        $observer = $this->getPreparedObserverWithMap(
-            [
-                [AbstractDataAssignObserver::DATA_CODE, $dataObject],
-                [AbstractDataAssignObserver::MODEL_CODE, $paymentModel]
-            ]
-        );
-
-        $this->paymentTokenManagement->expects(static::never())
-            ->method('getByPublicHash');
-        $this->observer->execute($observer);
-    }
-
     public function testExecuteNoPaymentToken()
     {
         $customerId = 1;
diff --git a/app/code/Magento/Vault/etc/di.xml b/app/code/Magento/Vault/etc/di.xml
index e44e1da3e3d61..14354da7e2c52 100644
--- a/app/code/Magento/Vault/etc/di.xml
+++ b/app/code/Magento/Vault/etc/di.xml
@@ -11,6 +11,7 @@
     <preference for="Magento\Vault\Api\Data\PaymentTokenInterface" type="Magento\Vault\Model\PaymentToken"/>
     <preference for="Magento\Vault\Api\PaymentTokenRepositoryInterface" type="Magento\Vault\Model\PaymentTokenRepository" />
     <preference for="Magento\Vault\Api\PaymentTokenManagementInterface" type="Magento\Vault\Model\PaymentTokenManagement" />
+    <preference for="Magento\Vault\Api\PaymentMethodListInterface" type="Magento\Vault\Model\PaymentMethodList" />
     <preference for="Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
     <preference for="Magento\Vault\Model\Ui\TokenUiComponentInterface" type="Magento\Vault\Model\Ui\TokenUiComponent" />
 
diff --git a/app/code/Magento/Vault/etc/module.xml b/app/code/Magento/Vault/etc/module.xml
index cc654548a1bba..7ab8db1d86fce 100644
--- a/app/code/Magento/Vault/etc/module.xml
+++ b/app/code/Magento/Vault/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Vault" setup_version="2.0.0">
+    <module name="Magento_Vault" setup_version="2.0.2">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Store"/>
diff --git a/app/code/Magento/Vault/view/adminhtml/web/js/vault.js b/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
index 560e65c007f8a..779e48f1385e5 100644
--- a/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
+++ b/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
@@ -33,8 +33,8 @@ define([
                 .observe(['active']);
 
             // re-init payment method events
-            self.$selector.off('changePaymentMethod.' + this.code)
-                .on('changePaymentMethod.' + this.code, this.changePaymentMethod.bind(this));
+            self.$selector.off('changePaymentMethod.' + this.getCode())
+                .on('changePaymentMethod.' + this.getCode(), this.changePaymentMethod.bind(this));
 
             if (this.active()) {
                 $('#' + this.fieldset + ' input:radio:first').trigger('click');
@@ -50,7 +50,7 @@ define([
          * @returns {exports.changePaymentMethod}
          */
         changePaymentMethod: function (event, method) {
-            this.active(method === this.code);
+            this.active(method === this.getCode());
 
             return this;
         },
@@ -61,13 +61,21 @@ define([
          */
         onActiveChange: function (isActive) {
             if (!isActive) {
-                this.$selector.trigger('setVaultNotActive');
+                this.$selector.trigger('setVaultNotActive.' + this.getCode());
 
                 return;
             }
 
             $('#' + this.fieldset + ' input:radio:first').trigger('click');
-            window.order.addExcludedPaymentMethod(this.code);
+            window.order.addExcludedPaymentMethod(this.getCode());
+        },
+
+        /**
+         * Get Vault Payment method code
+         * @returns {String}
+         */
+        getCode: function () {
+            return this.code;
         }
     });
 });
diff --git a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
index 1fb8805239f0a..2042721d9d387 100644
--- a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
@@ -11,7 +11,7 @@
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-my-credit-cards-link">
                 <arguments>
                     <argument name="path" xsi:type="string">vault/cards/listaction</argument>
-                    <argument name="label" xsi:type="string" translate="true">My Credit Cards</argument>
+                    <argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Vault/view/frontend/layout/vault_cards_listaction.xml b/app/code/Magento/Vault/view/frontend/layout/vault_cards_listaction.xml
index bac49fe7869f5..5731fbd79154b 100644
--- a/app/code/Magento/Vault/view/frontend/layout/vault_cards_listaction.xml
+++ b/app/code/Magento/Vault/view/frontend/layout/vault_cards_listaction.xml
@@ -9,7 +9,8 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Vault\Block\CreditCards" name="vault.cards.list" cacheable="false" template="cards_list.phtml" />
+            <block class="Magento\Vault\Block\Customer\CreditCards" name="vault.cards.list" cacheable="false" template="cards_list.phtml" />
+            <block class="Magento\Vault\Block\Customer\AccountTokens" name="vault.token.list" cacheable="false" template="token_list.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
index dac022f28826d..2dd08ca4c5c09 100644
--- a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
@@ -5,13 +5,13 @@
  */
 
 // @codingStandardsIgnoreFile
-/** @var \Magento\Vault\Block\CreditCards $block */
+/** @var \Magento\Vault\Block\Customer\CreditCards $block */
 $tokens = $block->getPaymentTokens();
 ?>
 <?php if (count($tokens) !== 0): ?>
     <div class="table-wrapper my-credit-cards">
         <table class="data table table-credit-cards" id="my-orders-table">
-            <caption class="table-caption"><?php /* @noEscape */ echo __('My Credit Cards') ?></caption>
+            <caption class="table-caption"><?php /* @noEscape */ echo __('Stored Payment Methods') ?></caption>
             <thead>
             <tr>
                 <th scope="col" class="col card-number"><?php /* @noEscape */ echo __('Card Number') ?></th>
@@ -30,6 +30,6 @@ $tokens = $block->getPaymentTokens();
         </table>
     </div>
 
-<?php else: ?>
-    <div class="message info empty"><span><?php /* @noEscape */ echo __('You have no credit cards.'); ?></span></div>
+<?php elseif (!$block->isExistsCustomerTokens()): ?>
+    <div class="message info empty"><span><?php /* @noEscape */ echo __('You have no stored payment methods.'); ?></span></div>
 <?php endif ?>
diff --git a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
new file mode 100644
index 0000000000000..d5086cf5ec54c
--- /dev/null
+++ b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+/** @var \Magento\Vault\Block\Customer\AccountTokens $block */
+$tokens = $block->getPaymentTokens();
+?>
+<?php if (count($tokens) !== 0): ?>
+    <div class="table-wrapper my-credit-cards">
+        <table class="data table table-credit-cards" id="token-list-table">
+            <thead>
+            <tr>
+                <th scope="col" class="col"><?php echo $block->escapeHtml(__('PayPal Account')); ?></th>
+                <th scope="col" class="col actions">&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach($tokens as $token): ?>
+                <?php /* @noEscape */ echo $block->renderTokenHtml($token); ?>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+<?php endif; ?>
diff --git a/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js b/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js
index cba9256f2a563..3015755191d37 100644
--- a/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js
+++ b/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js
@@ -4,25 +4,32 @@
  */
 /*browser:true*/
 /*global define*/
-define(
-    [
-        'underscore',
-        'uiComponent',
-        'Magento_Checkout/js/model/payment/renderer-list'
-    ],
-    function (
-        _,
-        Component,
-        rendererList
-    ) {
-        'use strict';
+define([
+    'underscore',
+    'uiComponent',
+    'Magento_Checkout/js/model/payment/renderer-list',
+    'uiLayout',
+    'uiRegistry'
+], function (_, Component, rendererList, layout, registry) {
+    'use strict';
 
+    var vaultGroupName = 'vaultGroup';
+
+    layout([{
+        name: vaultGroupName,
+        component: 'Magento_Checkout/js/model/payment/method-group',
+        alias: 'vault',
+        sortOrder: 10
+    }]);
+
+    registry.get(vaultGroupName, function (vaultGroup) {
         _.each(window.checkoutConfig.payment.vault, function (config, index) {
             rendererList.push(
                 {
                     type: index,
                     config: config.config,
                     component: config.component,
+                    group: vaultGroup,
 
                     /**
                      * Custom payment method types comparator
@@ -31,15 +38,16 @@ define(
                      * @return {Boolean}
                      */
                     typeComparatorCallback: function (typeA, typeB) {
-                        return typeA.indexOf(typeB) === 0;
+                        // vault token items have the same name as vault payment without index
+                        return typeA.substring(0, typeA.lastIndexOf('_')) === typeB;
                     }
                 }
             );
         });
+    });
 
-        /**
-         * Add view logic here if needed
-         */
-        return Component.extend({});
-    }
-);
+    /**
+     * Add view logic here if needed
+     */
+    return Component.extend({});
+});
diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
index 9573d4b8a1e65..00716c776990d 100644
--- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
@@ -13,6 +13,11 @@
 @braintree-focus__color: @color-blue2;
 @braintree-success__color: @color-dark-green1;
 
+@braintree-paypal-icon__height: 16px;
+@braintree-paypal-icon__width: 16px;
+@braintree-paypal-account__padding-right: 50px;
+@braintree-paypal-account__padding-vertical: 15px;
+
 //
 //  Common
 //  _____________________________________________
@@ -86,6 +91,80 @@
             opacity: 0;
         }
     }
+
+    .braintree-paypal-logo {
+        margin-top: @indent__s;
+        text-align: center;
+    }
+
+    .braintree-paypal-account {
+        padding: @braintree-paypal-account__padding-vertical 0 @braintree-paypal-account__padding-vertical @braintree-paypal-account__padding-right;
+        position: relative;
+
+        .lib-icon-image(
+            @_icon-image: '@{baseDir}Magento_Braintree/images/paypal-small.png',
+            @_icon-image-position: before,
+            @_icon-image-width: @braintree-paypal-icon__width,
+            @_icon-image-height: @braintree-paypal-icon__height
+        );
+
+        &:before {
+            left: @braintree-paypal-account__padding-right/2 - @braintree-paypal-icon__width/2;
+            margin-top: -@braintree-paypal-icon__height/2;
+            position: absolute;
+            top: 50%;
+        }
+
+        .payment-method-type {
+            font-weight: @font-weight__bold;
+        }
+
+        .payment-method-description {
+            color: @color-gray34;
+        }
+    }
+
+    .braintree-paypal-fieldset {
+        border: 0;
+        margin: 0;
+        padding: 0;
+    }
+
+    .action-braintree-paypal-logo {
+        .lib-button-reset();
+
+        img {
+            margin: 0;
+            width: 114px;
+        }
+    }
+
+    .payment-method {
+        .payment-method-content {
+            .actions-toolbar {
+                &.braintree-paypal-actions {
+                    margin-left: 0;
+                }
+            }
+        }
+    }
+
+    //  My Account > Stored Payment Methods
+    .account {
+        .table {
+            .col {
+                &.paypal-account {
+                    img {
+                        vertical-align: middle;
+                    }
+
+                    + .actions {
+                        vertical-align: middle;
+                    }
+                }
+            }
+        }
+    }
 }
 
 //
@@ -100,4 +179,23 @@
             }
         }
     }
+
+    .braintree-paypal-account {
+        border-color: @color-gray80;
+        border-style: solid;
+        border-width: 1px 0;
+        display: inline-block;
+        width: 50%;
+    }
+
+    //  My Account > Stored Payment Methods
+    .account {
+        .table-credit-cards {
+            .col {
+                &.actions {
+                    width: 100px;
+                }
+            }
+        }
+    }
 }
diff --git a/app/design/frontend/Magento/blank/Magento_BraintreeTwo/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_BraintreeTwo/web/css/source/_module.less
deleted file mode 100644
index 45f41cff13e4b..0000000000000
--- a/app/design/frontend/Magento/blank/Magento_BraintreeTwo/web/css/source/_module.less
+++ /dev/null
@@ -1,24 +0,0 @@
-// /**
-//  * Copyright © 2016 Magento. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
-
-//
-//  Common
-//  _____________________________________________
-
-& when (@media-common = true) {
-    .braintree-paypal-logo {
-        margin-top: @indent__s;
-        text-align: center;
-    }
-
-    .action-braintree-paypal-logo {
-        .lib-button-reset();
-
-        img {
-            margin: 0;
-            width: 114px;
-        }
-    }
-}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index ca69275441643..453a9ce958f4d 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -24,6 +24,7 @@
 & when (@media-common = true) {
     .checkout-payment-method {
         .step-title {
+            border-bottom: 0;
             margin-bottom: 0;
         }
 
@@ -39,6 +40,12 @@
                     display: block;
                 }
             }
+
+            & + .payment-method {
+                .payment-method-title {
+                    .lib-css(border-top, @checkout-payment-method-title__border);
+                }
+            }
         }
 
         .payment-method-content {
@@ -54,7 +61,6 @@
         }
 
         .payment-method-title {
-            .lib-css(border-top, @checkout-payment-method-title__border);
             .lib-css(padding, @checkout-payment-method-title__padding 0);
             margin: 0;
 
@@ -72,7 +78,6 @@
 
         .payment-method-content {
             display: none;
-
             .lib-css(padding, 0 0 @indent__base @checkout-payment-method-content__padding__xl);
             .fieldset {
                 &:not(:last-child) {
@@ -81,6 +86,14 @@
             }
         }
 
+        .payment-group {
+            & + .payment-group {
+                .step-title {
+                    margin: @indent__base 0 0;
+                }
+            }
+        }
+
         .field-select-billing,
         .billing-address-form {
             .lib-css(max-width, @checkout-billing-address-form__max-width);
@@ -90,7 +103,7 @@
             margin: 0 0 @indent__s;
         }
 
-        .payment-method-billing-address {
+        .checkout-billing-address {
             margin: 0 0 @indent__base;
 
             .primary {
@@ -106,15 +119,11 @@
             .billing-address-details {
                 .lib-css(line-height, @checkout-billing-address-details__line-height);
                 .lib-css(padding, @checkout-billing-address-details__padding);
-
-                .action-edit-address {
-                    &:extend(.abs-action-button-as-link all);
-                }
             }
         }
 
         .payment-method-note {
-            & + .payment-method-billing-address {
+            & + .checkout-billing-address {
                 margin-top: @indent__base;
             }
         }
@@ -161,7 +170,7 @@
             .lib-css(padding, 0 @checkout-payment-method-title-mobile__padding @indent__base);
         }
 
-        .payment-method-billing-address {
+        .checkout-billing-address {
             .action-cancel {
                 margin-top: @indent__s;
             }
@@ -175,12 +184,10 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .checkout-payment-method {
-        .payment-methods {
-            .actions-toolbar {
-                .primary {
-                    float: right;
-                    margin: 0;
-                }
+        .actions-toolbar {
+            .primary {
+                float: right;
+                margin: 0;
             }
         }
 
@@ -214,7 +221,7 @@
         }
     }
 
-    .payment-method-billing-address {
+    .checkout-billing-address {
         .action-update {
             float: right;
         }
diff --git a/app/design/frontend/Magento/luma/Magento_BraintreeTwo/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_BraintreeTwo/web/css/source/_module.less
deleted file mode 100644
index 07edd849b3d7b..0000000000000
--- a/app/design/frontend/Magento/luma/Magento_BraintreeTwo/web/css/source/_module.less
+++ /dev/null
@@ -1,28 +0,0 @@
-// /**
-//  * Copyright © 2016 Magento. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
-
-//
-//  Common
-//  _____________________________________________
-
-& when (@media-common = true) {
-    .braintree-paypal-logo {
-        margin-top: @indent__s;
-        text-align: center;
-    }
-
-    .action-braintree-paypal-logo {
-        .lib-button-reset();
-
-        &:not(.primary) {
-            box-shadow: none;
-        }
-
-        img {
-            margin: 0;
-            width: 114px;
-        }
-    }
-}
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 3c3ee77ed00e0..a8c84ef51a92a 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -24,6 +24,7 @@
 & when (@media-common = true) {
     .checkout-payment-method {
         .step-title {
+            border-bottom: 0;
             margin-bottom: 0;
         }
 
@@ -39,6 +40,12 @@
                     display: block;
                 }
             }
+
+            & + .payment-method {
+                .payment-method-title {
+                    .lib-css(border-top, @checkout-payment-method-title__border);
+                }
+            }
         }
 
         .payment-method-content {
@@ -54,7 +61,6 @@
         }
 
         .payment-method-title {
-            .lib-css(border-top, @checkout-payment-method-title__border);
             .lib-css(padding, @checkout-payment-method-title__padding 0);
             margin: 0;
 
@@ -80,6 +86,14 @@
             }
         }
 
+        .payment-group {
+            & + .payment-group {
+                .step-title {
+                    margin: @indent__base 0 0;
+                }
+            }
+        }
+
         .field-select-billing,
         .billing-address-form {
             .lib-css(max-width, @checkout-billing-address-form__max-width);
@@ -89,7 +103,7 @@
             margin: 0 0 @indent__s;
         }
 
-        .payment-method-billing-address {
+        .checkout-billing-address {
             margin: 0 0 @indent__base;
 
             .primary {
@@ -105,15 +119,11 @@
             .billing-address-details {
                 .lib-css(line-height, @checkout-billing-address-details__line-height);
                 .lib-css(padding, @checkout-billing-address-details__padding);
-
-                .action-edit-address {
-                    &:extend(.abs-action-button-as-link all);
-                }
             }
         }
 
         .payment-method-note {
-            & + .payment-method-billing-address {
+            & + .checkout-billing-address {
                 margin-top: @indent__base;
             }
         }
@@ -160,7 +170,7 @@
             .lib-css(padding, 0 @checkout-payment-method-title-mobile__padding @indent__base);
         }
 
-        .payment-method-billing-address {
+        .checkout-billing-address {
             .action-cancel {
                 margin-top: @indent__s;
             }
@@ -174,12 +184,10 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .checkout-payment-method {
-        .payment-methods {
-            .actions-toolbar {
-                .primary {
-                    float: right;
-                    margin: 0;
-                }
+        .actions-toolbar {
+            .primary {
+                float: right;
+                margin: 0;
             }
         }
 
@@ -193,7 +201,7 @@
         }
     }
 
-    .payment-method-billing-address {
+    .checkout-billing-address {
         .action-update {
             float: right;
         }
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
index 3c61630fb148d..88794d183e878 100644
--- a/dev/tests/functional/credentials.xml.dist
+++ b/dev/tests/functional/credentials.xml.dist
@@ -27,4 +27,36 @@
     <field replace="carriers_dhl_id_eu" value="" />
     <field replace="carriers_dhl_password_eu" value="" />
     <field replace="carriers_dhl_account_eu" value="" />
+
+    <field path="payment/authorizenet_directpost/login" value="" />
+    <field path="payment/authorizenet_directpost/trans_key" value="" />
+    <field path="payment/authorizenet_directpost/trans_md5" value="" />
+
+    <field path="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" value="" />
+    <field path="payment/braintree_section/braintree/braintree_required/merchant_id" value="" />
+    <field path="payment/braintree_section/braintree/braintree_required/public_key" value="" />
+    <field path="payment/braintree_section/braintree/braintree_required/private_key" value="" />
+
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/business_account" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_username" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_password" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_signature" value="" />
+    <field path="payment/paypal_express/merchant_id" value="" />
+
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/business_account" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/partner" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/user" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/pwd" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/vendor" value="" />
+
+    <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/business_account" value="" />
+    <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/api_username" value="" />
+    <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/api_password" value="" />
+    <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/api_signature" value="" />
+
+    <field path="payment/paypal_payment_gateways/payflow_link_us/payflow_link_required/payflow_link_payflow_link/business_account" value="" />
+    <field path="payment/paypal_payment_gateways/payflow_link_us/payflow_link_required/payflow_link_payflow_link/partner" value="" />
+    <field path="payment/paypal_payment_gateways/payflow_link_us/payflow_link_required/payflow_link_payflow_link/user" value="" />
+    <field path="payment/paypal_payment_gateways/payflow_link_us/payflow_link_required/payflow_link_payflow_link/pwd" value="" />
+    <field path="payment/paypal_payment_gateways/payflow_link_us/payflow_link_required/payflow_link_payflow_link/vendor" value="" />
 </replace>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
index 2ea4873f454a3..8a362628edaea 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
@@ -6,12 +6,12 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net payment method.">
-        <variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="Check Out as a Guest with Authorize.Net and Offline Shipping method" ticketId="MAGETWO-12832">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net Direct Post payment method.">
+        <variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="CheckOut with Authorize.Net Direct Post" ticketId="MAGETWO-59170">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
-            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="prices" xsi:type="array">
@@ -26,8 +26,7 @@
                 <item name="isClosed" xsi:type="string">No</item>
                 <item name="transactionType" xsi:type="string">Authorization</item>
             </data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertTransactionDetails" />
+            <data name="tag" xsi:type="string">test_type:3rd_party_test severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php
index 9c8b0beee9162..c6846a553defd 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php
@@ -66,6 +66,19 @@ public function waitSuccessMessage()
         return $this->waitForElementVisible($this->successMessage, Locator::SELECTOR_CSS);
     }
 
+    /**
+     * Wait for success message and refresh page.
+     *
+     * @return bool
+     */
+    public function waitSuccessMessageAndRefreshPage()
+    {
+        $this->waitSuccessMessage();
+        $this->browser->refresh();
+
+        return $this->waitForElementNotVisible($this->successMessage, Locator::SELECTOR_CSS);
+    }
+
     /**
      * Get all success messages which are present on the page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php
new file mode 100644
index 0000000000000..dc081dc5d261e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Class Payments
+ * Payments configuration block on Stores > Configuration > Sales > Payment Methods page
+ */
+class Payments extends Block
+{
+    /**
+     * Merchant Country selector.
+     *
+     * @var string
+     */
+    protected $merchantCountrySelector = "select[id$='_account_merchant_country'] > option[value='%s']";
+
+    /**
+     * Solution title(e.g. PayPal Express Checkout, Payments Advanced, etc.) selector
+     *
+     * @var string
+     */
+    protected $solutionTitle = './strong[contains(text(), "%s")]';
+
+    /**
+     * 'Save Config' button.
+     *
+     * @var string
+     */
+    protected $save = "#save";
+
+    /**
+     * @param string $countryCode
+     * @return void
+     */
+    public function switchMerchantCountry($countryCode)
+    {
+        $this->_rootElement->find(sprintf($this->merchantCountrySelector, $countryCode))->click();
+    }
+
+    /**
+     * Expand payment methods sections.
+     *
+     * @param $sectionId
+     * @return void
+     */
+    private function expandSection($sectionId)
+    {
+        $sectionName = "a[id*={$sectionId}]";
+        $section = $this->_rootElement->find($sectionName . '.open');
+        if (!$section->isVisible()) {
+            $this->_rootElement->find($sectionName)->click();
+        }
+    }
+
+    /**
+     * Find solution in section.
+     *
+     * @param $solution
+     * @return bool
+     */
+    public function findSolution($solution)
+    {
+        if ($this->_rootElement->find(sprintf($this->solutionTitle, $solution))) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check if field is disabled.
+     *
+     * @param $fieldId
+     * @return bool
+     */
+    public function isFieldDisabled($fieldId)
+    {
+        $field = $this->_rootElement->find($fieldId);
+        return $field->isDisabled();
+    }
+
+    /**
+     * Check if field is visible.
+     *
+     * @param $fieldId
+     * @return bool
+     */
+    public function isFieldPresent($fieldId)
+    {
+        $field = $this->_rootElement->find($fieldId);
+        return $field->isVisible();
+    }
+
+    /**
+     * Check if field value is Yes.
+     *
+     * @param $fieldId
+     * @return bool
+     */
+    public function isFieldEnabled($fieldId)
+    {
+        return (bool)$this->_rootElement->find($fieldId)->getValue();
+    }
+
+    /**
+     * Expand payment methods sections.
+     *
+     * @param array $sections
+     * @return void
+     */
+    public function expandPaymentSections(array $sections)
+    {
+        foreach ($sections as $key => $section) {
+            $this->expandSection($key);
+            foreach ($section as $id => $value) {
+                if (is_array($value)) {
+                    $this->expandSection($id);
+                }
+            }
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
new file mode 100644
index 0000000000000..24c2ce030f7f0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SystemConfigEditSectionPayment" area="Adminhtml" mca="admin/system_config/edit/section/payment" module="Magento_Backend">
+        <block name="pageActions" class="Magento\Backend\Test\Block\System\Config\PageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="form" class="Magento\Backend\Test\Block\System\Config\Form" locator="#config-edit-form" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
+        <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal]" strategy="css selector" />
+        <block name="paymentsConfigBlock" class="Magento\Backend\Test\Block\System\Config\Payments" locator=".main-col" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php
new file mode 100644
index 0000000000000..c85c857cbeb54
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Braintree payment method.
+ */
+class Braintree extends Block
+{
+    /**
+     * Braintree credentials fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'Merchant ID' => '#payment_us_braintree_section_braintree_braintree_required_merchant_id',
+        'Public Key' => '#payment_us_braintree_section_braintree_braintree_required_public_key',
+        'Private Key' => '#payment_us_braintree_section_braintree_braintree_required_private_key',
+    ];
+
+    /**
+     * Braintree enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable this Solution' => "#payment_us_braintree_section_braintree_active",
+        'Enable PayPal through Braintree' => '#payment_us_braintree_section_braintree_active_braintree_paypal',
+        'Vault Enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active'
+    ];
+
+    /**
+     * Braintree 'Configure' button.
+     *
+     * @var string
+     */
+    private $configureBraintreeButton = '#payment_us_braintree_section_braintree-head';
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Specify credentials in Braintree configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['Merchant ID'])->setValue('1');
+        $this->_rootElement->find($this->fields['Public Key'])->setValue('1');
+        $this->_rootElement->find($this->fields['Private Key'])->setValue('1');
+    }
+
+    /**
+     * Clear credentials in Braintree configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['Merchant ID'])->setValue('');
+        $this->_rootElement->find($this->fields['Public Key'])->setValue('');
+        $this->_rootElement->find($this->fields['Private Key'])->setValue('');
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand Braintree configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configureBraintreeButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enableBraintree()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disableBraintree()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/BraintreeSettlementReport.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/BraintreeSettlementReport.xml
similarity index 81%
rename from dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/BraintreeSettlementReport.xml
rename to dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/BraintreeSettlementReport.xml
index 20359c41bd55f..bd2a0e60b20ab 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/BraintreeSettlementReport.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/BraintreeSettlementReport.xml
@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="BraintreeSettlementReportIndex" area="Adminhtml" mca="braintree/report/index" module="Magento_Braintree">
-        <block name="settlementReportGrid" class="Magento\Braintree\Test\Block\Adminhtml\Report\Grid" locator=".admin__data-grid-outer-wrap" strategy="css selector"/>
+        <block name="settlementReportGrid" class="Magento\Braintree\Test\Block\Adminhtml\Report\Grid" locator="//div[contains(@data-bind, 'braintree_report')]" strategy="xpath"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SalesOrderView.xml
similarity index 100%
rename from dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/SalesOrderView.xml
rename to dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SalesOrderView.xml
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
new file mode 100644
index 0000000000000..836525e05f78e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SystemConfigEditSectionPayment" area="Adminhtml" mca="admin/system_config/edit/section/payment" module="Magento_Backend">
+        <block name="braintreeConfigBlock" class="Magento\Braintree\Test\Block\System\Config\Braintree" locator="#row_payment_us_braintree_section_braintree" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
index 916943e03af97..7f01e4f46106c 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
@@ -11,25 +11,25 @@
             <field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
                 <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
             </field>
             <field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
                 <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
             </field>
             <field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
                 <item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
             </field>
             <field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
                 <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
             </field>
             <field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
@@ -55,61 +55,17 @@
             <field name="payment/braintree/active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
         <dataset name="braintree_sale">
-            <field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
-            </field>
-            <field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
-            </field>
-            <field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
-            </field>
-            <field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
-            </field>
             <field name="payment/braintree/payment_action" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string">Authorize and Capture</item>
                 <item name="value" xsi:type="string">authorize_capture</item>
             </field>
-            <field name="payment/braintree/debug" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-            <field name="payment/braintree/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-        </dataset>
-        <dataset name="braintree_sale_rollback">
-            <field name="payment/braintree/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
         </dataset>
         <dataset name="braintree_3d_secure">
             <field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
@@ -123,7 +79,7 @@
             <field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
@@ -143,6 +99,9 @@
             <field name="payment/braintree_section/braintree/braintree_3dsecure/specificcountry" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="array">
+                    <item name="United Kingdom" xsi:type="string">GB</item>
+                </item>
                 <item name="value" xsi:type="array">
                     <item name="United Kingdom" xsi:type="string">GB</item>
                 </item>
@@ -152,13 +111,13 @@
             <field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
             <field name="payment/braintree_section/braintree/braintree_3dsecure/allowspecific" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
@@ -172,7 +131,7 @@
             <field name="payment/braintree/threshold_amount" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">300</item>
                 <item name="value" xsi:type="number">300</item>
             </field>
         </dataset>
@@ -180,13 +139,7 @@
             <field name="payment/braintree/verify_3dsecure" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-            <field name="payment/braintree/threshold_amount" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
@@ -224,36 +177,64 @@
             <field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
         <dataset name="braintree_paypal_sale">
-            <field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
+            <field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Authorize and Capture</item>
+                <item name="value" xsi:type="string">authorize_capture</item>
+            </field>
+        </dataset>
+        <dataset name="braintree_paypal_skip_order_review">
+            <field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="number">1</item>
             </field>
-            <field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
+        </dataset>
+        <dataset name="braintree_paypal_skip_order_review_rollback">
+            <field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Authorize and Capture</item>
-                <item name="value" xsi:type="string">authorize_capture</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
-        <dataset name="braintree_paypal_sale_rollback">
-            <field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
+        <dataset name="braintree_paypal_use_vault">
+            <field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="braintree_paypal_use_vault_rollback">
+            <field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
                 <item name="value" xsi:type="number">0</item>
             </field>
-            <field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
+        </dataset>
+        <dataset name="braintree_fraudprotection">
+            <field name="payment/braintree/fraudprotection" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Authorize</item>
-                <item name="value" xsi:type="string">authorize</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="braintree_fraudprotection_rollback">
+            <field name="payment/braintree/fraudprotection" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
     </repository>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
index 95b2234607d37..dda155f7fd66b 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
@@ -19,7 +19,7 @@
  * 1. Log in Storefront.
  * 2. Add products to the Shopping Cart.
  * 3. In 'Estimate Shipping and Tax' section specify destination using values from Test Data.
- * 4. Click the 'Go to Checkout' button.
+ * 4. Click the 'Proceed to Checkout' button.
  * 5. Fill shipping information.
  * 6. Select shipping method.
  * 7. Select payment method (use reward points and store credit if available).
@@ -30,15 +30,15 @@
  * 12. Find transaction for latest order.
  * 13. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-48162
  */
 class BraintreeSettlementReportTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
index dbdbca2378661..e80f6071ae5d1 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Braintree\Test\TestCase\BraintreeSettlementReportTest" summary="Braintree Settlement Report.">
         <variation name="BraintreeSettlementReportTestVariation1" summary="Braintree Settlement Report" ticketId="MAGETWO-48162">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -22,7 +22,7 @@
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
             <data name="configData" xsi:type="string">braintree</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
index 8bad13557c888..c9d0904c85d67 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
@@ -25,15 +25,15 @@
  * 8.  Select payment method
  * 12. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-39363
  */
 class CheckoutWithBraintreePaypalCartTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
index 8bb0cc1d84e04..9e1090d6a22f9 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Braintree\Test\TestCase\CheckoutWithBraintreePaypalCartTest" summary="One page checkout with Braintree PayPal.">
         <variation name="CheckoutWithBraintreePaypalCartTestVariation1" summary="Registered Checkout with Braintree PayPal from Cart" ticketId="MAGETWO-39363">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -18,16 +18,16 @@
                 <item name="grandTotal" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
         </variation>
         <variation name="CheckoutWithBraintreePaypalCartTestVariation2" summary="Registered Checkout with Braintree PayPal from Mini Cart with payment action Authorize and Capture" ticketId="MAGETWO-39363">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -40,9 +40,9 @@
                 <item name="0" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
index d6723c71816f9..9ee6bfb7c4e29 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
@@ -25,15 +25,15 @@
  * 8.  Select payment method
  * 12. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-39359
  */
 class CheckoutWithBraintreePaypalMinicartTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
index 03707a79d96d9..b41ea91e45982 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Braintree\Test\TestCase\CheckoutWithBraintreePaypalMinicartTest" summary="One page checkout with Braintree PayPal.">
         <variation name="CheckoutWithBraintreePaypalMinicartTestVariation1" summary="Registered Checkout with Braintree PayPal from Mini Cart" ticketId="MAGETWO-39359">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -18,16 +18,16 @@
                 <item name="grandTotal" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
         </variation>
         <variation name="CheckoutWithBraintreePaypalMinicartTestVariation2" summary="Registered Checkout with Braintree PayPal from Mini Cart with payment action Authorize and Capture" ticketId="MAGETWO-39359">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -40,9 +40,9 @@
                 <item name="0" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
index f45270012dd39..9e6cf0991db4e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
@@ -17,15 +17,15 @@
  * 3.  Create credit memo.
  * 4. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-48689, MAGETWO-48698
  */
 class CreateOnlineCreditMemoBraintreePaypalTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
index d0071ddd75db0..53847e55fd9f9 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
@@ -8,7 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Braintree\Test\TestCase\CreateOnlineCreditMemoBraintreePaypalTest" summary="Create online credit memo for Braintree credit card" ticketId="MAGETWO-38324">
         <variation name="CreateCreditMemoBraintreePaypalTestVariation1" summary="Full refund of order placed within Braintree PayPal" ticketId="MAGETWO-48689">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
@@ -19,17 +20,16 @@
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
             <data name="paymentAction" xsi:type="string">sale</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
             <data name="data/items_data/0/qty" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
         </variation>
         <variation name="CreateOnlineCreditMemoBraintreePaypalTestVariation2" summary="Partial refund of order placed within Braintree PayPal" ticketId="MAGETWO-48698">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_for_sales</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_for_sales</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
@@ -40,13 +40,12 @@
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
             <data name="data/items_data/0/qty" xsi:type="string">2</data>
             <data name="refundData/items_data/0/qty" xsi:type="string">1</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="isCreditMemoPartial" xsi:type="string">Yes</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
index 395cc0257e9e8..d9f382e4b650e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
@@ -9,7 +9,8 @@
     <testCase name="Magento\Sales\Test\TestCase\CreateOnlineInvoiceEntityTest" summary="Capture for order placed within Braintree Credit Card">
         <variation name="CreateOnlineInvoiceEntityTestBraintreeVariation1" summary="Full capture of order placed within Braintree Credit Card" ticketId="MAGETWO-38319">
             <data name="description" xsi:type="string">Full capture of order placed within Braintree Credit Card</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -28,7 +29,7 @@
             <data name="data/items_data/0/qty" xsi:type="string">-</data>
             <data name="data/form_data/do_shipment" xsi:type="string">No</data>
             <data name="data/form_data/comment_text" xsi:type="string">comments</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
@@ -36,7 +37,7 @@
         </variation>
         <variation name="CreateOnlineInvoiceEntityTestBraintreeVariation2" summary="Partial capture for order placed within Braintree Credit Card" ticketId="MAGETWO-38322">
             <data name="description" xsi:type="string">Partial capture for order placed within Braintree Credit Card</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -57,7 +58,7 @@
             <data name="data/items_data/0/qty" xsi:type="string">1</data>
             <data name="data/form_data/do_shipment" xsi:type="string">No</data>
             <data name="data/form_data/comment_text" xsi:type="string">comments</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
index 9b581ddaa61a7..9614923691c6c 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
@@ -8,8 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CreateOrderBackendTest" summary="Checkout with Braintree Credit Card from Admin">
         <variation name="CreateOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-46294">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -24,18 +26,19 @@
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
             <data name="configData" xsi:type="string">braintree</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
         </variation>
         <variation name="CreateOrderBackendTestBraintreeVariation2" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize and Capture)" ticketId="MAGETWO-38316">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -51,15 +54,14 @@
             <data name="payment/method" xsi:type="string">braintree</data>
             <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
-            <data name="configData" xsi:type="string">braintree_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_sale</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Hold, Ship</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Hold, Ship, Reorder</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.php
new file mode 100644
index 0000000000000..6fde39412d1fe
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Create products.
+ * 4. Create and setup customer.
+ *
+ * Steps:
+ * 1. Log in Storefront.
+ * 2. Add products to the Shopping Cart.
+ * 3. In 'Estimate Shipping and Tax' section specify destination using values from Test Data.
+ * 4. Click the 'Proceed to Checkout' button.
+ * 5. Fill shipping information.
+ * 6. Select shipping method.
+ * 8. Select payment method
+ * 9. Verify order total on review step.
+ * 10. Click 'Continue to PayPal' button.
+ * 11. Click 'Proceed purchase' in popup.
+ * 12. Log in Admin panel.
+ * 13. Open placed order.
+ * 14. Click 'Reorder' button.
+ * 15. Select stored Braintree PayPal token.
+ * 16. Click 'Submit Order'.
+ * 17. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-59259
+ */
+class CreateOrderWithPayPalBraintreeVaultBackendTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+
+    const TEST_TYPE = '3rd_party_test';
+
+    const SEVERITY = 'S0';
+    /* end tags */
+
+    /**
+     * Runs test scenario
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
new file mode 100644
index 0000000000000..03e0ba330fa3b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Braintree\Test\TestCase\CreateOrderWithPayPalBraintreeVaultBackendTest" summary="Checkout with PayPal Braintree Vault token from Admin">
+        <variation name="CreateOrderWithPayPalBraintreeVaultBackendTestVariation1" summary="Checkout with PayPal Braintree Vault token from Admin" ticketId="MAGETWO-59259">
+            <data name="tag" xsi:type="string">est_type:3rd_party_test, severity:S0</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree_paypal</data>
+            <data name="vault/method" xsi:type="string">braintree_paypal_vault</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_use_vault, braintree_paypal_skip_order_review</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">15.00</item>
+            </data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
index 0ae7da744c2f4..c9b26df050cfc 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\CreateVaultOrderBackendTest" summary="Create Order from Admin via Braintree with saving Credit Cards">
         <variation name="CreateVaultOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-47137, MAGETWO-47139">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="saveAddress" xsi:type="string">No</data>
@@ -19,12 +19,13 @@
                 <item name="grandTotal" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="vault/method" xsi:type="string">braintree_cc_vault</data>
             <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
             <data name="creditCardSave" xsi:type="string">Yes</data>
             <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
index 625c24866e31f..062de338d8921 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
@@ -21,15 +21,15 @@
  * 6. Open Invoices tab.
  * 7. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-48614, MAGETWO-48615
  */
 class InvoicePayPalBraintreeTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
index 418eaab55aea1..352e0ed684919 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
@@ -9,7 +9,8 @@
     <testCase name="Magento\Braintree\Test\TestCase\InvoicePayPalBraintreeTest" summary="Capture for order placed within PayPal Braintree">
         <variation name="InvoicePayPalBraintreeTestVariation1" summary="Full capture of order placed within Braintree PayPal" ticketId="MAGETWO-48614">
             <data name="description" xsi:type="string">Full capture of order placed within Braintree PayPal</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_illinois_tax_rule</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
@@ -20,19 +21,19 @@
                 <item name="0" xsi:type="string">139.9</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
             <data name="data/items_data/0/qty" xsi:type="string">-</data>
             <data name="data/form_data/do_shipment" xsi:type="string">No</data>
             <data name="data/form_data/comment_text" xsi:type="string">comments</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
         </variation>
         <variation name="InvoicePayPalBraintreeTestVariation2" summary="Partial capture for order placed within Braintree PayPal" ticketId="MAGETWO-48615">
             <data name="description" xsi:type="string">Partial capture for order placed within Braintree PayPal</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
             <data name="taxRule" xsi:type="string">us_illinois_tax_rule</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
@@ -45,12 +46,12 @@
                 <item name="1" xsi:type="string">108.25</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
             <data name="data/items_data/0/qty" xsi:type="string">1</data>
             <data name="data/form_data/do_shipment" xsi:type="string">No</data>
             <data name="data/form_data/comment_text" xsi:type="string">comments</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
new file mode 100644
index 0000000000000..68d36f3c754cf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Order is placed with Braintree Credit Card from Storefront with Advanced Fraud Protection.
+ *
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Go to Sales > Orders page.
+ * 3. Open the placed order.
+ * 4. Click Accept button.
+ * 5. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-56023
+ */
+class OnePageCheckoutAcceptPaymentTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = 'acceptance_test, 3rd_party_test';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml
new file mode 100644
index 0000000000000..841145d7a5fdf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Braintree\Test\TestCase\OnePageCheckoutAcceptPaymentTest" summary="One page checkout with Braintree payment method.">
+        <variation name="OnePageCheckoutBraintreeAcceptPaymentVariation1" summary="Registered Checkout with Braintree Credit Card with Review Kount status" ticketId="MAGETWO-56023">
+            <data name="products" xsi:type="array">
+                <item name="0" xsi:type="string">catalogProductSimple::product_10_dollar</item>
+            </data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+            <data name="configData" xsi:type="string">braintree,braintree_fraudprotection</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertAcceptPaymentSuccessMessagePresent" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAcceptPaymentMessageInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php
new file mode 100644
index 0000000000000..143ecb5a65d7d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Order is placed with Braintree Credit Card from Storefront with Advanced Fraud Protection.
+ *
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Go to Sales > Orders page.
+ * 3. Open the placed order.
+ * 4. Click Deny button.
+ * 5. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-56024
+ */
+class OnePageCheckoutDenyPaymentTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = 'acceptance_test, 3rd_party_test';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml
new file mode 100644
index 0000000000000..95d07079ef36c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Braintree\Test\TestCase\OnePageCheckoutDenyPaymentTest" summary="One page checkout with Braintree payment method.">
+        <variation name="OnePageCheckoutBraintreeDenyPaymentVariation1" summary="Registered Checkout with Braintree Credit Card with Review Kount status" ticketId="MAGETWO-56024">
+            <data name="products" xsi:type="array">
+                <item name="0" xsi:type="string">catalogProductSimple::product_10_dollar</item>
+            </data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+            <data name="configData" xsi:type="string">braintree,braintree_fraudprotection</data>
+            <data name="status" xsi:type="string">Canceled</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertDenyPaymentSuccessMessagePresent" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertDenyPaymentMessageInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
index 1e6df43a7a8e4..1e9c539c8c0d3 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
@@ -8,7 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Braintree payment method.">
         <variation name="OnePageCheckoutBraintree3dSecureNotTriggeredThresholdTestVariation1" summary="Registered Checkout with Braintree Credit Card from Storefront with 3D Secure verification not triggered due to Threshold Amount" ticketId="MAGETWO-46763">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -23,13 +25,15 @@
             <data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
             <data name="configData" xsi:type="string">braintree, braintree_3d_secure_not_triggered_due_threshold</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
         </variation>
         <variation name="OnePageCheckoutBraintree3dSecureNotTriggeredSpecificCountryTestVariation2" summary="Guest Checkout with Braintree Credit Card from Storefront with 3D Secure verification not triggered due to selected Specific Country" ticketId="MAGETWO-46488">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
@@ -44,13 +48,15 @@
             <data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
             <data name="configData" xsi:type="string">braintree, braintree_3d_secure_uk</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
         </variation>
         <variation name="OnePageCheckoutBraintreeTestVariation3" summary="Checkout with Braintree Credit Card from Storefront (Payment Action = Authorize)" ticketId="MAGETWO-38313">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
@@ -65,14 +71,16 @@
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
             <data name="configData" xsi:type="string">braintree</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
         </variation>
-        <variation name="OnePageCheckoutBraintreeTestVariation4" summary="Checkout with Braintree for payment action Authorize and Capture" ticketId="MAGETWO-38420">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+        <variation name="OnePageCheckoutBraintreeTestVariation4" summary="Checkout with Braintree for payment action Authorize and Capture" ticketId="MAGETWO-59403">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
@@ -88,9 +96,9 @@
             <data name="payment/method" xsi:type="string">braintree</data>
             <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
-            <data name="configData" xsi:type="string">braintree_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_sale</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
index 5b6e254cee011..e4b7d82094db5 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
@@ -21,7 +21,7 @@
  * 2. Add products to the Shopping Cart.
  * 3. Apply discounts in Shopping Cart according to dataset.
  * 4. In 'Estimate Shipping and Tax' section specify destination using values from Test Data.
- * 5. Click the 'Go to Checkout' button.
+ * 5. Click the 'Proceed to Checkout' button.
  * 6. Fill shipping information.
  * 7. Select shipping method.
  * 8. Select payment method (use reward points and store credit if available).
@@ -31,15 +31,15 @@
  * 12. Click 'Submit' to place order.
  * 13. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-46479
  */
 class OnePageCheckoutWith3dSecureTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
index fa4d750e16e90..295a9dcd5c533 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
@@ -9,7 +9,9 @@
     <testCase name="Magento\Braintree\Test\TestCase\OnePageCheckoutWith3dSecureTest" summary="One page check out with Braintree payment method with 3D Secure enabled.">
         <variation name="OnePageCheckoutBraintree3dSecureTestVariation1" summary="Registered Checkout with Braintree Credit Card from Storefront with success 3D Secure verification" ticketId="MAGETWO-46479">
             <data name="description" xsi:type="string">Registered Checkout with Braintree Credit Card from Storefront with success 3D Secure verification</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -29,7 +31,7 @@
             <data name="secure3d/dataset" xsi:type="string">secure3d_braintree</data>
             <data name="configData" xsi:type="string">braintree, braintree_3d_secure</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
index 092a03b78ed8f..a984f666c4356 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
@@ -19,7 +19,7 @@
  * 1. Log in Storefront.
  * 2. Add products to the Shopping Cart.
  * 3. In 'Estimate Shipping and Tax' section specify destination using values from Test Data.
- * 4. Click the 'Go to Checkout' button.
+ * 4. Click the 'Proceed to Checkout' button.
  * 5. Fill shipping information.
  * 6. Select shipping method.
  * 8. Select payment method
@@ -28,7 +28,7 @@
  * 11. Click 'Proceed purchase' in popup.
  * 12. Perform assertions.
  *
- * @group Braintree_(CS)
+ * @group Braintree
  * @ZephyrId MAGETWO-47805
  * @ZephyrId MAGETWO-47810
  */
@@ -36,8 +36,8 @@ class OnePageCheckoutWithBraintreePaypalTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
index fbd2569a18462..7e38e6f0303b6 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\Braintree\Test\TestCase\OnePageCheckoutWithBraintreePaypalTest" summary="One page checkout with Braintree PayPal.">
         <variation name="OnePageCheckoutWithBraintreePaypalTestVariation1" summary="Registered Checkout with Braintree PayPal from Storefront" ticketId="MAGETWO-47805">
             <data name="description" xsi:type="string">Registered Checkout with Braintree PayPal from Storefront</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -19,9 +19,9 @@
                 <item name="grandTotal" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -29,7 +29,7 @@
         </variation>
         <variation name="OnePageCheckoutWithBraintreePaypalTestVariation2" summary="Registered Checkout with Braintree PayPal from Storefront with payment action Authorize and Capture" ticketId="MAGETWO-47810">
             <data name="description" xsi:type="string">Registered Checkout with Braintree PayPal from Storefront with payment action Authorize and Capture</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -42,9 +42,9 @@
                 <item name="0" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">braintree_paypal</data>
-            <data name="configData" xsi:type="string">braintree, braintree_paypal_sale</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml
new file mode 100644
index 0000000000000..23fc729edb99f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\SalesRule\Test\TestCase\OnePageCheckoutWithDiscountTest" summary="Checkout with Braintree credit card on Storefront with discount applied during checkout">
+        <variation name="OnePageCheckoutWithDiscountTestVariation1" summary="Checkout with Braintree credit card on Storefront with discount applied during checkout" ticketId="MAGETWO-55319">
+            <data name="description" xsi:type="string">Use saved for Braintree credit card on checkout</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">10.00</item>
+            </data>
+            <data name="creditCardSave" xsi:type="string">Yes</data>
+            <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
new file mode 100644
index 0000000000000..ad4d5cc06e92e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Vault\Test\TestCase\ReorderUsingVaultTest" summary="Reorder from Admin with saved within Braintree credit card">
+        <variation name="ReorderUsingVaultBraintreeTestVariation1" summary="Reorder from Admin with saved within Braintree credit card for Guest Customer" ticketId="MAGETWO-54870">
+            <data name="description" xsi:type="string">Reorder from Admin with saved within Braintree credit card for Guest Customer</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">15.00</item>
+            </data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="vault/method" xsi:type="string">braintree_cc_vault</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
+            <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
new file mode 100644
index 0000000000000..8845f2a78629d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Create products.
+ * 4. Create and setup customer.
+ *
+ * Steps:
+ * 1. Go to Storefront as registered customer.
+ * 2. Add products to the cart.
+ * 3. Click the *Proceed to Checkout* button.
+ * 4. Select shipping method.
+ * 5. Select payment method (use reward points and store credit if available).
+ * 6. Select *Save for later use* checkbox.
+ * 7. Click *Continue to PayPal* button.
+ * 8. Click *Proceed with Sandbox Purchase* button.
+ * 9. Click Place Order button.
+ * 8. Add products to the cart.
+ * 9. Click the *Proceed to Checkout* button.
+ * 10. Select shipping method.
+ * 11. Select PayPal payer account as a payment.
+ * 12. Click Place Order button.
+ * 13. Go to *My Account > Stored Payment Methods* section.
+ * 14. Click *Delete* link next to stored PayPal payer account.
+ * 15. Click *Delete* button on appeared pop up.
+ * 16. Perform assertions. *
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-54838, MAGETWO-54843, MAGETWO-54844"
+ */
+class SaveUseDeleteVaultForPaypalBraintreeTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S0';
+    /* end tags */
+
+    /**
+     * Saves vault for PayPal Braintree on checkout, uses it during checkout, deletes it from My Account.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml
new file mode 100644
index 0000000000000..c7a5182a1dfb3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Braintree\Test\TestCase\SaveUseDeleteVaultForPaypalBraintreeTest" summary="Saves vault for PayPal Braintree on checkout, uses it during checkout, deletes it from My Account">
+        <variation name="SaveUseDeleteVaultForPaypalBraintreeTestVariation1" summary="Saves vault for PayPal Braintree on checkout, uses it during checkout, deletes it from My Account" ticketId="MAGETWO-54838, MAGETWO-54843, MAGETWO-54844">
+            <data name="description" xsi:type="string">Use saved for Braintree credit card on checkout</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">15.00</item>
+            </data>
+            <data name="payment/method" xsi:type="string">braintree_paypal</data>
+            <data name="vault/method" xsi:type="string">braintree_paypal_vault</data>
+            <data name="creditCardSave" xsi:type="string">Yes</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_use_vault</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+            <constraint name="Magento\Vault\Test\Constraint\AssertStoredPaymentDeletedMessage" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
index cfe2e5f51b18e..35d55784b6762 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
@@ -9,20 +9,21 @@
     <testCase name="Magento\Vault\Test\TestCase\UseVaultOnCheckoutTest" summary="Use saved for Braintree credit card on checkout.">
         <variation name="UseVaultOnCheckoutBraintreeTestVariation1" summary="Use saved for Braintree credit card on checkout" ticketId="MAGETWO-46530, MAGETWO-38382">
             <data name="description" xsi:type="string">Use saved for Braintree credit card on checkout</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="vault/method" xsi:type="string">braintree_cc_vault</data>
             <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
             <data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
             <data name="creditCardSave" xsi:type="string">Yes</data>
             <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
new file mode 100644
index 0000000000000..d2723a300285d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Create products.
+ * 4. Create and setup customer.
+ * 5. Configure taxes.
+ *
+ * Steps:
+ * 1. Log in Storefront.
+ * 2. Add products to the cart.
+ * 3. Click the 'Proceed to Checkout' button.
+ * 4. Select shipping method.
+ * 5. Select payment method (use reward points and store credit if available).
+ * 6. Enter credit card data and select *Save credit card* checkbox.
+ * 7. Click Place Order button.
+ * 8. Specify password in 3D Secure popup.
+ * 9. Click 'Submit' to place order.
+ * 10. Add products to the cart.
+ * 11. Click the 'Proceed to Checkout' button.
+ * 12. Select shipping method.
+ * 13. Select saved credit card as a payment.
+ * 14. Click Place Order button.
+ * 15. Specify password in 3D Secure popup.
+ * 16. Click 'Submit' to place order.
+ * 17. Perform assertions.
+ *
+ * @group One_Page_Checkout
+ * @ZephyrId MAGETWO-55310
+ */
+class UseVaultWith3dSecureOnCheckoutTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml
new file mode 100644
index 0000000000000..a5aa7645148e1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Braintree\Test\TestCase\UseVaultWith3dSecureOnCheckoutTest" summary="Use saved for Braintree Credit card with 3D secure enabled.">
+        <variation name="UseVaultWith3dSecureOnCheckoutTestVariation1" summary="Use saved for Braintree credit card on checkout with 3D Secure" ticketId="MAGETWO-55310">
+            <data name="description" xsi:type="string">Use saved for Braintree credit card on checkout</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="vault/method" xsi:type="string">braintree_cc_vault</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
+            <data name="paymentInformation" xsi:type="array">
+                <item name="Liability Shifted" xsi:type="string">1</item>
+                <item name="Liability Shift Possible" xsi:type="string">1</item>
+            </data>
+            <data name="secure3d/dataset" xsi:type="string">secure3d_braintree</data>
+            <data name="creditCardSave" xsi:type="string">Yes</data>
+            <data name="configData" xsi:type="string">braintree, braintree_use_vault, braintree_3d_secure</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
+            <constraint name="Magento\Braintree\Test\Constraint\Assert3dSecureInfoIsPresent" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php
new file mode 100644
index 0000000000000..6565652f604cb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Class AcceptPaymentStep
+ */
+class AcceptPaymentStep implements TestStepInterface
+{
+    /**
+     * @var OrderIndex
+     */
+    private $orderIndex;
+
+    /**
+     * @var SalesOrderView
+     */
+    private $salesOrderView;
+
+    /**
+     * @var OrderInjectable
+     */
+    private $order;
+
+    public function __construct(OrderIndex $orderIndex, SalesOrderView $salesOrderView, OrderInjectable $order)
+    {
+        $this->orderIndex = $orderIndex;
+        $this->salesOrderView = $salesOrderView;
+        $this->order = $order;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->orderIndex->open();
+        $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
+        $this->salesOrderView->getPageActions()->accept();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php
new file mode 100644
index 0000000000000..346a7e8e7e4f4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
+
+/**
+ * Class ChangeOrderStatusToPaymentReviewStep
+ *
+ * This step changes order status via WEB API to "Payment Review", because Kount service always
+ * return "Review" status for sandbox transactions.
+ */
+class ChangeOrderStatusToPaymentReviewStep implements TestStepInterface
+{
+    /**
+     * @var string
+     */
+    private $orderId;
+
+    /**
+     * @var WebapiDecorator
+     */
+    private $webApi;
+
+    /**
+     * ChangeOrderStatusToPaymentReviewStep constructor.
+     * @param $orderId
+     * @param WebapiDecorator $webApi
+     */
+    public function __construct($orderId, WebapiDecorator $webApi)
+    {
+        $this->orderId = $orderId;
+        $this->webApi = $webApi;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $order = $this->getOrder($this->orderId);
+        $order['state'] = 'payment_review';
+        $order['status'] = 'fraud';
+        $this->saveOrder($order);
+    }
+
+    /**
+     * Get order by increment id
+     * @param string $incrementId
+     * @return array
+     */
+    private function getOrder($incrementId)
+    {
+        $url = $_ENV['app_frontend_url'] . 'rest/V1/orders/';
+        $url .= '?searchCriteria[filterGroups][0][filters][0][field]=increment_id';
+        $url .= '&searchCriteria[filterGroups][0][filters][0][value]=' . $incrementId;
+        $this->webApi->write($url, [], WebapiDecorator::GET);
+        $response = json_decode($this->webApi->read(), true);
+        $this->webApi->close();
+        return $response['items'][0];
+    }
+
+    /**
+     * Update order entity
+     * @param array $order
+     * @throws \Exception
+     */
+    private function saveOrder(array $order)
+    {
+        $url = $_ENV['app_frontend_url'] . 'rest/V1/orders';
+        // web api doesn't allow to save payment additional information
+        unset($order['payment']['additional_information']);
+        $this->webApi->write($url, ['entity' => $order], WebapiDecorator::POST);
+        $response = json_decode($this->webApi->read(), true);
+        $this->webApi->close();
+        if (empty($response['entity_id'])) {
+            throw new \Exception('Couldn\'t update order details');
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php
new file mode 100644
index 0000000000000..e09d77be976ed
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check configuration of Braintree payment method.
+ */
+class CheckBraintreeConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Braintree\Test\Block\System\Config\Braintree
+     */
+    private $braintreeConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->braintreeConfigBlock = $this->systemConfigEditSectionPayment->getBraintreeConfigBlock();
+    }
+
+    /**
+     * Run step for checking Braintree configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enableBraintree();
+        $this->disableBraintree();
+    }
+
+    /**
+     * Enables Braintree and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enableBraintree()
+    {
+        $this->braintreeConfigBlock->clickConfigureButton();
+        $this->braintreeConfigBlock->clearCredentials();
+        $enablers = $this->braintreeConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->braintreeConfigBlock->specifyCredentials();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->braintreeConfigBlock->enableBraintree();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Express Checkout and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disableBraintree()
+    {
+        $enablers = $this->braintreeConfigBlock->getEnablerFields();
+        $this->braintreeConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution']]
+        );
+        $this->braintreeConfigBlock->disableBraintree();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ContinueToPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ContinueToPaypalStep.php
new file mode 100644
index 0000000000000..44bb95f5d62ed
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ContinueToPaypalStep.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Proceeds with checkout on PayPal side.
+ */
+class ContinueToPaypalStep implements TestStepInterface
+{
+    /**
+     * @var CheckoutOnepage
+     */
+    private $checkoutOnepage;
+
+    /**
+     * @param CheckoutOnepage $checkoutOnepage
+     */
+    public function __construct(
+        CheckoutOnepage $checkoutOnepage
+    ) {
+        $this->checkoutOnepage = $checkoutOnepage;
+    }
+
+    /**
+     * Clicks Continue to PayPal button, proceeds with checkout on PayPal side.
+     */
+    public function run()
+    {
+        $parentWindow = $this->checkoutOnepage->getPaymentBlock()
+            ->getSelectedPaymentMethodBlock()
+            ->clickContinueToPaypal();
+        $this->checkoutOnepage->getBraintreePaypalBlock()->process($parentWindow);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php
index 61455ceaac4fd..085fc142a3373 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php
@@ -6,15 +6,13 @@
 
 namespace Magento\Braintree\Test\TestStep;
 
-use Magento\Config\Test\Fixture\ConfigData;
 use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceView;
 use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
-use Magento\Mtf\TestStep\TestStepInterface;
-use Braintree\Gateway;
 
 /**
  * Create credit memo for order placed via Braintree credit card payment method.
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php
new file mode 100644
index 0000000000000..13dc942be95d3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\TestStep;
+
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Class DenyPaymentStep
+ */
+class DenyPaymentStep implements TestStepInterface
+{
+    /**
+     * @var OrderIndex
+     */
+    private $orderIndex;
+
+    /**
+     * @var SalesOrderView
+     */
+    private $salesOrderView;
+
+    /**
+     * @var OrderInjectable
+     */
+    private $order;
+
+    public function __construct(OrderIndex $orderIndex, SalesOrderView $salesOrderView, OrderInjectable $order)
+    {
+        $this->orderIndex = $orderIndex;
+        $this->salesOrderView = $salesOrderView;
+        $this->order = $order;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->orderIndex->open();
+        $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
+        $this->salesOrderView->getPageActions()->deny();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
index 930105fc2dc2d..0ff7f164b0996 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
@@ -80,7 +80,7 @@ public function run()
         }
         $parentWindow = $this->checkoutOnepage->getPaymentBlock()
             ->getSelectedPaymentMethodBlock()
-            ->clickContinueToPaypal();
+            ->clickPayWithPaypal();
         $this->checkoutOnepage->getBraintreePaypalBlock()->process($parentWindow);
         
         $order = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
index be2d771e47f5b..7bdfca2f713f2 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
@@ -8,12 +8,12 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Braintree\Test\Constraint\Assert3dSecureInfoIsPresent">
         <arguments>
-            <argument name="severity" xsi:type="string">high</argument>
+            <argument name="severity" xsi:type="string">S1</argument>
         </arguments>
     </type>
     <type name="Magento\Braintree\Test\Constraint\AssertTransactionIsPresentInSettlementReport">
         <arguments>
-            <argument name="severity" xsi:type="string">high</argument>
+            <argument name="severity" xsi:type="string">S1</argument>
         </arguments>
     </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
index cf1ae3bf474ae..495f455c43a72 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml
@@ -21,6 +21,27 @@
         <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWith3dSecure" />
         <step name="placeOrderWith3dSecure" module="Magento_Braintree" />
     </scenario>
+    <scenario name="UseVaultWith3dSecureOnCheckoutTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="saveCreditCard" />
+        <step name="saveCreditCard" module="Magento_Vault" next="fillBillingInformation" />
+        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWith3dSecure" />
+        <step name="placeOrderWith3dSecure" module="Magento_Braintree" next="addProductsToTheCartVault" />
+        <step name="addProductsToTheCartVault" alias="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTaxVault" />
+        <step name="estimateShippingAndTaxVault" alias="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckoutVault" />
+        <step name="clickProceedToCheckoutVault" alias="clickProceedToCheckout" module="Magento_Checkout" next="fillShippingMethodVault" />
+        <step name="fillShippingMethodVault" alias="fillShippingMethod" module="Magento_Checkout" next="useSavedPaymentMethod" />
+        <step name="useSavedPaymentMethod" module="Magento_Vault" next="placeOrder3dSecureVault" />
+        <step name="placeOrder3dSecureVault" alias="placeOrderWith3dSecure" module="Magento_Braintree" />
+    </scenario>
     <scenario name="OnePageCheckoutWithBraintreePaypalTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
         <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
@@ -88,4 +109,70 @@
         <step name="createInvoice" module="Magento_Sales" next="createBraintreeCreditMemo" />
         <step name="createBraintreeCreditMemo" module="Magento_Braintree" />
     </scenario>
+    <scenario name="SaveUseDeleteVaultForPaypalBraintreeTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="continueToPaypal" />
+        <step name="continueToPaypal" module="Magento_Braintree" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="addProductsToTheCartVault" />
+        <step name="addProductsToTheCartVault" alias="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTaxVault" />
+        <step name="estimateShippingAndTaxVault" alias="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckoutVault" />
+        <step name="clickProceedToCheckoutVault" alias="clickProceedToCheckout" module="Magento_Checkout" next="fillShippingMethodVault" />
+        <step name="fillShippingMethodVault" alias="fillShippingMethod" module="Magento_Checkout" next="useSavedPaymentMethod" />
+        <step name="useSavedPaymentMethod" module="Magento_Vault" next="placeOrderVault" />
+        <step name="placeOrderVault" alias="placeOrder" module="Magento_Checkout" next="deleteStoredPayment" />
+        <step name="deleteStoredPayment" module="Magento_Vault" />
+    </scenario>
+    <scenario name="OnePageCheckoutAcceptPaymentTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
+        <step name="proceedToCheckout" module="Magento_Checkout" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="changeOrderStatusToPaymentReview" />
+        <step name="changeOrderStatusToPaymentReview" module="Magento_Braintree" next="acceptPayment" />
+        <step name="acceptPayment" module="Magento_Braintree" />
+    </scenario>
+    <scenario name="OnePageCheckoutDenyPaymentTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
+        <step name="proceedToCheckout" module="Magento_Checkout" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="changeOrderStatusToPaymentReview" />
+        <step name="changeOrderStatusToPaymentReview" module="Magento_Braintree" next="denyPayment" />
+        <step name="denyPayment" module="Magento_Braintree" />
+    </scenario>
+    <scenario name="CreateOrderWithPayPalBraintreeVaultBackendTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrderWithPaypal" />
+        <step name="placeOrderWithPaypal" module="Magento_Braintree" next="openOrder"/>
+        <step name="openOrder" module="Magento_Sales" next="reorder" />
+        <step name="reorder" module="Magento_Sales" next="useVaultPaymentToken" />
+        <step name="useVaultPaymentToken" module="Magento_Vault" next="submitOrder" />
+        <step name="submitOrder" module="Magento_Sales" />
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
index fedd7dd7677fe..b1386feae3f00 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
@@ -112,8 +112,11 @@ public function openMiniCart()
      */
     public function clickBraintreePaypalButton()
     {
-        $this->_rootElement->find($this->braintreePaypalCheckoutButton, Locator::SELECTOR_XPATH)
-            ->click();
+        $button = $this->_rootElement->find($this->braintreePaypalCheckoutButton, Locator::SELECTOR_XPATH);
+        $this->browser->waitUntil(function () use ($button) {
+            return !$button->isDisabled() ?: null;
+        });
+        $button->click();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
index 0d6851aa8c8b4..cad6dda904598 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
@@ -85,6 +85,7 @@ public function selectPaymentMethod(array $payment, InjectableFixture $creditCar
         $paymentLabelSelector = sprintf($this->paymentMethodLabel, $payment['method']);
 
         try {
+            $this->waitForElementNotVisible($this->waitElement);
             $this->waitForElementVisible($paymentLabelSelector);
         } catch (\Exception $exception) {
             throw new \Exception('Such payment method is absent.');
@@ -120,7 +121,7 @@ public function getSelectedPaymentMethodBlock()
         $element = $this->_rootElement->find($this->activePaymentMethodSelector);
 
         return $this->blockFactory->create(
-            '\Magento\Checkout\Test\Block\Onepage\Payment\Method',
+            \Magento\Checkout\Test\Block\Onepage\Payment\Method::class,
             ['element' => $element]
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/DiscountCodes.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/DiscountCodes.php
new file mode 100644
index 0000000000000..88a6f45125a7b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/DiscountCodes.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Block\Onepage\Payment;
+
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Class DiscountCodes
+ * Discount codes block
+ */
+class DiscountCodes extends Form
+{
+    /**
+     * Form wrapper selector
+     *
+     * @var string
+     */
+    protected $formWrapper = '.content';
+
+    /**
+     * Open discount codes form selector
+     *
+     * @var string
+     */
+    protected $openForm = '.payment-option-title';
+
+    /**
+     * Fill discount code input selector
+     *
+     * @var string
+     */
+    protected $couponCode = '#discount-code';
+
+    /**
+     * Click apply button selector
+     *
+     * @var string
+     */
+    protected $applyButton = '.action.action-apply';
+
+    /**
+     * Enter discount code and click apply button
+     *
+     * @param string $code
+     * @return void
+     */
+    public function applyCouponCode($code)
+    {
+        $this->_rootElement->find($this->openForm, Locator::SELECTOR_CSS)->click();
+        $this->_rootElement->find($this->couponCode, Locator::SELECTOR_CSS)->setValue($code);
+        $this->_rootElement->find($this->applyButton, Locator::SELECTOR_CSS)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
index 6e59dc048b9bc..50f6a3d8aa5db 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php
@@ -40,7 +40,7 @@ class Method extends Block
      *
      * @var string
      */
-    protected $vaultCheckbox = '#%s_vault_enabler';
+    protected $vaultCheckbox = '#%s_enable_vault';
 
     /**
      * PayPal load spinner.
@@ -49,6 +49,20 @@ class Method extends Block
      */
     protected $preloaderSpinner = '#preloaderSpinner';
 
+    /**
+     * Continue to PayPal button for Braintree.
+     *
+     * @var string
+     */
+    protected $continueToBraintreePaypalButton = '#braintree_paypal_continue_to';
+
+    /**
+     * Pay with Paypal button for Braintree.
+     *
+     * @var string
+     */
+    protected $payWithBraintreePaypalButton = '#braintree_paypal_pay_with';
+
     /**
      * Wait for PayPal page is loaded.
      *
@@ -78,7 +92,22 @@ public function clickPlaceOrder()
     public function clickContinueToPaypal()
     {
         $currentWindow = $this->browser->getCurrentWindow();
-        $this->_rootElement->find($this->placeOrderButton)->click();
+        $this->waitForElementNotVisible($this->waitElement);
+        $this->_rootElement->find($this->continueToBraintreePaypalButton)->click();
+        $this->waitForElementNotVisible($this->waitElement);
+        return $currentWindow;
+    }
+
+    /**
+     * Click Pay with Paypal button.
+     *
+     * @return string
+     */
+    public function clickPayWithPaypal()
+    {
+        $currentWindow = $this->browser->getCurrentWindow();
+        $this->waitForElementNotVisible($this->waitElement);
+        $this->_rootElement->find($this->payWithBraintreePaypalButton)->click();
         $this->waitForElementNotVisible($this->waitElement);
         return $currentWindow;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
index 60235d508b387..0bf31562dfb1e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
@@ -11,6 +11,7 @@
         <block name="shippingBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping" locator="#checkout-step-shipping" strategy="css selector" />
         <block name="shippingMethodBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping\Method" locator="#checkout-step-shipping_method" strategy="css selector" />
         <block name="paymentBlock" class="Magento\Checkout\Test\Block\Onepage\Payment" locator="#checkout-step-payment" strategy="css selector" />
+        <block name="discountCodesBlock" class="Magento\Checkout\Test\Block\Onepage\Payment\DiscountCodes" locator=".discount-code" strategy="css selector" />
         <block name="reviewBlock" class="Magento\Checkout\Test\Block\Onepage\Review" locator=".opc-block-summary" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
     </page>
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php
new file mode 100644
index 0000000000000..2b1d9bdcf2df8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Payment\Test\Repository\CreditCardAdmin;
+use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
+
+/**
+ * Class AssertCardRequiredFields
+ *
+ * Assert that fields are active.
+ */
+class AssertCardRequiredFields extends AbstractConstraint
+{
+    /**
+     * Expected required field message.
+     */
+    const REQUIRE_MESSAGE = 'This is a required field.';
+
+    /**
+     * Expected required valid number message.
+     */
+    const VALID_NUMBER_MESSAGE = 'Please enter a valid number in this field.';
+
+    /**
+     * Assert required fields on credit card payment method in backend.
+     * @param OrderCreateIndex $orderCreateIndex
+     * @param CreditCardAdmin $creditCard
+     * @return void
+     */
+    public function processAssert(OrderCreateIndex $orderCreateIndex, CreditCardAdmin $creditCard)
+    {
+        $actualRequiredFields = $orderCreateIndex->getCreateBlock()->getBillingMethodBlock()
+            ->getJsErrors();
+        $creditCardEmpty = $creditCard->get('visa_empty');
+        foreach (array_keys($creditCardEmpty) as $field) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                isset($actualRequiredFields[$field]),
+                "Field '$field' is not highlighted with an JS error."
+            );
+            $expected = self::REQUIRE_MESSAGE;
+            if (in_array($field, ['cc_number', 'cc_cid'])) {
+                $expected = self::VALID_NUMBER_MESSAGE;
+            }
+            \PHPUnit_Framework_Assert::assertEquals(
+                $expected,
+                $actualRequiredFields[$field],
+                "Field '$field' is not highlighted as required."
+            );
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'All required fields on customer form are highlighted.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php
new file mode 100644
index 0000000000000..c1bcb2991dd1e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+
+/**
+ * Class AssertFieldsAreActive
+ *
+ * Assert that fields are active.
+ */
+class AssertFieldsAreActive extends AbstractConstraint
+{
+    /**
+     * Assert that fields are active.
+     *
+     * @param array $fieldIds
+     * @return void
+     */
+    public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
+    {
+        foreach ($fieldIds as $fieldId) {
+            \PHPUnit_Framework_Assert::assertFalse(
+                $configEditSectionPayment->getPaymentsConfigBlock()->isFieldDisabled($fieldId),
+                'Field is disabled.'
+            );
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Field is active.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php
new file mode 100644
index 0000000000000..59cb12d580c7d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+
+/**
+ * Class AssertFieldsAreDisabled
+ *
+ * Assert that field are inactive.
+ */
+class AssertFieldsAreDisabled extends AbstractConstraint
+{
+    /**
+     * Assert that field are disabled.
+     *
+     * @param array $fieldIds
+     * @return void
+     */
+    public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
+    {
+        foreach ($fieldIds as $fieldId) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                $configEditSectionPayment->getPaymentsConfigBlock()->isFieldDisabled($fieldId),
+                'Field is active.'
+            );
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Field is disabled.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php
new file mode 100644
index 0000000000000..31e9cd6924a8a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+
+/**
+ * Class AssertFieldsAreEnabled
+ *
+ * Assert that fields are enabled.
+ */
+class AssertFieldsAreEnabled extends AbstractConstraint
+{
+    /**
+     * Assert that field is present.
+     *
+     * @param array $fieldIds
+     * @return void
+     */
+    public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
+    {
+        foreach ($fieldIds as $fieldId) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                $configEditSectionPayment->getPaymentsConfigBlock()->isFieldEnabled($fieldId),
+                'Field is active.'
+            );
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Field is disabled.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php
new file mode 100644
index 0000000000000..0491b2df124d1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+
+/**
+ * Class AssertFieldsArePresent
+ *
+ * Assert that fields are present
+ */
+class AssertFieldsArePresent extends AbstractConstraint
+{
+    /**
+     * Assert that field is present.
+     *
+     * @param array $fieldIds
+     * @return void
+     */
+    public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
+    {
+        foreach ($fieldIds as $fieldId) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                $configEditSectionPayment->getPaymentsConfigBlock()->isFieldPresent($fieldId),
+                'Field is active.'
+            );
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Field is disabled.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCardAdmin.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCardAdmin.xml
index 1109b70eec7cc..371c8f350c6af 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCardAdmin.xml
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCardAdmin.xml
@@ -22,5 +22,11 @@
             <field name="cc_exp_year" xsi:type="string">2020</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
+        <dataset name="visa_empty">
+            <field name="cc_type" xsi:type="string">Please Select</field>
+            <field name="cc_number" xsi:type="string" />
+            <field name="cc_exp_month" xsi:type="string">Month</field>
+            <field name="cc_cid" xsi:type="string" />
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php
new file mode 100644
index 0000000000000..b1c2d71a43bdd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Tests conflict resolution for payments configuration.
+ * Class ConflictResolutionTest
+ */
+class ConflictResolutionTest extends Scenario
+{
+    /* tags */
+    const MVP = 'no';
+    const TEST_TYPE = '3rd_party_test';
+    /* end tags */
+
+    /**
+     * Runs test that verifies conflict resolution for payments configuration.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml
new file mode 100644
index 0000000000000..dc2ba760025fb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Payment\Test\TestCase\ConflictResolutionTest" summary="Conflict resolution for US"
+              ticketId="MAGETWO-55707, MAGETWO-38531">
+        <variation name="ConflictResolutionTestVariation1">
+            <data name="countryCode" xsi:type="string">US</data>
+            <data name="sections" xsi:type="array">
+                <item name="recommended_solutions" xsi:type="array">
+                    <item name="PayPal Express Checkout" xsi:type="string">PayPal Express Checkout</item>
+                    <item name="Braintree" xsi:type="string">Braintree</item>
+                </item>
+                <item name="other_paypal_payment_solutions" xsi:type="array">
+                    <item name="paypal_group_all_in_one" xsi:type="array">
+                        <item name="Payments Advanced (Includes Express Checkout)" xsi:type="string">Payments Advanced
+                            (Includes Express Checkout)
+                        </item>
+                        <item name="Payments Pro (Includes Express Checkout)" xsi:type="string">Payments Pro (Includes
+                            Express Checkout)
+                        </item>
+                        <item name="Payments Standard" xsi:type="string">Payments Standard</item>
+                    </item>
+                    <item name="paypal_payment_gateways" xsi:type="array">
+                        <item name="Payflow Pro (Includes Express Checkout)" xsi:type="string"/>
+                        <item name="Payflow Link (Includes Express Checkout)" xsi:type="string"/>
+                    </item>
+                </item>
+                <item name="other_payment_methods" xsi:type="array">
+                    <item name="Check / Money Order" xsi:type="string"/>
+                    <item name="Bank Transfer Payment" xsi:type="string"/>
+                    <item name="Cash On Delivery Payment" xsi:type="string"/>
+                    <item name="Zero Subtotal Checkout" xsi:type="string"/>
+                    <item name="Purchase Order" xsi:type="string"/>
+                    <item name="Authorize.net Direct Post" xsi:type="string"/>
+                </item>
+            </data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/Express/Review.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/Express/Review.php
index cf3ef9a53d751..d51d5c4e39f3a 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/Express/Review.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/Express/Review.php
@@ -32,10 +32,9 @@ public function selectShippingMethod(array $shippingMethod)
         $shippingElement = $this->_rootElement->find(
             $this->shippingMethod,
             Locator::SELECTOR_CSS,
-            'Magento\Paypal\Test\Block\Express\Review\ShippingoptgroupElement'
+            \Magento\Paypal\Test\Block\Express\Review\ShippingoptgroupElement::class
         );
         $shippingElement->setValue($shippingMethod['shipping_service'] . '/' . $shippingMethod['shipping_method']);
-        $this->waitForElementVisible('#review-please-wait');
         $this->waitForElementNotVisible('#review-please-wait');
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php
new file mode 100644
index 0000000000000..6e48496695688
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Express Checkout payment method.
+ */
+class ExpressCheckout extends Block
+{
+    /**
+     * PayPal Express Checkout credentials fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'API Username' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
+            'required_express_checkout_required_express_checkout_api_username',
+        'API Password' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
+            'required_express_checkout_required_express_checkout_api_password',
+        'API Signature' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
+            'required_express_checkout_required_express_checkout_api_signature',
+        'Merchant Account ID' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' .
+            'checkout_required_merchant_id',
+        'Sort Order PayPal Credit' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' .
+            'checkout_required_express_checkout_bml_sort_order',
+    ];
+
+    /**
+     * PayPal Express Checkout enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable this Solution' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' .
+        'checkout_required_enable_express_checkout',
+        'Enable In-Context Checkout Experience' => '#payment_us_paypal_alternative_payment_methods_express_checkout_' .
+            'us_express_checkout_required_enable_in_context_checkout',
+        'Enable PayPal Credit' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' .
+            'checkout_required_enable_express_checkout_bml'
+    ];
+
+    /**
+     * PayPal Express Checkout 'Configure' button selector.
+     *
+     * @var string
+     */
+    private $configureExpressButton = '#payment_us_paypal_alternative_payment_methods_express_checkout_us-head';
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     *  Specify credentials in PayPal Express Checkout configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['API Username'])->setValue('1');
+        $this->_rootElement->find($this->fields['API Password'])->setValue('1');
+        $this->_rootElement->find($this->fields['API Signature'])->setValue('1');
+    }
+
+    /**
+     *  Set fields for credentials empty in PayPal Express Checkout configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['API Username'])->setValue('');
+        $this->_rootElement->find($this->fields['API Password'])->setValue('');
+        $this->_rootElement->find($this->fields['API Signature'])->setValue('');
+    }
+
+    /**
+     *  Specify Merchant Account ID in PayPal Express Checkout configuration.
+     *
+     * @return void
+     */
+    public function specifyMerchantAccountId()
+    {
+        $this->_rootElement->find($this->fields['Merchant Account ID'])->setValue('1');
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand PayPal Express Checkout configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configureExpressButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enableExpressCheckout()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disableExpressCheckout()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php
new file mode 100644
index 0000000000000..f1af6acb6174e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Payflow Link payment method.
+ */
+class PayflowLink extends Block
+{
+    /**
+     * Payflow Link credentials fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'Partner' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
+            'link_partner',
+        'Vendor' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
+            'link_vendor',
+        'User' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
+            'link_user',
+        'Password' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow' .
+            '_link_pwd'
+    ];
+
+    /**
+     * Payflow Link enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable Payflow Link' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_enable_' .
+        'payflow_link',
+        'Enable Express Checkout' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_' .
+            'enable_express_checkout',
+        'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_enable_' .
+            'express_checkout_bml'
+    ];
+
+    /**
+     * Payflow Link 'Configure' button selector.
+     *
+     * @var string
+     */
+    private $configurePayflowLinkButton = '#payment_us_paypal_payment_gateways_payflow_link_us-head';
+
+    /**
+     *  Specify credentials in PayPal Payflow Link configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('1');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('1');
+        $this->_rootElement->find($this->fields['User'])->setValue('1');
+        $this->_rootElement->find($this->fields['Password'])->setValue('1');
+    }
+
+    /**
+     *  Set fields for credentials empty in PayPal Payflow Link configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('');
+        $this->_rootElement->find($this->fields['User'])->setValue('');
+        $this->_rootElement->find($this->fields['Password'])->setValue('');
+    }
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand PayPal Payflow Link configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configurePayflowLinkButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enablePayflowLink()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable Payflow Link'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disablePayflowLink()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable Payflow Link'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
new file mode 100644
index 0000000000000..1db07ac435a37
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Payflow Pro payment method.
+ */
+class PayflowPro extends Block
+{
+    /**
+     * Payflow Pro credentials fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'Partner' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
+            'required_paypal_payflow_api_settings_partner',
+        'Vendor' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
+            'required_paypal_payflow_api_settings_vendor',
+        'User' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
+            'required_paypal_payflow_api_settings_user',
+        'Password' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
+            'required_paypal_payflow_api_settings_pwd'
+    ];
+
+    /**
+     * Payflow Pro enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable this Solution' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' .
+            '_payflow_required_enable_paypal_payflow',
+        'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' .
+            '_payflow_required_enable_express_checkout_bml_payflow',
+        'Vault Enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' .
+            'payflow_required_payflowpro_cc_vault_active'
+    ];
+
+    /**
+     * Payflow Pro 'Configure' button selector.
+     *
+     * @var string
+     */
+    private $configureProButton = '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout-head';
+
+    /**
+     *  Specify credentials in PayPal Payflow Pro configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('1');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('1');
+        $this->_rootElement->find($this->fields['User'])->setValue('1');
+        $this->_rootElement->find($this->fields['Password'])->setValue('1');
+    }
+
+    /**
+     *  Set fields for credentials empty in PayPal Payflow Pro configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('');
+        $this->_rootElement->find($this->fields['User'])->setValue('');
+        $this->_rootElement->find($this->fields['Password'])->setValue('');
+    }
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand PayPal Payflow Pro configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configureProButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enablePayflowPro()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disablePayflowPro()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php
new file mode 100644
index 0000000000000..87adb729a1646
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Payments Advanced payment method.
+ */
+class PaymentsAdvanced extends Block
+{
+    /**
+     * Payments Advanced credentials fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'Partner' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner',
+        'Vendor' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor',
+        'User' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user',
+        'Password' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_pwd'
+    ];
+
+    /**
+     * Payments Advanced enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable this Solution' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_enable_' .
+        'payflow_advanced',
+        'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_enable_' .
+            'express_checkout_bml'
+    ];
+
+    /**
+     * Payments Advanced 'Configure' button selector.
+     *
+     * @var string
+     */
+    private $configureAdvancedButton = '#payment_us_paypal_group_all_in_one_payflow_advanced-head';
+
+    /**
+     *  Specify credentials in PayPal Payments Advanced configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('1');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('1');
+        $this->_rootElement->find($this->fields['User'])->setValue('1');
+        $this->_rootElement->find($this->fields['Password'])->setValue('1');
+    }
+
+    /**
+     *  Set fields for credentials empty in PayPal Payments Advanced configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('');
+        $this->_rootElement->find($this->fields['User'])->setValue('');
+        $this->_rootElement->find($this->fields['Password'])->setValue('');
+    }
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand PayPal Payments Advanced configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configureAdvancedButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enablePaymentsAdvanced()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disablePaymentsAdvanced()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
new file mode 100644
index 0000000000000..55fd7444ba50a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Configuration for Payments Pro payment method.
+ */
+class PaymentsPro extends Block
+{
+    /**
+     * Payments Pro enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $fields = [
+        'Partner' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
+            'settings_partner',
+        'Vendor' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
+            'settings_vendor',
+        'User' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_settings' .
+            '_user',
+        'Password' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
+            'settings_pwd'
+    ];
+
+    /**
+     * Payments Pro enablers fields sectors array.
+     *
+     * @var array
+     */
+    private $enablers = [
+        'Enable this Solution' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_paypal' .
+            '_payflow',
+        'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_' .
+            'express_checkout_bml_payflow',
+        'Vault Enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' .
+            '_active'
+    ];
+
+    /**
+     * Payments Pro 'Configure' button selector.
+     *
+     * @var string
+     */
+    private $configureProButton = '#payment_us_paypal_group_all_in_one_wpp_usuk-head';
+
+    /**
+     *  Specify credentials in PayPal Payments Pro configuration.
+     *
+     * @return void
+     */
+    public function specifyCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('1');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('1');
+        $this->_rootElement->find($this->fields['User'])->setValue('1');
+        $this->_rootElement->find($this->fields['Password'])->setValue('1');
+    }
+
+    /**
+     *  Set fields for credentials empty in PayPal Payments Pro configuration.
+     *
+     * @return void
+     */
+    public function clearCredentials()
+    {
+        $this->_rootElement->find($this->fields['Partner'])->setValue('');
+        $this->_rootElement->find($this->fields['Vendor'])->setValue('');
+        $this->_rootElement->find($this->fields['User'])->setValue('');
+        $this->_rootElement->find($this->fields['Password'])->setValue('');
+    }
+
+    /**
+     * Return credentials fields selectors.
+     *
+     * @return array
+     */
+    public function getFields()
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Return enabler fields selectors.
+     *
+     * @return array
+     */
+    public function getEnablerFields()
+    {
+        return $this->enablers;
+    }
+
+    /**
+     *  Click 'Configure' button to expand PayPal Payments Pro configuration.
+     *
+     * @return void
+     */
+    public function clickConfigureButton()
+    {
+        $this->_rootElement->find($this->configureProButton)->click();
+    }
+
+    /**
+     * Set 'Enable this Solution' = Yes.
+     *
+     * @return void
+     */
+    public function enablePaymentsPro()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('Yes');
+    }
+
+    /**
+     * Set 'Enable this Solution' = No.
+     *
+     * @return void
+     */
+    public function disablePaymentsPro()
+    {
+        $this->_rootElement->find(
+            $this->enablers['Enable this Solution'],
+            Locator::SELECTOR_CSS,
+            'select'
+        )->setValue('No');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
new file mode 100644
index 0000000000000..c2461cf39ae6c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SystemConfigEditSectionPayment" area="Adminhtml" mca="admin/system_config/edit/section/payment" module="Magento_Backend">
+        <block name="expressCheckoutConfigBlock" class="Magento\Paypal\Test\Block\System\Config\ExpressCheckout" locator="#row_payment_us_paypal_alternative_payment_methods_express_checkout_us" strategy="css selector" />
+        <block name="paymentsAdvancedConfigBlock" class="Magento\Paypal\Test\Block\System\Config\PaymentsAdvanced" locator="#row_payment_us_paypal_group_all_in_one_payflow_advanced" strategy="css selector" />
+        <block name="paymentsProConfigBlock" class="Magento\Paypal\Test\Block\System\Config\PaymentsPro" locator="#row_payment_us_paypal_group_all_in_one_wpp_usuk" strategy="css selector" />
+        <block name="payflowProConfigBlock" class="Magento\Paypal\Test\Block\System\Config\PayflowPro" locator="#row_payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout" strategy="css selector" />
+        <block name="payflowLinkConfigBlock" class="Magento\Paypal\Test\Block\System\Config\PayflowLink" locator="#row_payment_us_paypal_payment_gateways_payflow_link_us" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
new file mode 100644
index 0000000000000..3e510ab12ec32
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Create customer.
+ * 2. Create product.
+ *
+ * Steps:
+ * 1. Open Backend.
+ * 2. Open Sales -> Orders.
+ * 3. Click Create New Order.
+ * 4. Select Customer created in preconditions.
+ * 5. Add Product.
+ * 6. Fill data according dataset.
+ * 7. Click Update Product qty.
+ * 8. Fill data according dataset.
+ * 9. Click Get Shipping Method and rates.
+ * 10. Fill data according dataset.
+ * 11. Select payment method Credit Card (PayFlow Pro)
+ * 12. Leave empty required fields for credit card 
+ * 13. Click Submit order button
+ *
+ * @group PayPal
+ * @ZephyrId MAGETWO-58934
+ */
+class CreatePayFlowOrderBackendNegativeTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * Runs sales order on backend.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml
new file mode 100644
index 0000000000000..4ad751de68a71
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Paypal\Test\TestCase\CreatePayFlowOrderBackendNegativeTest" summary="Verify required fields validation for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-58934">
+        <variation name="CreatePayFlowOrderBackendNegativeTestPayflowProVariation1" summary="Verify required fields validation for credit card on admin order creation" ticketId="MAGETWO-58934">
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="saveAddress" xsi:type="string">No</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">15.00</item>
+            </data>
+            <data name="payment/method" xsi:type="string">payflowpro</data>
+            <data name="creditCardClass" xsi:type="string">credit_card_admin</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_empty</data>
+            <data name="creditCardSave" xsi:type="string">Yes</data>
+            <data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
+            <constraint name="Magento\Payment\Test\Constraint\AssertCardRequiredFields" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
index b7f571b87270a..ca26ad42a020c 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\CreateVaultOrderBackendTest" summary="Use saved for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-47350">
         <variation name="CreateVaultOrderBackendTestPayflowProVariation1" summary="Use saved for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-47350">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="saveAddress" xsi:type="string">No</data>
@@ -19,12 +19,13 @@
                 <item name="grandTotal" xsi:type="string">15.00</item>
             </data>
             <data name="payment/method" xsi:type="string">payflowpro</data>
+            <data name="vault/method" xsi:type="string">payflowpro_cc_vault</data>
             <data name="creditCardClass" xsi:type="string">credit_card_admin</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="creditCardSave" xsi:type="string">Yes</data>
             <data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
index be6c223a2503c..8a10d08e0f6c3 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
@@ -22,16 +22,16 @@
  * 5. Process checkout via PayPal.
  * 6. Perform asserts.
  *
- * @group PayPal_(CS)
+ * @group PayPal
  * @ZephyrId MAGETWO-12415
  */
 class ExpressCheckoutFromProductPageTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
     const TO_MAINTAIN = 'yes';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
index 4373523471cff..1d92fa149efbc 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
@@ -27,7 +27,7 @@
             </data>
             <data name="payment/method" xsi:type="string">paypal_express</data>
             <data name="configData" xsi:type="string">paypal_express, freeshipping</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
index fc85feb524baf..6ecf356e27ff8 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
@@ -22,16 +22,16 @@
  * 5. Process checkout via PayPal.
  * 6. Perform asserts.
  *
- * @group PayPal_(CS)
+ * @group PayPal
  * @ZephyrId MAGETWO-12414
  */
 class ExpressCheckoutFromShoppingCartTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
     const TO_MAINTAIN = 'yes';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
index b2e9ce9b56327..38c876719bc3d 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
@@ -8,7 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Paypal\Test\TestCase\ExpressCheckoutFromShoppingCartTest" summary="Guest Checkout with &quot;Checkout with PayPal&quot; button (Payflow Edition) from the Shopping Cart and Offline Shipping" ticketId="MAGETWO-12414">
         <variation name="ExpressCheckoutFromShoppingCartTestVariation1" summary="Check Out as a Guest with 'Checkout with PayPal' button (Payflow Edition) from the Shopping Cart and Offline Shipping" ticketId="MAGETWO-12414">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="sandboxCustomer/dataset" xsi:type="string">sandbox_us_default</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
@@ -26,7 +28,7 @@
                 <item name="grandTotal" xsi:type="string">145.98</item>
             </data>
             <data name="configData" xsi:type="string">payflowpro</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
index f57544ae5a663..5d7056d32703d 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
@@ -26,16 +26,16 @@
  * 5. Process checkout via PayPal.
  * 6. Perform asserts.
  *
- * @group PayPal_(CS)
+ * @group PayPal
  * @ZephyrId MAGETWO-12413, MAGETWO-14359, MAGETWO-12996
  */
 class ExpressCheckoutOnePageTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
     const TO_MAINTAIN = 'yes';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
index b13bab96ae0ad..e52ed631ae46f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
@@ -8,7 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Paypal\Test\TestCase\ExpressCheckoutOnePageTest" summary="Guest Checkout Using PayPal Express Checkout Method and Flat Rate" ticketId="MAGETWO-12413">
         <variation name="ExpressCheckoutOnePageTestVariation1" summary="Check Out as a Guest Using PayPal Express Checkout Method and Offline Shipping Method" ticketId="MAGETWO-12413">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="sandboxCustomer/dataset" xsi:type="string">sandbox_us_default</data>
             <data name="customer/dataset" xsi:type="string">default</data>
@@ -24,14 +26,16 @@
             </data>
             <data name="payment/method" xsi:type="string">paypal_express</data>
             <data name="configData" xsi:type="string">paypal_express</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
         </variation>
         <variation name="ExpressCheckoutOnePageTestVariation2" summary="Check Out as a Guest using Payflow Link - PayPal Express Checkout Payflow Edition and Offline Shipping" ticketId="MAGETWO-14359">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="sandboxCustomer/dataset" xsi:type="string">sandbox_us_default</data>
             <data name="customer/dataset" xsi:type="string">default</data>
@@ -47,14 +51,16 @@
             </data>
             <data name="payment/method" xsi:type="string">paypal_express</data>
             <data name="configData" xsi:type="string">payflowlink</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
         </variation>
         <variation name="ExpressCheckoutOnePageTestVariation3" summary="Check Out as Guest User using PayPal Express and Offline Shipping Method" ticketId="MAGETWO-12996">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
+            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
             <data name="sandboxCustomer/dataset" xsi:type="string">sandbox_us_default</data>
             <data name="customer/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
index 9637d95a7216b..66ca21d8d0f3e 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
@@ -23,16 +23,16 @@
  * 5. Click "Cancel".
  * 6. Perform asserts.
  *
- * @group PayPal_(CS)
+ * @group PayPal
  * @ZephyrId MAGETWO-47213
  */
 class InContextExpressCheckoutFromShoppingCartTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
     const TO_MAINTAIN = 'yes';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
index 01a42e252d4a4..bbc566d1e31ec 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Paypal\Test\TestCase\InContextExpressCheckoutFromShoppingCartTest" summary="In-Context Checkout with PayPal Express Checkout (API Credentials) from shopping cart " ticketId="MAGETWO-47213">
         <variation name="InContextExpressCheckoutFromShoppingCartTestVariation1" summary="In-Context Checkout with PayPal Express Checkout (API Credentials) from shopping cart " ticketId="MAGETWO-47213">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="configData" xsi:type="string">paypal_express, paypal_express_in_context</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
index 1cc9e00df7ec9..b96f6a3e4a70a 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
@@ -23,16 +23,16 @@
  * 5. Click "Cancel".
  * 6. Perform asserts.
  *
- * @group PayPal_(CS)
+ * @group PayPal
  * @ZephyrId MAGETWO-47261
  */
 class InContextExpressOnePageCheckoutTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
     const TO_MAINTAIN = 'yes';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
index 605a154cbc569..5fa8e6e8b775d 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Paypal\Test\TestCase\InContextExpressOnePageCheckoutTest" summary="In-Context Checkout with PayPal Express Checkout (API Credentials) through one page checkout" ticketId="MAGETWO-47261">
         <variation name="InContextExpressOnePageCheckoutTestVariation1" summary="In-Context Checkout with PayPal Express Checkout (API Credentials) through one page checkout" ticketId="MAGETWO-47261">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
@@ -18,7 +18,7 @@
             </data>
             <data name="payment/method" xsi:type="string">paypal_express</data>
             <data name="configData" xsi:type="string">paypal_express_in_context, paypal_express, freeshipping</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml
new file mode 100644
index 0000000000000..b1da43e473bc5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Vault\Test\TestCase\ReorderUsingVaultTest" summary="Reorder from Admin with saved within PayPal Payflow Pro credit card">
+        <variation name="ReorderUsingVaultPayflowProTestVariation1" summary="Reorder from Admin with saved within PayPal Payflow Pro credit card for Guest Customer" ticketId="MAGETWO-54872">
+            <data name="description" xsi:type="string">Reorder from Admin with saved within PayPal Payflow Pro credit card for Guest Customer</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">15.00</item>
+            </data>
+            <data name="payment/method" xsi:type="string">payflowpro</data>
+            <data name="vault/method" xsi:type="string">payflowpro_cc_vault</data>
+            <data name="creditCardClass" xsi:type="string">credit_card</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
+            <data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
index ff5f151580b11..92b4be03b5937 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
@@ -8,21 +8,22 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\UseVaultOnCheckoutTest" summary="Use saved for PayPal Payflow Pro credit card on checkout">
         <variation name="UseVaultOnCheckoutPayflowProTestVariation1" summary="Use saved for PayPal Payflow Pro credit card on checkout" ticketId="MAGETWO-47349, MAGETWO-47347">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">payflowpro</data>
+            <data name="vault/method" xsi:type="string">payflowpro_cc_vault</data>
             <data name="creditCardClass" xsi:type="string">credit_card</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="creditCardSave" xsi:type="string">Yes</data>
             <data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php
new file mode 100644
index 0000000000000..83cbbc511218c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check PayPal Express Checkout configuration.
+ */
+class CheckExpressConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Paypal\Test\Block\System\Config\ExpressCheckout
+     */
+    private $expressCheckoutConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->expressCheckoutConfigBlock = $this->systemConfigEditSectionPayment->getExpressCheckoutConfigBlock();
+    }
+
+    /**
+     * Run step for checking PayPal Express Checkout configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->open();
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->switchMerchantCountry($this->countryCode);
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enableExpressCheckout();
+        $this->disableExpressCheckout();
+    }
+
+    /**
+     * Enables Express Checkout and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enableExpressCheckout()
+    {
+        $this->expressCheckoutConfigBlock->clickConfigureButton();
+        $this->expressCheckoutConfigBlock->clearCredentials();
+        $enablers = $this->expressCheckoutConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->expressCheckoutConfigBlock->specifyCredentials();
+        $this->expressCheckoutConfigBlock->enableExpressCheckout();
+        $expressFields = $this->expressCheckoutConfigBlock->getFields();
+        $this->assertFieldsArePresent->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$expressFields['Merchant Account ID'], $expressFields['Sort Order PayPal Credit']]
+        );
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']]
+        );
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']]
+        );
+        $this->expressCheckoutConfigBlock->specifyMerchantAccountId();
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Express Checkout and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disableExpressCheckout()
+    {
+        $enablers = $this->expressCheckoutConfigBlock->getEnablerFields();
+        $this->expressCheckoutConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->expressCheckoutConfigBlock->disableExpressCheckout();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php
new file mode 100644
index 0000000000000..2779db2130a61
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check PayPal Payflow Link configuration.
+ */
+class CheckPayflowLinkConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Paypal\Test\Block\System\Config\PayflowLink
+     */
+    private $payflowLinkConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->payflowLinkConfigBlock = $this->systemConfigEditSectionPayment->getPayflowLinkConfigBlock();
+    }
+
+    /**
+     * Run step for checking Payflow Link configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enablePayflowLink();
+        $this->disablePayflowLink();
+    }
+
+    /**
+     * Enables Payflow Link and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enablePayflowLink()
+    {
+        $this->payflowLinkConfigBlock->clickConfigureButton();
+        $this->payflowLinkConfigBlock->clearCredentials();
+        $enablers = $this->payflowLinkConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            $enablers
+        );
+        $this->payflowLinkConfigBlock->specifyCredentials();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable Payflow Link']]
+        );
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']]
+        );
+        $this->payflowLinkConfigBlock->enablePayflowLink();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            $enablers
+        );
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            $enablers
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Payflow Link and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disablePayflowLink()
+    {
+        $enablers = $this->payflowLinkConfigBlock->getEnablerFields();
+        $this->payflowLinkConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            $enablers
+        );
+        $this->payflowLinkConfigBlock->disablePayflowLink();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
new file mode 100644
index 0000000000000..92c66d622017b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check PayPal Payflow Pro configuration.
+ */
+class CheckPayflowProConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Paypal\Test\Block\System\Config\PayflowPro
+     */
+    private $payflowProConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->payflowProConfigBlock = $this->systemConfigEditSectionPayment->getPayflowProConfigBlock();
+    }
+
+    /**
+     * Run step for checking Payflow Pro configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enablePayflowPro();
+        $this->disablePayflowPro();
+    }
+
+    /**
+     * Enables Payflow Pro and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enablePayflowPro()
+    {
+        $this->payflowProConfigBlock->clickConfigureButton();
+        $this->payflowProConfigBlock->clearCredentials();
+        $enablers = $this->payflowProConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->payflowProConfigBlock->specifyCredentials();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution']]
+        );
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable PayPal Credit']]
+        );
+        $this->payflowProConfigBlock->enablePayflowPro();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
+        );
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Payflow Pro and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disablePayflowPro()
+    {
+        $enablers = $this->payflowProConfigBlock->getEnablerFields();
+        $this->payflowProConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->payflowProConfigBlock->disablePayflowPro();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php
new file mode 100644
index 0000000000000..c940a371dc7a3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check PayPal Payments Advanced configuration.
+ */
+class CheckPaymentsAdvancedConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Paypal\Test\Block\System\Config\PaymentsAdvanced
+     */
+    private $paymentsAdvancedConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->paymentsAdvancedConfigBlock = $this->systemConfigEditSectionPayment->getPaymentsAdvancedConfigBlock();
+    }
+
+    /**
+     * Run step for checking Payments Advanced configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enablePaymentsAdvanced();
+        $this->disablePaymentsAdvanced();
+    }
+
+    /**
+     * Enables Payments Advanced and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enablePaymentsAdvanced()
+    {
+        $this->paymentsAdvancedConfigBlock->clickConfigureButton();
+        $this->paymentsAdvancedConfigBlock->clearCredentials();
+        $enablers = $this->paymentsAdvancedConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->paymentsAdvancedConfigBlock->specifyCredentials();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution']]
+        );
+        $this->paymentsAdvancedConfigBlock->enablePaymentsAdvanced();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Payments Advanced and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disablePaymentsAdvanced()
+    {
+        $enablers = $this->paymentsAdvancedConfigBlock->getEnablerFields();
+        $this->paymentsAdvancedConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->paymentsAdvancedConfigBlock->disablePaymentsAdvanced();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
new file mode 100644
index 0000000000000..e191d84f313d8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEditSectionPayment;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Payment\Test\Constraint\AssertFieldsAreActive;
+use Magento\Payment\Test\Constraint\AssertFieldsAreDisabled;
+use Magento\Payment\Test\Constraint\AssertFieldsAreEnabled;
+use Magento\Payment\Test\Constraint\AssertFieldsArePresent;
+
+/**
+ * Check PayPal Payments Pro configuration.
+ */
+class CheckPaymentsProConfigStep implements TestStepInterface
+{
+    /**
+     * Payments configuration page.
+     *
+     * @var SystemConfigEditSectionPayment
+     */
+    private $systemConfigEditSectionPayment;
+
+    /**
+     * @var AssertFieldsAreDisabled
+     */
+    private $assertFieldsAreDisabled;
+
+    /**
+     * @var AssertFieldsArePresent
+     */
+    private $assertFieldsArePresent;
+
+    /**
+     * @var AssertFieldsAreActive
+     */
+    private $assertFieldsAreActive;
+
+    /**
+     * @var AssertFieldsAreEnabled
+     */
+    private $assertFieldsAreEnabled;
+
+    /**
+     * Country code.
+     *
+     * @var string
+     */
+    private $countryCode;
+
+    /**
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
+     */
+    private $sections;
+
+    /**
+     * @var \Magento\Paypal\Test\Block\System\Config\PaymentsPro
+     */
+    private $paymentsProConfigBlock;
+
+    /**
+     * @param SystemConfigEditSectionPayment $systemConfigEditSectionPayment
+     * @param AssertFieldsAreDisabled $assertFieldsAreDisabled
+     * @param AssertFieldsArePresent $assertFieldsArePresent
+     * @param AssertFieldsAreActive $assertFieldsAreActive
+     * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
+     * @param string $countryCode
+     * @param array $sections
+     */
+    public function __construct(
+        SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
+        AssertFieldsAreDisabled $assertFieldsAreDisabled,
+        AssertFieldsArePresent $assertFieldsArePresent,
+        AssertFieldsAreActive $assertFieldsAreActive,
+        AssertFieldsAreEnabled $assertFieldsAreEnabled,
+        $countryCode,
+        array $sections
+    ) {
+        $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
+        $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;
+        $this->assertFieldsArePresent = $assertFieldsArePresent;
+        $this->assertFieldsAreActive = $assertFieldsAreActive;
+        $this->assertFieldsAreEnabled = $assertFieldsAreEnabled;
+        $this->countryCode = $countryCode;
+        $this->sections = $sections;
+        $this->paymentsProConfigBlock = $this->systemConfigEditSectionPayment->getPaymentsProConfigBlock();
+    }
+
+    /**
+     * Run step for checking Payments Pro configuration.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections);
+        $this->enablePaymentsPro();
+        $this->disablePaymentsPro();
+    }
+
+    /**
+     * Enables Payments Pro and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function enablePaymentsPro()
+    {
+        $this->paymentsProConfigBlock->clickConfigureButton();
+        $this->paymentsProConfigBlock->clearCredentials();
+        $enablers = $this->paymentsProConfigBlock->getEnablerFields();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->paymentsProConfigBlock->specifyCredentials();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution']]
+        );
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable PayPal Credit']]
+        );
+        $this->paymentsProConfigBlock->enablePaymentsPro();
+        $this->assertFieldsAreActive->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault Enabled']]
+        );
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+
+    /**
+     * Disables Payments Pro and makes assertions for fields.
+     *
+     * @return void
+     */
+    private function disablePaymentsPro()
+    {
+        $enablers = $this->paymentsProConfigBlock->getEnablerFields();
+        $this->paymentsProConfigBlock->clickConfigureButton();
+        $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
+        $this->assertFieldsAreEnabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
+        );
+        $this->paymentsProConfigBlock->disablePaymentsPro();
+        $this->assertFieldsAreDisabled->processAssert(
+            $this->systemConfigEditSectionPayment,
+            [$enablers['Enable PayPal Credit']]
+        );
+        $this->systemConfigEditSectionPayment->getPageActions()->save();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml
new file mode 100644
index 0000000000000..e56386d5e0eac
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Paypal\Test\Constraint\Sandbox\AssertTotalPaypalReview">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml
index 288824c7e595d..89cf35b73bc3e 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml
@@ -53,7 +53,7 @@
         <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
         <step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer" />
         <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
-        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress"/>
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
         <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
         <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
         <step name="selectPaymentMethod" module="Magento_Checkout" next="continueToPaypal" />
@@ -61,4 +61,28 @@
         <step name="continuePaypalCheckout" module="Magento_Paypal" next="getPlacedOrderId" />
         <step name="getPlacedOrderId" module="Magento_Paypal" />
     </scenario>
+    <scenario name="ConflictResolutionTest" firstStep="checkExpressConfig">
+        <step name="checkExpressConfig" module="Magento_Paypal" next="checkBraintreeConfig" />
+        <step name="checkBraintreeConfig" module="Magento_Braintree" next="checkPaymentsAdvancedConfig" />
+        <step name="checkPaymentsAdvancedConfig" module="Magento_Paypal" next="checkPaymentsProConfig" />
+        <step name="checkPaymentsProConfig" module="Magento_Paypal" next="checkPayflowProConfig" />
+        <step name="checkPayflowProConfig" module="Magento_Paypal" next="checkPayflowLinkConfig" />
+        <step name="checkPayflowLinkConfig" module="Magento_Paypal" />
+    </scenario>
+    <scenario name="CreatePayFlowOrderBackendNegativeTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="openSalesOrders" />
+        <step name="openSalesOrders" module="Magento_Sales" next="createNewOrder" />
+        <step name="createNewOrder" module="Magento_Sales" next="selectCustomerOrder" />
+        <step name="selectCustomerOrder" module="Magento_Sales" next="selectStore" />
+        <step name="selectStore" module="Magento_Sales" next="addProducts" />
+        <step name="addProducts" module="Magento_Sales" next="fillAccountInformation" />
+        <step name="fillAccountInformation" module="Magento_Sales" next="fillBillingAddress" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
+        <step name="selectShippingMethodForOrder" module="Magento_Sales" next="saveCreditCardOnBackend" />
+        <step name="saveCreditCardOnBackend" module="Magento_Vault" next="submitOrderNegative" />
+        <step name="submitOrderNegative" module="Magento_Sales" />
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
index e8a912080d5a5..b1f4fb2220066 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
+use Magento\Ui\Test\Block\Adminhtml\Modal;
 
 /**
  * Order actions block.
@@ -263,4 +264,32 @@ public function isActionButtonVisible($buttonName)
     {
         return $this->_rootElement->find(sprintf($this->button, $buttonName), Locator::SELECTOR_XPATH)->isVisible();
     }
+
+    /**
+     * Accept order
+     * @return void
+     */
+    public function accept()
+    {
+        $acceptPayment = '#accept_payment';
+        $this->_rootElement->find($acceptPayment)->click();
+        $element = $this->browser->find($this->confirmModal);
+        /** @var Modal $modal */
+        $modal = $this->blockFactory->create(Modal::class, ['element' => $element]);
+        $modal->acceptAlert();
+    }
+
+    /**
+     * Deny order
+     * @return void
+     */
+    public function deny()
+    {
+        $denyPayment = '#deny_payment';
+        $this->_rootElement->find($denyPayment)->click();
+        $element = $this->browser->find($this->confirmModal);
+        /** @var Modal $modal */
+        $modal = $this->blockFactory->create(Modal::class, ['element' => $element]);
+        $modal->acceptAlert();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index 663c522936050..e63d602767371 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -129,7 +129,7 @@ class Create extends Block
     public function getItemsBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Items',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items::class,
             ['element' => $this->_rootElement->find($this->itemsBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -142,7 +142,7 @@ public function getItemsBlock()
     public function getBillingAddressBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Address',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Address::class,
             ['element' => $this->_rootElement->find($this->billingAddressBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -155,7 +155,7 @@ public function getBillingAddressBlock()
     protected function getShippingAddressBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Address',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Address::class,
             ['element' => $this->_rootElement->find($this->shippingAddressBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -165,10 +165,10 @@ protected function getShippingAddressBlock()
      *
      * @return \Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Method
      */
-    protected function getBillingMethodBlock()
+    public function getBillingMethodBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Method',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Method::class,
             ['element' => $this->_rootElement->find($this->billingMethodBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -181,7 +181,7 @@ protected function getBillingMethodBlock()
     protected function getShippingMethodBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Method',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Method::class,
             ['element' => $this->_rootElement->find($this->shippingMethodBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -194,7 +194,7 @@ protected function getShippingMethodBlock()
     protected function getTotalsBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals::class,
             ['element' => $this->_rootElement->find($this->totalsBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -207,7 +207,7 @@ protected function getTotalsBlock()
     public function getTemplateBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Backend\Test\Block\Template',
+            \Magento\Backend\Test\Block\Template::class,
             ['element' => $this->_rootElement->find($this->templateBlock, Locator::SELECTOR_XPATH)]
         );
     }
@@ -220,7 +220,7 @@ public function getTemplateBlock()
     public function getGridBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Search\Grid',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Search\Grid::class,
             ['element' => $this->_rootElement->find($this->gridBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -233,7 +233,7 @@ public function getGridBlock()
     public function getAccountBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Form\Account',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Form\Account::class,
             ['element' => $this->_rootElement->find($this->accountInformationBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -258,7 +258,7 @@ public function updateProductsData(array $products)
     {
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items $items */
         $items = $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Items',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items::class,
             ['element' => $this->_rootElement->find($this->itemsBlock)]
         );
         foreach ($products as $product) {
@@ -301,6 +301,18 @@ public function fillAddresses(FixtureInterface $address, $saveAddress = 'No', $s
         }
     }
 
+    /**
+     * Fill Shipping Address.
+     *
+     * @param FixtureInterface $shippingAddress
+     * @return void
+     */
+    public function fillShippingAddress(FixtureInterface $shippingAddress)
+    {
+        $this->getShippingAddressBlock()->fill($shippingAddress);
+        $this->getTemplateBlock()->waitLoader();
+    }
+
     /**
      * Select shipping method.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
index 280211c7ef20f..8477af0087fd4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Adminhtml sales order create payment method block.
@@ -42,6 +43,20 @@ class Method extends Block
      */
     protected $loader = '[data-role=loader]';
 
+    /**
+     * Field with Mage error.
+     *
+     * @var string
+     */
+    protected $mageErrorField = '//fieldset/*[contains(@class,"field ")][.//*[contains(@class,"error")]]';
+
+    /**
+     * Mage error text.
+     *
+     * @var string
+     */
+    protected $mageErrorText = './/label[contains(@class,"error")]';
+
     /**
      * Select payment method.
      *
@@ -69,4 +84,23 @@ public function selectPaymentMethod(array $paymentCode, InjectableFixture $credi
             $formBlock->fill($creditCard);
         }
     }
+
+    /**
+     * @return array
+     */
+    public function getJsErrors()
+    {
+        $data = [];
+        $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
+        foreach ($elements as $element) {
+            $error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
+            if ($error->isVisible()) {
+                $label = $element->find('.//*[contains(@name,"payment")]', Locator::SELECTOR_XPATH);
+                $label = $label->getAttribute('name');
+                $label = preg_replace('/payment\[(.*)\]/u', '$1', $label);
+                $data[$label] = $error->getText();
+            }
+        }
+        return $data;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
index b3b0f4eafa74c..740f8f03fe639 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
@@ -21,6 +21,27 @@ class History extends Block
      */
     protected $commentHistory = '.note-list-comment';
 
+    /**
+     * Comment history status.
+     *
+     * @var string
+     */
+    protected $commentHistoryStatus = '.note-list-status';
+
+    /**
+     * Comment history notified status.
+     *
+     * @var string
+     */
+    protected $commentHistoryNotifiedStatus = '.note-list-customer';
+
+    /**
+     * Authorized Amount.
+     *
+     * @var string
+     */
+    protected $authorizedAmount = '//div[@class="note-list-comment"][contains(text(), "Authorized amount of")]';
+
     /**
      * Captured Amount from IPN.
      *
@@ -53,6 +74,17 @@ public function getCommentsHistory()
         return $this->_rootElement->find($this->commentHistory, Locator::SELECTOR_CSS)->getText();
     }
 
+    /**
+     * Get the authorized amount from the comments history.
+     *
+     * @return string
+     */
+    public function getAuthorizedAmount()
+    {
+        $this->waitCommentsHistory();
+        return $this->_rootElement->find($this->authorizedAmount, Locator::SELECTOR_XPATH)->getText();
+    }
+
     /**
      * Get the captured amount from the comments history.
      *
@@ -85,6 +117,28 @@ public function getRefundedAmount()
         return $result;
     }
 
+    /**
+     * Gets the status which presented in comment
+     *
+     * @return string
+     */
+    public function getStatus()
+    {
+        $this->waitCommentsHistory();
+        return $this->_rootElement->find($this->commentHistoryStatus, Locator::SELECTOR_CSS)->getText();
+    }
+
+    /**
+     * Gets the is customer notified status which presented in comment
+     *
+     * @return string
+     */
+    public function getNotifiedStatus()
+    {
+        $this->waitCommentsHistory();
+        return $this->_rootElement->find($this->commentHistoryNotifiedStatus, Locator::SELECTOR_CSS)->getText();
+    }
+
     /**
      * Wait for comments history is visible.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
new file mode 100644
index 0000000000000..1871a12ee2ce4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Class AssertAcceptPaymentMessageInCommentsHistory
+ *
+ * Constraint checks accept payment message in order comments history
+ */
+class AssertAcceptPaymentMessageInCommentsHistory extends AbstractConstraint
+{
+
+    /**
+     * @var string
+     */
+    private static $message = 'Approved the payment online.';
+
+    /**
+     * @param SalesOrderView $orderView
+     * @param OrderIndex $orderIndex
+     * @param $orderId
+     */
+    public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, $orderId)
+    {
+        $orderIndex->open();
+        $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+        $history = $orderView->getOrderHistoryBlock()->getCommentsHistory();
+
+        \PHPUnit_Framework_Assert::assertContains(self::$message, $history);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Message about approved payment is available in Comments History section.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php
new file mode 100644
index 0000000000000..fefc148b8bd03
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Class AssertAcceptPaymentSuccessMessagePresent
+ *
+ * Constraint checks success message on the order page
+ * after accepting order payment
+ */
+class AssertAcceptPaymentSuccessMessagePresent extends AbstractConstraint
+{
+    /**
+     * @var string
+     */
+    private static $successAcceptMessage = 'The payment has been accepted.';
+
+    /**
+     * Assert that success message present after accept payment
+     *
+     * @param SalesOrderView $salesOrderView
+     * @return void
+     */
+    public function processAssert(SalesOrderView $salesOrderView)
+    {
+        \PHPUnit_Framework_Assert::assertEquals(
+            self::$successAcceptMessage,
+            $salesOrderView->getMessagesBlock()->getSuccessMessage()
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Success accept payment message is present.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
index 7495855d5351f..a6b8e8983d2b6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
@@ -38,7 +38,7 @@ public function processAssert(
         $salesOrder->open();
         $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
 
-        $actualAuthorizedAmount = $salesOrderView->getOrderHistoryBlock()->getCommentsHistory();
+        $actualAuthorizedAmount = $salesOrderView->getOrderHistoryBlock()->getAuthorizedAmount();
 
         \PHPUnit_Framework_Assert::assertContains(
             self::AUTHORIZED_AMOUNT . $prices['grandTotal'],
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
new file mode 100644
index 0000000000000..87cac1c38232b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Class AssertDenyPaymentMessageInCommentsHistory
+ *
+ * Constraint checks deny payment message in order comments history
+ */
+class AssertDenyPaymentMessageInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * @var string
+     */
+    private static $message = 'Denied the payment online';
+
+    /**
+     * @param SalesOrderView $orderView
+     * @param OrderIndex $orderIndex
+     * @param $orderId
+     */
+    public function processAssert(SalesOrderView $orderView, OrderIndex $orderIndex, $orderId)
+    {
+        $orderIndex->open();
+        $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+        $history = $orderView->getOrderHistoryBlock()->getCommentsHistory();
+
+        \PHPUnit_Framework_Assert::assertContains(self::$message, $history);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Message about denied payment is available in Comments History section.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php
new file mode 100644
index 0000000000000..b6dbfdf1a6702
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Class AssertDenyPaymentSuccessMessagePresent
+ *
+ * Constraint checks success message on the order page
+ * after denying order payment
+ */
+class AssertDenyPaymentSuccessMessagePresent extends AbstractConstraint
+{
+    /**
+     * @var string
+     */
+    private static $successDenyMessage = 'The payment has been denied.';
+
+    /**
+     * Assert that success message present after deny payment
+     *
+     * @param SalesOrderView $salesOrderView
+     * @return void
+     */
+    public function processAssert(SalesOrderView $salesOrderView)
+    {
+        \PHPUnit_Framework_Assert::assertEquals(
+            self::$successDenyMessage,
+            $salesOrderView->getMessagesBlock()->getSuccessMessage()
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Success deny payment message is present.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
new file mode 100644
index 0000000000000..89faffc8ec072
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+
+/**
+ * Class AssertRefundOrderStatusInCommentsHistory
+ */
+class AssertRefundOrderStatusInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * Assert that comment about refunded amount exist in Comments History section on order page in Admin.
+     *
+     * @param SalesOrderView $salesOrderView
+     * @param OrderIndex $salesOrder
+     * @param OrderInjectable $order
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        OrderIndex $salesOrder,
+        OrderInjectable $order
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
+        \PHPUnit_Framework_Assert::assertContains(
+            $salesOrderView->getOrderForm()->getOrderInfoBlock()->getOrderStatus(),
+            $salesOrderView->getOrderHistoryBlock()->getStatus()
+        );
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Message with appropriate order status is available in Comments History section.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillShippingAddressStep.php
new file mode 100644
index 0000000000000..a9d6433c66958
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillShippingAddressStep.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\TestStep;
+
+use Magento\Customer\Test\Fixture\Address;
+use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Fill Shipping Address.
+ */
+class FillShippingAddressStep implements TestStepInterface
+{
+    /**
+     * Sales order create index page.
+     *
+     * @var OrderCreateIndex
+     */
+    protected $orderCreateIndex;
+
+    /**
+     * Shipping Address fixture.
+     *
+     * @var Address
+     */
+    protected $shippingAddress;
+
+    /**
+     * @param OrderCreateIndex $orderCreateIndex
+     * @param Address $shippingAddress [optional]
+     */
+    public function __construct(
+        OrderCreateIndex $orderCreateIndex,
+        Address $shippingAddress = null
+    ) {
+        $this->orderCreateIndex = $orderCreateIndex;
+        $this->shippingAddress = $shippingAddress;
+    }
+
+    /**
+     * Fill Shipping Address.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        if ($this->shippingAddress !== null) {
+            $this->orderCreateIndex->getCreateBlock()->fillShippingAddress($this->shippingAddress);
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderNegativeStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderNegativeStep.php
new file mode 100644
index 0000000000000..ece554eee9c9c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderNegativeStep.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\TestStep;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Submit Order step.
+ */
+class SubmitOrderNegativeStep implements TestStepInterface
+{
+    /**
+     * Sales order create index page.
+     *
+     * @var OrderCreateIndex
+     */
+    protected $orderCreateIndex;
+
+    /**
+     * @constructor
+     * @param OrderCreateIndex $orderCreateIndex
+     */
+    public function __construct(
+        OrderCreateIndex $orderCreateIndex
+    ) {
+        $this->orderCreateIndex = $orderCreateIndex;
+    }
+
+    /**
+     * Fill Sales Data.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->orderCreateIndex->getCreateBlock()->submitOrder();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php
new file mode 100644
index 0000000000000..95fae4642d878
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+class OnePageCheckoutWithDiscountTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/ApplySalesRuleOnCheckoutStep.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/ApplySalesRuleOnCheckoutStep.php
new file mode 100644
index 0000000000000..f132b8a2d2d46
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/ApplySalesRuleOnCheckoutStep.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\SalesRule\Test\Fixture\SalesRule;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Apply Sales Rule on payment information step.
+ */
+class ApplySalesRuleOnCheckoutStep implements TestStepInterface
+{
+    /**
+     * One Page Checkout page.
+     *
+     * @var CheckoutOnepage
+     */
+    protected $checkoutOnepage;
+
+    /**
+     * SalesRule fixture.
+     *
+     * @var SalesRule
+     */
+    protected $salesRule;
+
+    /**
+     * @constructor
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param SalesRule $salesRule
+     */
+    public function __construct(CheckoutOnepage $checkoutOnepage, SalesRule $salesRule = null)
+    {
+        $this->checkoutOnepage = $checkoutOnepage;
+        $this->salesRule = $salesRule;
+    }
+
+    /**
+     * Apply coupon on payment information step.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        if ($this->salesRule !== null) {
+            $this->checkoutOnepage->getDiscountCodesBlock()->applyCouponCode($this->salesRule->getCouponCode());
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
index 99e62f1224f16..37f8366674e05 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/testcase.xml
@@ -6,24 +6,41 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/TestCase/etc/testcase.xsd">
+    <scenario name="OnePageCheckoutWithDiscountTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="createSalesRule" />
+        <step name="createSalesRule" module="Magento_SalesRule" next="createTaxRule" />
+        <step name="createTaxRule" module="Magento_Tax" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="applySalesRuleOnCheckout" />
+        <step name="applySalesRuleOnCheckout" module="Magento_SalesRule" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" />
+    </scenario>
     <scenario name="OnePageCheckoutTest">
-        <step name="createSalesRule" module="Magento_SalesRule" prev="estimateShippingAndTax" next="applySalesRuleOnFrontend"/>
-        <step name="applySalesRuleOnFrontend" module="Magento_SalesRule" prev="createSalesRule" next="clickProceedToCheckout"/>
+        <step name="createSalesRule" module="Magento_SalesRule" prev="estimateShippingAndTax" next="applySalesRuleOnFrontend" />
+        <step name="applySalesRuleOnFrontend" module="Magento_SalesRule" prev="createSalesRule" next="clickProceedToCheckout" />
     </scenario>
     <scenario name="ReorderOrderEntityTest">
-        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend"/>
-        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress"/>
+        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
+        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
     </scenario>
     <scenario name="CreateOrderBackendTest">
-        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend"/>
-        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress"/>
+        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
+        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
     </scenario>
     <scenario name="CreateOrderFromCustomerPageTest">
-        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend"/>
-        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress"/>
+        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
+        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
     </scenario>
     <scenario name="PrintOrderFrontendGuestTest">
-        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend"/>
-        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress"/>
+        <step name="createSalesRule" module="Magento_SalesRule" next="applySalesRuleOnBackend" />
+        <step name="applySalesRuleOnBackend" module="Magento_SalesRule" next="fillBillingAddress" />
     </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/CreditCards.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
similarity index 75%
rename from dev/tests/functional/tests/app/Magento/Vault/Test/Block/CreditCards.php
rename to dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
index 1869cf3673f2f..3aad566537fbb 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/CreditCards.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
@@ -10,7 +10,7 @@
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\InjectableFixture;
 
-class CreditCards extends Block
+class StoredPayments extends Block
 {
     /**
      * Delete button locator for popup window.
@@ -19,6 +19,13 @@ class CreditCards extends Block
      */
     private $deleteButton = './/*[@data-type="popup"]//span[text()="Delete"]';
 
+    /**
+     * Delete link for stored payment method.
+     *
+     * @var string
+     */
+    private $deleteStoredPayment = '.delete';
+
     /**
      * Delete saved credit card.
      *
@@ -32,6 +39,17 @@ public function deleteCreditCard(ElementInterface $creditCard)
         $this->browser->selectWindow();
     }
 
+    /**
+     * Delete Stored Payment Method.
+     */
+    public function deleteStoredPayment()
+    {
+        $this->browser->find($this->deleteStoredPayment)->click();
+        $this->browser->selectWindow();
+        $this->browser->find($this->deleteButton, Locator::SELECTOR_XPATH)->click();
+        $this->browser->selectWindow();
+    }
+
     /**
      * Get saved credit cards on My Credit Cards page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php
new file mode 100644
index 0000000000000..7679c870b726c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\Constraint;
+
+use Magento\Vault\Test\Page\StoredPaymentMethods;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that success message is correct.
+ */
+class AssertStoredPaymentDeletedMessage extends AbstractConstraint
+{
+    /**
+     * Message of success deletion of stored payment method.
+     */
+    const SUCCESS_MESSAGE = 'Stored Payment Method was successfully removed';
+
+    /**
+     * Assert that message of success deletion of stored payment method is present.
+     *
+     * @param StoredPaymentMethods $storedPaymentMethods
+     */
+    public function processAssert(StoredPaymentMethods $storedPaymentMethods)
+    {
+        \PHPUnit_Framework_Assert::assertEquals(
+            self::SUCCESS_MESSAGE,
+            $storedPaymentMethods->getMessagesBlock()->getSuccessMessage(),
+            'Message of success deletion of stored payment method is not present or wrong.'
+        );
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Success message on Store Payment Methods page is correct.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Page/MyCreditCards.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/Page/StoredPaymentMethods.xml
similarity index 65%
rename from dev/tests/functional/tests/app/Magento/Vault/Test/Page/MyCreditCards.xml
rename to dev/tests/functional/tests/app/Magento/Vault/Test/Page/StoredPaymentMethods.xml
index 3b2396ece7d12..2baf7d7d57fd7 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Page/MyCreditCards.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Page/StoredPaymentMethods.xml
@@ -6,8 +6,8 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="MyCreditCards" mca="vault/cards/listaction" module="Magento_Vault">
-        <block name="creditCardsBlock" class="Magento\Vault\Test\Block\CreditCards" locator=".table-credit-cards" strategy="css selector" />
+    <page name="StoredPaymentMethods" mca="vault/cards/listaction" module="Magento_Vault">
+        <block name="storedPaymentsBlock" class="Magento\Vault\Test\Block\StoredPayments" locator=".table-credit-cards" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
index 37d0fdc81c5aa..a5194b3915191 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
@@ -30,15 +30,15 @@
  * 15. Select any available payment token.
  * 16. Place order.
  *
- * @group Order_Management_(CS)
+ * @group Order_Management
  * @ZephyrId MAGETWO-48127, MAGETWO-48091
  */
 class CreateVaultOrderBackendTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
index 43497e821f6a9..e6462e4697aa6 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
@@ -23,22 +23,40 @@
  * 6. Go to One page Checkout
  * 7. Perform assertions.
  *
- * @group Vault_(CS)
+ * @group Vault
  * @ZephyrId MAGETWO-54059, MAGETWO-54072, MAGETWO-54068, MAGETWO-54015, MAGETWO-54011
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DeleteSavedCreditCardTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
+    /**
+     * Page for one page checkout.
+     *
+     * @var CheckoutOnepage
+     */
+    private $checkoutOnepage;
+
+    /**
+     * Injection data.
+     *
+     * @param CheckoutOnepage $checkoutOnepage
+     * @return void
+     */
+    public function __inject(CheckoutOnepage $checkoutOnepage)
+    {
+        $this->checkoutOnepage = $checkoutOnepage;
+    }
+
     /**
      * Runs delete saved credit card test.
      *
      * @param AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout
-     * @param CheckoutOnepage $checkoutOnepage
      * @param $products
      * @param $configData
      * @param $customer
@@ -47,10 +65,10 @@ class DeleteSavedCreditCardTest extends Injectable
      * @param $shipping
      * @param array $payments
      * @param $creditCardSave
+     * @return void
      */
     public function test(
         AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout,
-        CheckoutOnepage $checkoutOnepage,
         $products,
         $configData,
         $customer,
@@ -69,22 +87,22 @@ public function test(
         foreach ($payments as $key => $payment) {
             $this->addToCart($products);
             $this->proceedToCheckout();
-            if($key < 1) { // if this is the first order to be placed
+            if ($key < 1) { // if this is the first order to be placed
                 $this->selectCheckoutMethod($checkoutMethod, $customer);
                 $this->fillShippingAddress($shippingAddress);
             }
             $this->fillShippingMethod($shipping);
             if ($key >= 2) { // if this order will be placed via stored credit card
-                $this->useSavedCreditCard($payment);
+                $this->useSavedCreditCard($payment['vault']);
             } else {
                 $this->selectPaymentMethod($payment, $payment['creditCardClass'], $payment['creditCard']);
                 $this->saveCreditCard($payment, $creditCardSave);
             }
             $this->placeOrder();
         }
-        // Delete credit cards from My Account and verify they are not available on checkout
+        // Delete credit cards from Stored Payment Methods and verify they are not available on checkout
         $paymentsCount = count($payments);
-        for($i = 2; $i < $paymentsCount; $i++) {
+        for ($i = 2; $i < $paymentsCount; $i++) {
             $deletedCard = $this->deleteCreditCardFromMyAccount(
                 $customer,
                 $payments[$i]['creditCard'],
@@ -94,7 +112,7 @@ public function test(
             $this->proceedToCheckout();
             $this->fillShippingMethod($shipping);
             $assertCreditCardNotPresentOnCheckout->processAssert(
-                $checkoutOnepage,
+                $this->checkoutOnepage,
                 $deletedCard['deletedCreditCard']
             );
         }
@@ -244,7 +262,7 @@ protected function saveCreditCard($payment, $creditCardSave)
         );
         $saveCreditCardStep->run();
     }
-    
+
     /**
      * @return void
      */
@@ -255,7 +273,7 @@ protected function fillBillingInformation()
         );
         $fillBillingInformationStep->run();
     }
-    
+
     /**
      * @return void
      */
@@ -273,8 +291,8 @@ protected function placeOrder()
     protected function useSavedCreditCard($payment)
     {
         $useSavedCreditCardStep = ObjectManager::getInstance()->create(
-            \Magento\Vault\Test\TestStep\UseSavedCreditCardStep::class,
-            ['payment' => $payment]
+            \Magento\Vault\Test\TestStep\UseSavedPaymentMethodStep::class,
+            ['vault' => $payment]
         );
         $useSavedCreditCardStep->run();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
index ecbed706005b4..ac69bfb9f47e4 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\DeleteSavedCreditCardTest" summary="Delete saved with Braintree credit card from customer account">
         <variation name="DeleteSavedCreditCardTestVariation2" summary="Delete saved with Braintree credit card from customer account" ticketId="MAGETWO-38487">
-            <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -35,6 +35,9 @@
                     <item name="creditCard" xsi:type="array">
                         <item name="dataset" xsi:type="string">visa_braintree</item>
                     </item>
+                    <item name="vault" xsi:type="array">
+                        <item name="method" xsi:type="string">braintree_cc_vault</item>
+                    </item>
                 </item>
                 <item name="3" xsi:type="array">
                     <item name="method" xsi:type="string">payflowpro</item>
@@ -42,11 +45,14 @@
                     <item name="creditCard" xsi:type="array">
                         <item name="dataset" xsi:type="string">amex_default</item>
                     </item>
+                    <item name="vault" xsi:type="array">
+                        <item name="method" xsi:type="string">payflowpro_cc_vault</item>
+                    </item>
                 </item>
             </data>
             <data name="creditCardSave" xsi:type="string">Yes</data>
             <data name="configData" xsi:type="string">braintree, payflowpro, braintree_use_vault, payflowpro_use_vault</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
new file mode 100644
index 0000000000000..e426662d30e54
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Create products.
+ * 4. Create and setup customer.
+ * 5. Configure taxes.
+ *
+ * Steps:
+ * 1. Log in Storefront.
+ * 2. Add products to the cart.
+ * 3. Click the 'Proceed to Checkout' button.
+ * 4. Select shipping method.
+ * 5. Select payment method (use reward points and store credit if available).
+ * 6. Enter credit card data and select *Save credit card* checkbox.
+ * 7. Click Place Order button.
+ * 8. Reorder placed order.
+ * 9. Select stored cards as payment method.
+ * 10. Select any available payment token.
+ * 11. Place order.
+ *
+ * @group Order_Management
+ * @ZephyrId MAGETWO-54870, MAGETWO-54872
+ */
+class ReorderUsingVaultTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = 'extended_acceptance_test, 3rd_party_test';
+    const SEVERITY = 'S1';
+
+    /* end tags */
+
+    /**
+     * Reorders placed order on backend using vault.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
index 39332d9c657ab..fb8b3575ee72e 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
@@ -31,15 +31,15 @@
  * 12. Click Place Order button.
  * 13. Perform assertions.
  *
- * @group One_Page_Checkout_(CS)
+ * @group One_Page_Checkout
  * @ZephyrId MAGETWO-46530
  */
 class UseVaultOnCheckoutTest extends Scenario
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'CS';
     const TEST_TYPE = '3rd_party_test';
+    const SEVERITY = 'S0';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteCreditCardFromMyAccountStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteCreditCardFromMyAccountStep.php
index beb644a6ba224..c3cb46347dd8c 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteCreditCardFromMyAccountStep.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteCreditCardFromMyAccountStep.php
@@ -11,9 +11,12 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestStep\TestStepInterface;
-use Magento\Vault\Test\Constraint\AssertCreditCardDeletedMessage;
-use Magento\Vault\Test\Page\MyCreditCards;
+use Magento\Vault\Test\Constraint\AssertStoredPaymentDeletedMessage;
+use Magento\Vault\Test\Page\StoredPaymentMethods;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DeleteCreditCardFromMyAccountStep implements TestStepInterface
 {
     /**
@@ -42,43 +45,43 @@ class DeleteCreditCardFromMyAccountStep implements TestStepInterface
     private $creditCard;
 
     /**
-     * @var AssertCreditCardDeletedMessage
+     * @var AssertStoredPaymentDeletedMessage
      */
-    private $assertCreditCardDeletedMessage;
+    private $assertStoredPaymentDeletedMessage;
 
     /**
-     * @var $myCreditCardsPage
+     * @var StoredPaymentMethods
      */
-    private $myCreditCardsPage;
+    private $storedPaymentMethodsPage;
 
     /**
      * DeleteCreditCardFromMyAccountStep constructor.
      *
-     * @param MyCreditCards $myCreditCardsPage
+     * @param StoredPaymentMethods $storedPaymentMethodsPage
      * @param Customer $customer
      * @param ObjectManager $objectManager
      * @param CustomerAccountIndex $customerAccountIndex
      * @param FixtureFactory $fixtureFactory
-     * @param AssertCreditCardDeletedMessage $assertCreditCardDeletedMessage
+     * @param AssertStoredPaymentDeletedMessage $assertStoredPaymentDeletedMessage
      * @param array $creditCard
      * @param string $creditCardClass
      */
     public function __construct(
-        MyCreditCards $myCreditCardsPage,
+        StoredPaymentMethods $storedPaymentMethodsPage,
         Customer $customer,
         ObjectManager $objectManager,
         CustomerAccountIndex $customerAccountIndex,
         FixtureFactory $fixtureFactory,
-        AssertCreditCardDeletedMessage $assertCreditCardDeletedMessage,
+        AssertStoredPaymentDeletedMessage $assertStoredPaymentDeletedMessage,
         array $creditCard,
         $creditCardClass = 'credit_card'
     ) {
-        $this->myCreditCardsPage = $myCreditCardsPage;
+        $this->storedPaymentMethodsPage = $storedPaymentMethodsPage;
         $this->customer = $customer;
         $this->objectManager = $objectManager;
         $this->customerAccountIndex = $customerAccountIndex;
         $this->fixtureFactory = $fixtureFactory;
-        $this->assertCreditCardDeletedMessage = $assertCreditCardDeletedMessage;
+        $this->assertStoredPaymentDeletedMessage = $assertStoredPaymentDeletedMessage;
         $this->creditCard = $fixtureFactory->createByCode($creditCardClass, ['dataset' => $creditCard['dataset']]);
     }
 
@@ -93,18 +96,18 @@ public function run()
             \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
             ['customer' => $this->customer]
         )->run();
-        $this->customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Credit Cards');
-        $myCreditCardsBlock = $this->myCreditCardsPage->getCreditCardsBlock();
+        $this->customerAccountIndex->getAccountMenuBlock()->openMenuItem('Stored Payment Methods');
+        $storedPaymentsBlock = $this->storedPaymentMethodsPage->getStoredPaymentsBlock();
 
         $creditCardData = $this->creditCard->getData();
         $creditCardNumber = preg_grep('/([a-z]+)_number/', array_flip($creditCardData));
         $lastFourDigits = substr(key($creditCardNumber), -4, 4);
 
-        $availableCreditCards = $myCreditCardsBlock->getCreditCards();
+        $availableCreditCards = $storedPaymentsBlock->getCreditCards();
         if (key_exists($lastFourDigits, $availableCreditCards)) {
-            $myCreditCardsBlock->deleteCreditCard($availableCreditCards[$lastFourDigits]);
+            $storedPaymentsBlock->deleteCreditCard($availableCreditCards[$lastFourDigits]);
         }
-        $this->assertCreditCardDeletedMessage->processAssert($this->myCreditCardsPage);
+        $this->assertStoredPaymentDeletedMessage->processAssert($this->storedPaymentMethodsPage);
 
         return ['deletedCreditCard' => $lastFourDigits];
     }
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteStoredPaymentStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteStoredPaymentStep.php
new file mode 100644
index 0000000000000..b2b857f9e36d8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/DeleteStoredPaymentStep.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Test\TestStep;
+
+use Magento\Customer\Test\Page\CustomerAccountIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Vault\Test\Page\StoredPaymentMethods;
+
+class DeleteStoredPaymentStep implements TestStepInterface
+{
+    /**
+     * @var CustomerAccountIndex
+     */
+    private $customerAccountIndex;
+
+    /**
+     * @var StoredPaymentMethods
+     */
+    private $storedPaymentMethodsPage;
+
+    /**
+     * DeleteStoredPaymentStep constructor.
+     *
+     * @param StoredPaymentMethods $storedPaymentMethodsPage
+     * @param CustomerAccountIndex $customerAccountIndex
+     */
+    public function __construct(
+        StoredPaymentMethods $storedPaymentMethodsPage,
+        CustomerAccountIndex $customerAccountIndex
+    ) {
+        $this->storedPaymentMethodsPage = $storedPaymentMethodsPage;
+        $this->customerAccountIndex = $customerAccountIndex;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @return array
+     */
+    public function run()
+    {
+        $this->customerAccountIndex->open();
+        $this->customerAccountIndex->getAccountMenuBlock()->openMenuItem('Stored Payment Methods');
+        $storedPaymentsBlock = $this->storedPaymentMethodsPage->getStoredPaymentsBlock();
+        $storedPaymentsBlock->deleteStoredPayment();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php
new file mode 100644
index 0000000000000..1470bde4f77e5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Vault\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Select saved payment.
+ */
+class UseSavedPaymentMethodStep implements TestStepInterface
+{
+    /**
+     * Onepage checkout page.
+     *
+     * @var CheckoutOnepage
+     */
+    protected $checkoutOnepage;
+
+    /**
+     * Vault provider.
+     *
+     * @var array
+     */
+    protected $vault;
+
+    /**
+     * @constructor
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param array $vault
+     */
+    public function __construct (CheckoutOnepage $checkoutOnepage, array $vault)
+    {
+        $this->checkoutOnepage = $checkoutOnepage;
+        $this->vault = $vault;
+    }
+
+    /**
+     * Run step that selects saved credit card.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->checkoutOnepage->getPaymentBlock()->selectPaymentMethod($this->vault);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseVaultPaymentTokenStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseVaultPaymentTokenStep.php
index ad693923955d4..066dc7786d892 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseVaultPaymentTokenStep.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseVaultPaymentTokenStep.php
@@ -17,20 +17,20 @@ class UseVaultPaymentTokenStep implements TestStepInterface
      * @var OrderCreateIndex
      */
     private $orderCreatePage;
-    
+
     /**
      * @var array
      */
-    private $payment;
+    private $vault;
 
     /**
      * @param OrderCreateIndex $orderCreateIndex
-     * @param array $payment
+     * @param array $vault
      */
-    public function __construct(OrderCreateIndex $orderCreateIndex, array $payment)
+    public function __construct(OrderCreateIndex $orderCreateIndex, array $vault)
     {
         $this->orderCreatePage = $orderCreateIndex;
-        $this->payment = $payment;
+        $this->vault = $vault;
     }
 
     /**
@@ -39,8 +39,7 @@ public function __construct(OrderCreateIndex $orderCreateIndex, array $payment)
     public function run()
     {
         $block = $this->orderCreatePage->getCreateBlock();
-        $this->payment['method'] .= '_cc_vault';
-        $block->selectPaymentMethod($this->payment);
-        $block->selectVaultToken('token_switcher_' . $this->payment['method']);
+        $block->selectPaymentMethod($this->vault);
+        $block->selectVaultToken('token_switcher_' . $this->vault['method']);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml
new file mode 100644
index 0000000000000..aba54057312ea
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout">
+        <arguments>
+            <argument name="severity" xsi:type="string">S2</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Vault\Test\Constraint\AssertStoredPaymentDeletedMessage">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
index a804e4ac34555..cd34b96648208 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
@@ -23,8 +23,8 @@
         <step name="addProductsToTheCartVault" alias="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTaxVault" />
         <step name="estimateShippingAndTaxVault" alias="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckoutVault" />
         <step name="clickProceedToCheckoutVault" alias="clickProceedToCheckout" module="Magento_Checkout" next="fillShippingMethodVault" />
-        <step name="fillShippingMethodVault" alias="fillShippingMethod" module="Magento_Checkout" next="useSavedCreditCard" />
-        <step name="useSavedCreditCard" module="Magento_Vault" next="placeOrderVault" />
+        <step name="fillShippingMethodVault" alias="fillShippingMethod" module="Magento_Checkout" next="useSavedPaymentMethod" />
+        <step name="useSavedPaymentMethod" module="Magento_Vault" next="placeOrderVault" />
         <step name="placeOrderVault" alias="placeOrder" module="Magento_Checkout" />
     </scenario>
     <scenario name="CreateVaultOrderBackendTest" firstStep="setupConfiguration">
@@ -37,7 +37,8 @@
         <step name="selectStore" module="Magento_Sales" next="addProducts" />
         <step name="addProducts" module="Magento_Sales" next="fillAccountInformation" />
         <step name="fillAccountInformation" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="saveCreditCardOnBackend" />
         <step name="saveCreditCardOnBackend" module="Magento_Vault" next="submitOrder" />
         <step name="submitOrder" module="Magento_Sales" next="reorder" />
@@ -45,4 +46,22 @@
         <step name="useVaultPaymentToken" module="Magento_Vault" next="submitOrderWithVault" />
         <step name="submitOrderWithVault" alias="submitOrder" module="Magento_Sales" />
     </scenario>
+    <scenario name="ReorderUsingVaultTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax" />
+        <step name="estimateShippingAndTax" module="Magento_Checkout" next="clickProceedToCheckout" />
+        <step name="clickProceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
+        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="openOrder" />
+        <step name="openOrder" module="Magento_Sales" next="reorder" />
+        <step name="reorder" module="Magento_Sales" next="useVaultPaymentToken" />
+        <step name="useVaultPaymentToken" module="Magento_Vault" next="submitOrder" />
+        <step name="submitOrder" module="Magento_Sales" />
+    </scenario>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Block/Form/ContainerTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Block/Form/ContainerTest.php
new file mode 100644
index 0000000000000..a805e9ab1f3a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Block/Form/ContainerTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Block\Form;
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Framework\App\Area;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Payment\Block\Form\Container;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class ContainerTest
+ */
+class ContainerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Bootstrap
+     */
+    private $bootstrap;
+
+    /**
+     * @var Container
+     */
+    private $container;
+
+    protected function setUp()
+    {
+        $this->bootstrap = Bootstrap::getInstance();
+        $this->bootstrap->loadArea(Area::AREA_ADMINHTML);
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->container = $this->objectManager->create(Container::class);
+    }
+
+    /**
+     * @covers \Magento\Payment\Block\Form\Container::getMethods
+     * @magentoDataFixture Magento/Braintree/_files/paypal_quote.php
+     */
+    public function testGetMethods()
+    {
+        $customerId = 1;
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $quote = $quoteRepository->getForCustomer($customerId);
+        $this->container->setData('quote', $quote);
+        $actual = $this->container->getMethods();
+        /** @var MethodInterface $paymentMethod */
+        foreach ($actual as $paymentMethod) {
+            static::assertNotContains($paymentMethod->getCode(), [
+                PayPalConfigProvider::PAYPAL_VAULT_CODE, PayPalConfigProvider::PAYPAL_CODE
+            ]);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Block/VaultTokenRendererTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Block/VaultTokenRendererTest.php
new file mode 100644
index 0000000000000..74b99e7e3850c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Block/VaultTokenRendererTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Block;
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\Customer\AccountTokens;
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+
+/**
+ * Class VaultTokenRendererTest
+ */
+class VaultTokenRendererTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var AccountTokens
+     */
+    private $tokenBlock;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+    
+    protected function setUp()
+    {
+        $bootstrap = Bootstrap::getInstance();
+        $bootstrap->loadArea(Area::AREA_FRONTEND);
+        $this->objectManager = Bootstrap::getObjectManager();
+        
+        $this->tokenBlock = $this->objectManager->get(AccountTokens::class);
+    }
+
+    /**
+     * @covers \Magento\Vault\Block\Customer\AccountTokens::getPaymentTokens
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     */
+    public function testGetPaymentTokens()
+    {
+        $customerId = 1;
+        $token = 'mx29vk';
+
+        /** @var Session $session */
+        $session = $this->objectManager->get(Session::class);
+        $session->setCustomerId($customerId);
+
+        $tokens = $this->tokenBlock->getPaymentTokens();
+
+        static::assertCount(1, $tokens);
+
+        /** @var PaymentTokenInterface $vaultToken */
+        $vaultToken = array_pop($tokens);
+
+        static::assertTrue($vaultToken->getIsActive());
+        static::assertTrue($vaultToken->getIsVisible());
+        static::assertEquals($token, $vaultToken->getGatewayToken());
+        static::assertEquals(ConfigProvider::PAYPAL_CODE, $vaultToken->getPaymentMethodCode());
+        static::assertEquals(AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT, $vaultToken->getType());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
new file mode 100644
index 0000000000000..f319a52e42743
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Controller\Adminhtml\Order;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Payment\Model\Method\Adapter;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Class PaymentReviewTest
+ */
+class PaymentReviewTest extends AbstractBackendController
+{
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        /** @var FilterBuilder $filterBuilder */
+        $filterBuilder = $this->_objectManager->get(FilterBuilder::class);
+        $filters = [
+            $filterBuilder->setField(OrderInterface::INCREMENT_ID)
+                ->setValue('100000002')
+                ->create()
+        ];
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilters($filters)
+            ->create();
+
+        $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $orders = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+        /** @var OrderInterface $order */
+        $this->order = array_pop($orders);
+    }
+
+    /**
+     * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute
+     * @magentoDataFixture Magento/Braintree/_files/fraud_order.php
+     * @magentoAppArea adminhtml
+     */
+    public function testExecuteAccept()
+    {
+        $orderId = $this->order->getEntityId();
+        $this->dispatch('backend/sales/order/reviewPayment/action/accept/order_id/' . $orderId);
+
+        static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId));
+        static::assertSessionMessages(
+            static::equalTo(['The payment has been accepted.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        $order = $this->orderRepository->get($orderId);
+        static::assertEquals(Order::STATE_PROCESSING, $order->getState());
+        static::assertEquals(Order::STATE_PROCESSING, $order->getStatus());
+    }
+
+    /**
+     * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute
+     * @magentoDataFixture Magento/Braintree/_files/fraud_order.php
+     * @magentoAppArea adminhtml
+     */
+    public function testExecuteDeny()
+    {
+        $orderId = $this->order->getEntityId();
+        $payment = $this->order->getPayment();
+
+        $adapter = $this->getMockBuilder(Adapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['denyPayment'])
+            ->getMock();
+        // uses the mock instead a real adapter to avoid api calls to Braintree gateway
+        $payment->setMethodInstance($adapter);
+        $this->orderRepository->save($this->order);
+
+        $adapter->expects(static::once())
+            ->method('denyPayment')
+            ->with($payment)
+            ->willReturn(true);
+
+        $this->dispatch('backend/sales/order/reviewPayment/action/deny/order_id/' . $orderId);
+
+        static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId));
+        static::assertSessionMessages(
+            static::equalTo(['The payment has been denied.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        $order = $this->orderRepository->get($orderId);
+        static::assertEquals(Order::STATE_CANCELED, $order->getState());
+        static::assertEquals(Order::STATE_CANCELED, $order->getStatus());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Cards/DeleteActionTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Cards/DeleteActionTest.php
new file mode 100644
index 0000000000000..9e79c0e3f326f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Cards/DeleteActionTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Controller\Cards;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Vault\Model\CustomerTokenManagement;
+use Zend\Http\Request;
+
+/**
+ * Class DeleteActionTest
+ */
+class DeleteActionTest extends AbstractController
+{
+    /**
+     * @covers \Magento\Vault\Controller\Cards\DeleteAction::execute
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     */
+    public function testExecute()
+    {
+        $customerId = 1;
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->setCustomerId($customerId);
+        
+        /** @var CustomerTokenManagement $tokenManagement */
+        $tokenManagement = $this->_objectManager->get(CustomerTokenManagement::class);
+        $tokens = $tokenManagement->getCustomerSessionTokens();
+
+        static::assertCount(1, $tokens);
+
+        $vaultToken = array_pop($tokens);
+
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $this->getRequest()
+            ->setPostValue([
+                'public_hash' => $vaultToken->getPublicHash(),
+                'form_key' => $formKey->getFormKey()
+            ])
+            ->setMethod(Request::METHOD_POST);
+        $this->dispatch('vault/cards/deleteaction');
+        
+        static::assertTrue($this->getResponse()->isRedirect());
+        static::assertRedirect(static::stringContains('vault/cards/listaction'));
+        static::assertSessionMessages(static::equalTo(['Stored Payment Method was successfully removed']));
+        static::assertEmpty($tokenManagement->getCustomerSessionTokens());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/PaymentMethodListTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/PaymentMethodListTest.php
new file mode 100644
index 0000000000000..0e38adda5498f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/PaymentMethodListTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model;
+
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Vault\Api\PaymentMethodListInterface;
+use Magento\Vault\Model\VaultPaymentInterface;
+
+/**
+ * Contains tests for vault payment list methods
+ */
+class PaymentMethodListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PaymentMethodListInterface
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var int
+     */
+    private $storeId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->storeId = $objectManager->get(StoreManagerInterface::class)
+            ->getStore()
+            ->getId();
+        $this->paymentMethodList = $objectManager->get(PaymentMethodListInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Braintree/_files/payments.php
+     */
+    public function testGetList()
+    {
+        $vaultPayments = $this->paymentMethodList->getList($this->storeId);
+
+        static::assertNotEmpty($vaultPayments);
+
+        $paymentCodes = array_map(function (VaultPaymentInterface $payment) {
+            return $payment->getCode();
+        }, $vaultPayments);
+
+        $expectedCodes = [
+            PayPalConfigProvider::PAYPAL_VAULT_CODE,
+            ConfigProvider::CC_VAULT_CODE
+        ];
+        static::assertNotEmpty(array_intersect($expectedCodes, $paymentCodes));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Braintree/_files/payments.php
+     */
+    public function testGetActiveList()
+    {
+        $vaultPayments = $this->paymentMethodList->getActiveList($this->storeId);
+
+        static::assertNotEmpty($vaultPayments);
+        static::assertCount(1, $vaultPayments);
+        $payment = array_pop($vaultPayments);
+        static::assertEquals(PayPalConfigProvider::PAYPAL_VAULT_CODE, $payment->getCode());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
new file mode 100644
index 0000000000000..e79f4ad361e36
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Ui\Adminhtml\PayPal;
+
+use Magento\Braintree\Model\Ui\Adminhtml\PayPal\TokenUiComponentProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
+/**
+ * Contains tests for PayPal token Ui component provider
+ */
+class TokenUiComponentProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var TokenUiComponentProvider
+     */
+    private $tokenComponentProvider;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->tokenComponentProvider = $this->objectManager->get(TokenUiComponentProvider::class);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Model\Ui\Adminhtml\PayPal\TokenUiComponentProvider::getComponentForToken
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     * @magentoAppArea adminhtml
+     */
+    public function testGetComponentForToken()
+    {
+        $customerId = 1;
+        $token = 'mx29vk';
+        $payerEmail = 'john.doe@example.com';
+
+        /** @var PaymentTokenManagement $tokenManagement */
+        $tokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
+        $paymentToken = $tokenManagement->getByGatewayToken($token, ConfigProvider::PAYPAL_CODE, $customerId);
+
+        $component = $this->tokenComponentProvider->getComponentForToken($paymentToken);
+        $config = $component->getConfig();
+
+        static::assertNotEmpty($config[TokenUiComponentProviderInterface::COMPONENT_DETAILS]);
+        static::assertNotEmpty($config[TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH]);
+        static::assertEquals(ConfigProvider::PAYPAL_VAULT_CODE, $config['code']);
+
+        $details = $config[TokenUiComponentProviderInterface::COMPONENT_DETAILS];
+        static::assertEquals($payerEmail, $details['payerEmail']);
+        static::assertNotEmpty($details['icon']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/TokensConfigProviderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/TokensConfigProviderTest.php
new file mode 100644
index 0000000000000..440f7674f1227
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/Ui/TokensConfigProviderTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Ui;
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\TokenUiComponentProvider;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Model\Ui\TokensConfigProvider;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class TokensConfigProviderTest
+ */
+class TokensConfigProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var TokenUiComponentProviderInterface|MockObject
+     */
+    private $tokenComponentProvider;
+
+    /**
+     * @var TokensConfigProvider
+     */
+    private $configProvider;
+
+    /**
+     * @var Bootstrap
+     */
+    private $bootstrap;
+
+    protected function setUp()
+    {
+        $this->bootstrap = Bootstrap::getInstance();
+        $this->bootstrap->loadArea(Area::AREA_FRONTEND);
+        $this->objectManager = Bootstrap::getObjectManager();
+        
+        $this->tokenComponentProvider = $this->objectManager->get(TokenUiComponentProvider::class);
+        
+        $this->configProvider = $this->objectManager->create(
+            TokensConfigProvider::class,
+            [
+                'tokenUiComponentProviders' => [
+                    PayPalConfigProvider::PAYPAL_CODE => $this->tokenComponentProvider
+                ]
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\Vault\Model\Ui\TokensConfigProvider::getConfig
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     */
+    public function testGetConfig()
+    {
+        $customerId = 1;
+        $token = 'mx29vk';
+        $payerEmail = 'john.doe@example.com';
+
+        /** @var PaymentTokenManagement $tokenManagement */
+        $tokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
+        $paymentToken = $tokenManagement->getByGatewayToken($token, PayPalConfigProvider::PAYPAL_CODE, $customerId);
+        $item = PayPalConfigProvider::PAYPAL_VAULT_CODE . '_' . $paymentToken->getEntityId();
+
+        /** @var Session $session */
+        $session = $this->objectManager->get(Session::class);
+        $session->setCustomerId($customerId);
+
+        $actual = $this->configProvider->getConfig()['payment']['vault'];
+        static::assertCount(1, $actual);
+        static::assertNotEmpty($actual[$item]);
+        static::assertEquals(PayPalConfigProvider::PAYPAL_VAULT_CODE, $actual[$item]['config']['code']);
+        static::assertEquals($payerEmail, $actual[$item]['config']['details']['payerEmail']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php
new file mode 100644
index 0000000000000..ebbce2682ce45
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Config\Model\Config;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Config $config */
+$config = $objectManager->get(Config::class);
+$config->setDataByPath('payment/' . ConfigProvider::CODE . '/active', 1);
+$config->save();
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE)
+    ->setLastTransId('000001');
+
+$amount = 100;
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000002')
+    ->setState(Order::STATE_PAYMENT_REVIEW)
+    ->setStatus(Order::STATUS_FRAUD)
+    ->setBaseGrandTotal($amount)
+    ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/payments.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/payments.php
new file mode 100644
index 0000000000000..99ff4481f2982
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/payments.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Config\Model\Config;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Config $config */
+$config = $objectManager->get(Config::class);
+$config->setDataByPath('payment/' . ConfigProvider::PAYPAL_CODE . '/active', 1);
+$config->save();
+$config->setDataByPath('payment/' . ConfigProvider::PAYPAL_VAULT_CODE . '/active', 1);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php
new file mode 100644
index 0000000000000..b1a6d56d299e1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+require __DIR__ . '/paypal_vault_token.php';
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+/** @var CartInterface $quote */
+$quote = $objectManager->get(CartInterface::class);
+$quote->setStoreId($storeManager->getStore()->getId())
+    ->setCustomerIsGuest(false)
+    ->setCustomerId($customer->getId());
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_vault_token.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_vault_token.php
new file mode 100644
index 0000000000000..572e7ec64ac92
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_vault_token.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Config\Model\Config;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Vault\Model\AccountPaymentTokenFactory;
+use Magento\Vault\Model\PaymentToken;
+use Magento\Vault\Model\PaymentTokenRepository;
+
+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+
+/** @var Config $config */
+$config = $objectManager->get(Config::class);
+$config->setDataByPath('payment/' . ConfigProvider::PAYPAL_CODE . '/active', 1);
+$config->save();
+$config->setDataByPath('payment/' . ConfigProvider::PAYPAL_VAULT_CODE . '/active', 1);
+$config->save();
+
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+
+/** @var PaymentToken $paymentToken */
+$paymentToken = $objectManager->create(PaymentToken::class);
+$paymentToken
+    ->setCustomerId($customer->getId())
+    ->setPaymentMethodCode(ConfigProvider::PAYPAL_CODE)
+    ->setType(AccountPaymentTokenFactory::TOKEN_TYPE_ACCOUNT)
+    ->setGatewayToken('mx29vk')
+    ->setPublicHash($encryptor->hash($customer->getId()))
+    ->setTokenDetails(json_encode(['payerEmail' => 'john.doe@example.com']))
+    ->setIsActive(true)
+    ->setIsVisible(true)
+    ->setExpiresAt(date('Y-m-d H:i:s', strtotime('+1 year')));
+
+/** @var PaymentTokenRepository $tokenRepository */
+$tokenRepository = $objectManager->create(PaymentTokenRepository::class);
+$tokenRepository->save($paymentToken);
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php b/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
index aadbe9081da47..a3331bd20fe34 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Payment\Block\Transparent;
 
+use Magento\Payment\Block\Transparent\Iframe;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Class IframeTest
  * @package Magento\Payment\Block\Transparent
@@ -19,11 +23,9 @@ class IframeTest extends \PHPUnit_Framework_TestCase
     public function testToHtml($xssString)
     {
         /** @var $block Iframe */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\View\LayoutInterface'
-        )->createBlock(
-            'Magento\Payment\Block\Transparent\Iframe'
-        );
+        $block = Bootstrap::getObjectManager()
+            ->get(LayoutInterface::class)
+            ->createBlock(Iframe::class);
 
         $block->setTemplate('transparent/iframe.phtml');
         $block->setData(
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
index 633434d307487..6d77816d26292 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
@@ -5,14 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config/etc/system_file.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="paypal_notice" translate="label" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup</help_url>
-            </group>
-            <group id="account" translate="label" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
+            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Merchant Location</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -24,6 +20,21 @@
                     <config_path>paypal/general/merchant_country</config_path>
                 </field>
             </group>
+            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Recommended Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+            </group>
+            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other PayPal Payment Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
+            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other Payment Methods:</label>
+                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
             <include path="Magento_Paypal::system/paypal_payflowpro.xml"/>
@@ -33,24 +44,38 @@
             <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
                 <group id="pphs_required_settings">
                     <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                     <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
                 </group>
             </group>
         </section>
-        <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+        <section id="payment_us" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                    <attribute type="shared">0</attribute>
+                    <attribute type="activity_path">payment/paypal_express/active</attribute>
+                    <attribute type="activity_path">payment/payflow_express/active</attribute>
+                    <attribute type="displayIn">recommended_solutions</attribute>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <include path="Magento_Paypal::system/payflow_advanced.xml"/>
-                <group id="wpp_usuk" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-                    <label>Payments Pro (Includes Express Checkout)</label>
+                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
+                    <label>Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <field id="enable_paypal_payflow">
                             <attribute type="shared">0</attribute>
@@ -68,10 +93,15 @@
                     <label>Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Payments Standard</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
@@ -84,46 +114,45 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_payment_gateways" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Payment Gateways</label>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Process payments using your own internet merchant account.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <include path="Magento_Paypal::system/paypal_payflowpro_with_express_checkout.xml"/>
                 <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
-                    <attribute type="shared">0</attribute>
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                </group>
-            </group>
         </section>
         <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
+                    <group id="express_checkout_required">
+                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
+                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
+                    </group>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <group id="wpp_usuk" translate="comment" sortOrder="20">
                     <fieldset_css>pp-general-uk</fieldset_css>
-                    <more_url>https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm</more_url>
                     <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
                     <comment>Accept payments with a completely customizable checkout page.</comment>
                     <group id="wpp_required_settings">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                 </group>
@@ -132,10 +161,16 @@
                     <label>Website Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
@@ -147,32 +182,19 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
         </section>
         <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="express_checkout_de" extends="payment_all_paypal/express_checkout">
+            <group id="paypal_payment_solutions" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <group id="express_checkout_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                     <group id="settings_ec">
@@ -184,49 +206,86 @@
             </group>
         </section>
         <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>PayPal Express Checkout</label>
+                <fieldset_css>complex paypal-express-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                 <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout">
+                <attribute type="displayIn">recommended_solutions</attribute>
+                <group id="express_checkout_required">
+                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
+                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Choose a secure bundled payment solution for your business.</comment>
+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
+                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Website Payments Standard</label>
+                    <fieldset_css>complex</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                     <group id="settings_ec">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
                     </group>
                 </group>
-                <group id="express_checkout_other" extends="payment_all_paypal/express_checkout">
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
+            </group>
+            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Process payments using your own internet merchant account.</comment>
+                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
             </group>
         </section>
         <section id="payment_ca" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other">
+                <attribute type="activity_path">payment/paypal_express/active</attribute>
+                <attribute type="activity_path">payment/payflow_express/active</attribute>
+            </group>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="20"/>
-                <group id="wpp_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20">
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
                     <label>Website Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <group id="paypal_payflow_api_settings">
                             <label>Payments Pro</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_paypal_payflow">
                             <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
                             <attribute type="shared">0</attribute>
@@ -238,75 +297,76 @@
                         <label>Basic Settings - PayPal Payments Pro</label>
                     </group>
                 </group>
-                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30"/>
-                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="40">
+                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
+                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
                     <group id="payflow_link_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                 </group>
-                <group id="express_checkout_other" sortOrder="50">
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                </group>
             </group>
         </section>
         <section id="payment_au" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="10"/>
-                <group id="express_checkout_other" sortOrder="40"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other" sortOrder="12"/>
+                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
                 <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30"/>
             </group>
         </section>
         <section id="payment_jp" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Website Payments Plus</label>
                 </group>
             </group>
         </section>
         <section id="payment_fr" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Integral Evolution</label>
                 </group>
             </group>
         </section>
         <section id="payment_it" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pro</label>
                 </group>
             </group>
         </section>
         <section id="payment_es" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pasarela integral</label>
                 </group>
             </group>
         </section>
         <section id="payment_hk" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
             </group>
         </section>
         <section id="payment_nz" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
-                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro" sortOrder="10"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
             </group>
         </section>
     </system>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 61d9f6f2a475c..19feb33748c84 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -5,14 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config/etc/system_file.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="paypal_notice" translate="label" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup</help_url>
-            </group>
-            <group id="account" translate="label" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
+            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Merchant Location</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -24,16 +20,34 @@
                     <config_path>paypal/general/merchant_country</config_path>
                 </field>
             </group>
+            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Recommended Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+            </group>
+            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other PayPal Payment Solutions:</label>
+                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
+            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Other Payment Methods:</label>
+                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
             <group id="paypal_payflowpro" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                 <label>Payflow Pro</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>pp-method-payflow</fieldset_css>
-                <comment>Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.</comment>
+                <fieldset_css>paypal-other-section</fieldset_css>
+                <comment><![CDATA[Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
                 <attribute type="activity_path">payment/payflowpro/active</attribute>
-                <more_url>https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS</more_url>
                 <attribute type="paypal_ec_separate">1</attribute>
+                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                </group>
                 <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Required PayPal Settings</label>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -101,7 +115,7 @@
                         </requires>
                     </field>
                     <field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault enabled</label>
+                        <label>Vault Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>payment/payflowpro_cc_vault/active</config_path>
                         <attribute type="shared">1</attribute>
@@ -234,12 +248,15 @@
                 </group>
             </group>
             <group id="payflow_link" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                <label>Payflow Link (Includes Express Checkout)</label>
+                <label>Payflow Link</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>pp-method-payflow</fieldset_css>
-                <comment>Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.</comment>
+                <fieldset_css>paypal-other-section</fieldset_css>
+                <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
                 <attribute type="activity_path">payment/payflow_link/active</attribute>
-                <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payflow-link?partner_id=NB9WWHYEMVUMS</more_url>
+                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                </group>
                 <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Required PayPal Settings</label>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -562,10 +579,13 @@
             <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                 <label>Express Checkout</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>pp-method-express</fieldset_css>
+                <fieldset_css>paypal-other-section</fieldset_css>
                 <comment>Add PayPal as an additional payment method to your checkout page.</comment>
                 <attribute type="activity_path">payment/paypal_express/active</attribute>
-                <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-express-checkout?partner_id=NB9WWHYEMVUMS</more_url>
+                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                </group>
                 <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Required PayPal Settings</label>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -573,7 +593,8 @@
                         <label>Express Checkout</label>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                         <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
-                            <label>Email Associated with PayPal Merchant Account</label>
+                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
+                            <frontend_class>not-required</frontend_class>
                             <comment>
                                 <![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
                             </comment>
@@ -1200,11 +1221,15 @@
             </group>
             <group id="payments_pro_hosted_solution" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                 <label>Website Payments Pro Hosted Solution</label>
-                <fieldset_css>pp-method-general</fieldset_css>
+                <fieldset_css>paypal-other-section</fieldset_css>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                 <attribute type="activity_path">payment/hosted_pro/active</attribute>
-                <comment>Accept payments with a PCI compliant checkout that keeps customers on your site.</comment>
+                <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
                 <attribute type="paypal_ec_separate">1</attribute>
+                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                </group>
                 <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Required PayPal Settings</label>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -1406,27 +1431,28 @@
             <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
                 <group id="pphs_required_settings">
                     <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                     <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
                 </group>
             </group>
         </section>
         <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <group id="payflow_advanced" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                    <label>Payments Advanced (Includes Express Checkout)</label>
-                    <fieldset_css>pp-method-general</fieldset_css>
+                    <label>Payments Advanced</label>
+                    <fieldset_css>paypal-other-section</fieldset_css>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payments-advanced?partner_id=NB9WWHYEMVUMS</more_url>
-                    <comment>Accept payments with a PCI-compliant checkout that keeps customers on your site.</comment>
+                    <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
                     <attribute type="activity_path">payment/payflow_advanced/active</attribute>
+                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
+                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                    </group>
                     <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Required PayPal Settings</label>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
@@ -1734,9 +1760,12 @@
                         <group id="settings_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
                     </group>
                 </group>
-                <group id="wpp_usuk" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-                    <label>Payments Pro (Includes Express Checkout)</label>
+                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
+                    <label>Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <field id="enable_paypal_payflow">
                             <attribute type="shared">0</attribute>
@@ -1754,7 +1783,12 @@
                     <label>Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <group id="express_checkout_required_express_checkout">
                             <label>Payments Standard</label>
                         </group>
@@ -1770,14 +1804,13 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_payment_gateways" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Payment Gateways</label>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Process payments using your own internet merchant account.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
-                    <label>Payflow Pro (Includes Express Checkout)</label>
+                    <label>Payflow Pro</label>
                     <attribute type="paypal_ec_separate">0</attribute>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Required PayPal Settings</label>
@@ -2004,44 +2037,40 @@
                 </group>
                 <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
                     <attribute type="shared">0</attribute>
                     <attribute type="activity_path">payment/paypal_express/active</attribute>
                     <attribute type="activity_path">payment/payflow_express/active</attribute>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                 </group>
             </group>
         </section>
         <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>
-                    <![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]>
-                </label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <comment>Choose a secure bundled payment solution for your business.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
                 <group id="wpp_usuk" translate="comment" sortOrder="20">
                     <fieldset_css>pp-general-uk</fieldset_css>
-                    <more_url>https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm</more_url>
                     <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
                     <comment>Accept payments with a completely customizable checkout page.</comment>
                     <group id="wpp_required_settings">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                 </group>
-                <group id="payments_pro_hosted_solution_with_express_checkout" translate="labelcomment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
-                    <label>Website Payments Pro Hosted Solution (Includes Express Checkout)</label>
-                    <fieldset_css>pp-general-uk</fieldset_css>
-                    <more_url>https://cms.paypal.com/cms_content/GB/en_GB/files/developer/HostedSolution.pdf</more_url>
+                <group id="payments_pro_hosted_solution_with_express_checkout" translate="label comment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
+                    <label>Website Payments Pro Hosted Solution</label>
                     <attribute type="paypal_ec_separate">0</attribute>
                     <group id="pphs_required_settings">
                         <group id="pphs_required_settings_pphs" translate="label">
@@ -2114,6 +2143,9 @@
                     <label>Website Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
@@ -2121,6 +2153,9 @@
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
@@ -2129,15 +2164,16 @@
                     </group>
                 </group>
             </group>
-            <group id="paypal_alternative_payment_methods" translate="label comment attribute" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <group id="express_checkout_us" extends="payment_all_paypal/express_checkout">
+            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <group id="express_checkout_required">
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
@@ -2145,16 +2181,17 @@
             </group>
         </section>
         <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="express_checkout_de" extends="payment_all_paypal/express_checkout">
+            <group id="paypal_payment_solutions" showInDefault="0" showInWebsite="0" showInStore="0" sortOrder="5">
+                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>PayPal Express Checkout</label>
+                    <fieldset_css>complex paypal-express-section</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
+                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <group id="express_checkout_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                     <group id="settings_ec">
@@ -2166,49 +2203,86 @@
             </group>
         </section>
         <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>PayPal Payment Solutions</label>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
+            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>PayPal Express Checkout</label>
+                <fieldset_css>complex paypal-express-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                 <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout">
+                <attribute type="displayIn">recommended_solutions</attribute>
+                <group id="express_checkout_required">
+                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
+                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
+                </group>
+            </group>
+            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Choose a secure bundled payment solution for your business.</comment>
+                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
+                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Website Payments Standard</label>
+                    <fieldset_css>complex</fieldset_css>
+                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
+                    </group>
                     <group id="express_checkout_required">
                         <group id="express_checkout_required_express_checkout">
                             <label>Website Payments Standard</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                     <group id="settings_ec">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
                     </group>
                 </group>
-                <group id="express_checkout_other" extends="payment_all_paypal/express_checkout">
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
+            </group>
+            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <comment>Process payments using your own internet merchant account.</comment>
+                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
+                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
             </group>
         </section>
         <section id="payment_ca" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other">
+                <attribute type="activity_path">payment/paypal_express/active</attribute>
+                <attribute type="activity_path">payment/payflow_express/active</attribute>
+            </group>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="20"/>
-                <group id="wpp_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20">
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
+                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
                     <label>Website Payments Pro</label>
                     <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
+                    <group id="configuration_details">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
+                    </group>
                     <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <group id="paypal_payflow_api_settings">
                             <label>Payments Pro</label>
                         </group>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_paypal_payflow">
                             <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
                             <attribute type="shared">0</attribute>
@@ -2220,75 +2294,76 @@
                         <label>Basic Settings - PayPal Payments Pro</label>
                     </group>
                 </group>
-                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30"/>
-                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="40">
+                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
+                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
                     <group id="payflow_link_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
+                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
                 </group>
-                <group id="express_checkout_other" sortOrder="50">
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                </group>
             </group>
         </section>
         <section id="payment_au" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="10"/>
-                <group id="express_checkout_other" sortOrder="40"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other" sortOrder="12"/>
+                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
                 <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30"/>
             </group>
         </section>
         <section id="payment_jp" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Website Payments Plus</label>
                 </group>
             </group>
         </section>
         <section id="payment_fr" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Integral Evolution</label>
                 </group>
             </group>
         </section>
         <section id="payment_it" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pro</label>
                 </group>
             </group>
         </section>
         <section id="payment_es" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
                     <label>Pasarela integral</label>
                 </group>
             </group>
         </section>
         <section id="payment_hk" extends="payment_other">
-            <group id="paypal_payment_solutions">
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
                 <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
             </group>
         </section>
         <section id="payment_nz" extends="payment_other">
-            <group id="paypal_payment_solutions">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="express_checkout_other" sortOrder="30"/>
-                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro" sortOrder="10"/>
+            <group id="express_checkout_other"/>
+            <group id="paypal_group_all_in_one">
+                <group id="wps_other"/>
+            </group>
+            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
             </group>
         </section>
     </system>
diff --git a/dev/tests/integration/testsuite/Magento/Vault/Model/PaymentTokenRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Vault/Model/PaymentTokenRepositoryTest.php
new file mode 100644
index 0000000000000..257bd36d26c09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Vault/Model/PaymentTokenRepositoryTest.php
@@ -0,0 +1,80 @@
+<?php
+/***
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
+
+/**
+ * Class PaymentTokenRepositoryTest
+ * @package Magento\Vault\Model
+ * @magentoDbIsolation enabled
+ */
+class PaymentTokenRepositoryTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var  PaymentTokenRepository */
+    private $repository;
+
+    /** @var  SortOrderBuilder */
+    private $sortOrderBuilder;
+
+    /** @var FilterBuilder */
+    private $filterBuilder;
+
+    /** @var SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    public function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->repository = $objectManager->create(PaymentTokenRepository::class);
+        $this->searchCriteriaBuilder = $objectManager->create(
+            \Magento\Framework\Api\SearchCriteriaBuilder::class
+        );
+        $this->filterBuilder = $objectManager->get(
+            \Magento\Framework\Api\FilterBuilder::class
+        );
+        $this->sortOrderBuilder = $objectManager->get(
+            \Magento\Framework\Api\SortOrderBuilder::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Vault/_files/payment_tokens.php
+     */
+    public function testGetListWithMultipleFiltersAndSorting()
+    {
+        $filter1 = $this->filterBuilder
+            ->setField('type')
+            ->setValue('simple')
+            ->create();
+        $filter2 = $this->filterBuilder
+            ->setField('is_active')
+            ->setValue(1)
+            ->create();
+        $filter3 = $this->filterBuilder
+            ->setField('expires_at')
+            ->setConditionType('lt')
+            ->setValue('2016-11-04 10:18:15')
+            ->create();
+        $sortOrder = $this->sortOrderBuilder
+            ->setField('public_hash')
+            ->setDirection('DESC')
+            ->create();
+
+        $this->searchCriteriaBuilder->addFilters([$filter1, $filter2]);
+        $this->searchCriteriaBuilder->addFilters([$filter3]);
+        $this->searchCriteriaBuilder->addSortOrder($sortOrder);
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        /** @var \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface $result */
+        $result = $this->repository->getList($searchCriteria);
+        $items = $result->getItems();
+        $this->assertCount(2, $items);
+        $this->assertEquals('first', array_shift($items)->getPaymentMethodCode());
+        $this->assertEquals('second', array_shift($items)->getPaymentMethodCode());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php b/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php
new file mode 100644
index 0000000000000..88974f0d9cc5e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Vault\Model\ResourceModel;
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Setup\InstallSchema;
+
+class PaymentTokenTest extends \PHPUnit_Framework_TestCase
+{
+    const CUSTOMER_ID = 1;
+    const TOKEN = 'mx29vk';
+    const ORDER_INCREMENT_ID = '100000001';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var PaymentToken
+     */
+    private $paymentToken;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var PaymentTokenManagement
+     */
+    private $paymentTokenManagement;
+
+    /**
+     * @var Order
+     */
+    private $order;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->order = $this->objectManager->create(Order::class);
+        $this->paymentToken = $this->objectManager->create(PaymentToken::class);
+        $this->paymentTokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
+
+        $this->resource = $this->objectManager->get(ResourceConnection::class);
+        $this->connection = $this->resource->getConnection();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     */
+    public function testAddLinkToOrderPaymentExists()
+    {
+        $this->order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+        $paymentToken = $this->paymentTokenManagement
+            ->getByGatewayToken(self::TOKEN, PayPalConfigProvider::PAYPAL_CODE, self::CUSTOMER_ID);
+
+        $this->connection->insert(
+            $this->resource->getTableName(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
+            [
+                'order_payment_id' => $this->order->getPayment()->getEntityId(),
+                'payment_token_id' => $paymentToken->getEntityId()
+            ]
+        );
+
+        static::assertTrue(
+            $this->paymentToken->addLinkToOrderPayment(
+                $paymentToken->getEntityId(),
+                $this->order->getPayment()->getEntityId()
+            )
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDataFixture Magento/Braintree/_files/paypal_vault_token.php
+     */
+    public function testAddLinkToOrderPaymentCreate()
+    {
+        $this->order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+        $paymentToken = $this->paymentTokenManagement
+            ->getByGatewayToken(self::TOKEN, PayPalConfigProvider::PAYPAL_CODE, self::CUSTOMER_ID);
+
+        $select = $this->connection->select()
+            ->from($this->resource->getTableName(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE))
+            ->where('order_payment_id = ?', (int) $this->order->getPayment()->getEntityId())
+            ->where('payment_token_id =?', (int) $paymentToken->getEntityId());
+
+        static::assertEmpty($this->connection->fetchRow($select));
+        static::assertTrue(
+            $this->paymentToken->addLinkToOrderPayment(
+                $paymentToken->getEntityId(),
+                $this->order->getPayment()->getEntityId()
+            )
+        );
+        static::assertNotEmpty($this->connection->fetchRow($select));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/customer.php b/dev/tests/integration/testsuite/Magento/Vault/_files/customer.php
new file mode 100644
index 0000000000000..4a799bb4575e8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/customer.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Customer\Model\CustomerRegistry;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */
+$repository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+$customerRegistry->remove($customer->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php b/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php
new file mode 100644
index 0000000000000..e021dc7d4372c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/payment_tokens.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include "customer.php";
+
+use Magento\Customer\Model\Customer;
+use Magento\Vault\Model\PaymentToken;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$paymentTokens = [
+    [
+        'customer_id' => 1,
+        'public_hash' => '1234',
+        'payment_method_code' => 'first',
+        'type' => 'simple',
+        'expires_at' => '2016-09-04 10:18:15',
+        'is_active' => 1
+    ],
+    [
+        'customer_id' => 1,
+        'public_hash' => '12345',
+        'payment_method_code' => 'second',
+        'type' => 'simple',
+        'expires_at' => '2016-10-04 10:18:15',
+        'is_active' => 1
+    ],
+    [
+        'customer_id' => 1,
+        'public_hash' => '23456',
+        'payment_method_code' => 'third',
+        'type' => 'notsimple',
+        'expires_at' => '2016-11-04 10:18:15',
+        'is_active' => 1
+    ],
+    [
+        'customer_id' => 1,
+        'public_hash' => '234567',
+        'payment_method_code' => 'fourth',
+        'type' => 'simple',
+        'expires_at' => '2016-12-04 10:18:15',
+        'is_active' => 0
+    ],
+];
+/** @var array $tokenData */
+foreach ($paymentTokens as $tokenData) {
+    /** @var PaymentToken $bookmark */
+    $paymentToken = $objectManager->create(PaymentToken::class);
+    $paymentToken
+        ->setData($tokenData)
+        ->save();
+}
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js b/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
index 534947bf763e0..58b2c628ca1d0 100644
--- a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
+++ b/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
@@ -414,7 +414,7 @@ test( "testValidateGroupedQty", function() {
 });
 
 test( "testValidateCCTypeSelect", function() {
-    expect(6);
+    expect(14);
      var visaValid = $('<input id="visa-valid" type="text" value="4916808263499650"/>');
      var visaInvalid = $('<input id="visa-invalid" type="text" value="1234567890123456"/>');
      var mcValid = $('<input id="mc-valid" type="text" value="5203731841177490"/>');
@@ -422,16 +422,33 @@ test( "testValidateCCTypeSelect", function() {
      var aeValid = $('<input id="ae-valid" type="text" value="376244899619217"/>');
      var aeInvalid = $('<input id="ae-invalid" type="text" value="123451234512345"/>');
 
+    var diValid = $('<input id="di-valid" type="text" value="6011050000000009"/>');
+    var diInvalid = $('<input id="di-invalid" type="text" value="6011199900000005"/>');
+    var dnValid = $('<input id="dn-valid" type="text" value="3095434000000001"/>');
+    var dnInvalid = $('<input id="dn-invalid" type="text" value="3799999900000003"/>');
+    var jcbValid = $('<input id="jcb-valid" type="text" value="3528000000000007"/>');
+    var jcbInvalid = $('<input id="jcb-invalid" type="text" value="359000001111118"/>');
+    var upValid = $('<input id="up-valid" type="text" value="6221260000000000"/>');
+    var upInvalid = $('<input id="up-invalid" type="text" value="6229260000000002"/>');
+
     ok($.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaValid));
     ok(!$.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaInvalid));
     ok($.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcValid));
     ok(!$.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcInvalid));
     ok($.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeValid));
     ok(!$.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeInvalid));
+    ok($.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diValid));
+    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diInvalid));
+    ok($.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnValid));
+    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnInvalid));
+    ok($.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbValid));
+    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbInvalid));
+    ok($.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upValid));
+    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upInvalid));
 });
 
 test( "testValidateCCNumber", function() {
-    expect(8);
+    expect(37);
     ok($.validator.methods['validate-cc-number'].call(this, '4916835098995909', null, null));
     ok($.validator.methods['validate-cc-number'].call(this, '5265071363284878', null, null));
     ok($.validator.methods['validate-cc-number'].call(this, '6011120623356953', null, null));
@@ -440,16 +457,48 @@ test( "testValidateCCNumber", function() {
     ok(!$.validator.methods['validate-cc-number'].call(this, '5265071363284870', null, null));
     ok(!$.validator.methods['validate-cc-number'].call(this, '6011120623356951', null, null));
     ok(!$.validator.methods['validate-cc-number'].call(this, '371293266574619', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '2221220000000003', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '2721220000000008', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '601109020000000003', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6011111144444444', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '6011222233334444', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6011522233334447', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '601174455555553', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6011745555555550', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '601177455555556', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '601182455555556', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '601187999555558', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '601287999555556', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '6444444444444443', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6644444444444441', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '3044444444444444', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '3064444444444449', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '3095444444444442', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '3096444444444441', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '3696444444444445', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '3796444444444444', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '3896444444444443', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '3528444444444449', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '3529444444444448', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '6221262244444440', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6229981111111111', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '6249981111111117', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6279981111111110', null, null));
+    ok($.validator.methods['validate-cc-number'].call(this, '6282981111111115', null, null));
+    ok(!$.validator.methods['validate-cc-number'].call(this, '6289981111111118', null, null));
 });
 
 test( "testValidateCCType", function() {
-    expect(8);
+    expect(14);
     var select = $('<select id="cc-type">' +
         '<option value="">' +
         '</option><option value="VI">' +
         '</option><option value="MC">' +
         '</option><option value="AE">' +
         '</option><option value="DI">' +
+        '</option><option value="DN">' +
+        '</option><option value="JCB">' +
+        '</option><option value="UP">' +
         '</option>' +
         '</select>');
 
@@ -463,8 +512,17 @@ test( "testValidateCCType", function() {
     ok($.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
     ok(!$.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
     select.val('DI');
-    ok($.validator.methods['validate-cc-type'].call(this, '6011000990139424', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '4916835098995909', null, select));
+    ok($.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
+    ok(!$.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
+    select.val('DN');
+    ok($.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
+    ok(!$.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
+    select.val('JCB');
+    ok($.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
+    ok(!$.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
+    select.val('UP');
+    ok($.validator.methods['validate-cc-type'].call(this, '6221260000000000', null, select));
+    ok(!$.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
 });
 
 test( "testValidateCCExp", function() {
diff --git a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
new file mode 100644
index 0000000000000..c3a355babced8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
@@ -0,0 +1,135 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/validation'
+], function ($) {
+    'use strict';
+
+    describe('Testing credit card validation', function () {
+        it('Card type matches credit card number', function () {
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'VI', null, $('<input id="visa-valid" type="text" value="4916808263499650"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'VI', null, $('<input id="visa-invalid" type="text" value="1234567890123456"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'MC', null, $('<input id="mc-valid" type="text" value="5203731841177490"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'MC', null, $('<input id="mc-invalid" type="text" value="1111222233334444"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'MC', null, $('<input id="mc-valid" type="text" value="2221220000000003"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'MC', null, $('<input id="mc-invalid" type="text" value="2721220000000008"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'AE', null, $('<input id="ae-valid" type="text" value="376244899619217"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'AE', null, $('<input id="ae-invalid" type="text" value="123451234512345"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="601109020000000003"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="6011111144444444"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="6011222233334444"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="6011522233334447"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="601174455555553"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="6011755555555550"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="601177455555556"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="601182455555556"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="601187999555558"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="601287999555556"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-valid" type="text" value="6444444444444443"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DI', null, $('<input id="di-invalid" type="text" value="6644444444444441"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3095434000000001"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-invalid" type="text" value="3799999900000003"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3044444444444444"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-invalid" type="text" value="3064444444444449"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3095444444444442"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-invalid" type="text" value="3096444444444441"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3696444444444445"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-invalid" type="text" value="3796444444444444"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3696444444444445"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-valid" type="text" value="3896444444444443"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'DN', null, $('<input id="dn-invalid" type="text" value="3796444444444444"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'JCB', null, $('<input id="jcb-valid" type="text" value="3528444444444449"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'JCB', null, $('<input id="jcb-invalid" type="text" value="3527444444444448"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'JCB', null, $('<input id="jcb-invalid" type="text" value="3590444444444448"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-valid" type="text" value="6221262244444440"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-invalid" type="text" value="6229981111111111"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-valid" type="text" value="6249981111111117"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-invalid" type="text" value="6279981111111110"/>'))
+            ).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-valid" type="text" value="6282981111111115"/>'))
+            ).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select'].call(
+                this, 'UN', null, $('<input id="un-invalid" type="text" value="6289981111111118"/>'))
+            ).toEqual(false);
+        });
+    });
+});
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
index 25096baf46912..356ec726f5180 100644
--- a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -7,16 +7,7 @@ app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/authorizenet.js
 app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js
 app/code/Magento/Backend/view/adminhtml/web/js/bootstrap/editor.js
 app/code/Magento/Braintree/view/adminhtml/requirejs-config.js
-app/code/Magento/Braintree/view/adminhtml/web/js/cc-data.js
-app/code/Magento/Braintree/view/adminhtml/web/js/cc-form.js
 app/code/Magento/Braintree/view/frontend/requirejs-config.js
-app/code/Magento/Braintree/view/frontend/web/js/braintree-paypal-shortcut.js
-app/code/Magento/Braintree/view/frontend/web/js/cc-data.js
-app/code/Magento/Braintree/view/frontend/web/js/cc-edit-form.js
-app/code/Magento/Braintree/view/frontend/web/js/cc-form.js
-app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree-methods.js
-app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/braintree-paypal.js
-app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
 app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js
 app/code/Magento/Bundle/view/frontend/requirejs-config.js
@@ -227,16 +218,7 @@ app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
 app/code/Magento/Payment/view/adminhtml/web/transparent.js
 app/code/Magento/Payment/view/frontend/requirejs-config.js
 app/code/Magento/Payment/view/frontend/web/cc-type.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-data.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/cvv-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/expiration-date-validator/parse-date.js
-app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js
+app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
 app/code/Magento/Payment/view/frontend/web/js/view/payment/cc-form.js
 app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
 app/code/Magento/Payment/view/frontend/web/js/view/payment/method-renderer/free-method.js
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 227b9444b6061..d155432894daf 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -129,9 +129,15 @@ public function getPreference($type)
      */
     public function extend(array $configuration)
     {
-        $this->arguments = $configuration['arguments'];
-        $this->virtualTypes = $configuration['instanceTypes'];
-        $this->preferences = $configuration['preferences'];
+        $this->arguments = isset($configuration['arguments'])
+            ? array_replace($this->arguments, $configuration['arguments'])
+            : $this->arguments;
+        $this->virtualTypes = isset($configuration['instanceTypes'])
+            ? array_replace($this->virtualTypes, $configuration['instanceTypes'])
+            : $this->virtualTypes;
+        $this->preferences = isset($configuration['preferences'])
+            ? array_replace($this->preferences, $configuration['preferences'])
+            : $this->preferences;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
new file mode 100644
index 0000000000000..1fcf3176540db
--- /dev/null
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Test\Unit\Config;
+
+use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CompiledTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+    }
+
+    /**
+     * @param array $initialData
+     * @param array $configuration
+     * @param array $expectedArguments
+     * @param array $expectedVirtualTypes
+     * @param array $expectedPreferences
+     *
+     * @dataProvider extendDataProvider
+     */
+    public function testExtend(
+        array $initialData,
+        array $configuration,
+        array $expectedArguments,
+        array $expectedVirtualTypes,
+        array $expectedPreferences
+    ) {
+        /** @var CompiledConfig $compiledConfig */
+        $compiledConfig = $this->objectManagerHelper->getObject(CompiledConfig::class, ['data' => $initialData]);
+        $compiledConfig->extend($configuration);
+
+        foreach ($expectedArguments as $type => $arguments) {
+            $this->assertEquals($arguments, $compiledConfig->getArguments($type));
+        }
+
+        $this->assertEquals($expectedVirtualTypes, $compiledConfig->getVirtualTypes());
+        $this->assertEquals($expectedPreferences, $compiledConfig->getPreferences());
+    }
+
+    /**
+     * @return array
+     */
+    public function extendDataProvider()
+    {
+        return [
+            [
+                'initialData' => [
+                    'arguments' => [
+                        'type1' => serialize(['argument1_1' => 'argumentValue1_1', 'argument1_2' => 'argumentValue1_2'])
+                    ],
+                    'instanceTypes' => [
+                        'instanceType1' => 'instanceTypeValue1', 'instanceType2' => 'instanceTypeValue2'
+                    ],
+                    'preferences' => ['preference1' => 'preferenceValue1', 'preference2' => 'preferenceValue2']
+                ],
+                'configuration' => [
+                    'arguments' => [
+                        'type1' => serialize(['argument1_1' => 'newArgumentValue1_1']),
+                        'type2' => serialize(['argument2_1' => 'newArgumentValue2_1'])
+                    ],
+                    'instanceTypes' => [
+                        'instanceType2' => 'newInstanceTypeValue2', 'instanceType3' => 'newInstanceTypeValue3'
+                    ],
+                    'preferences' => ['preference1' => 'newPreferenceValue1']
+                ],
+                'expectedArguments' => [
+                    'type1' => ['argument1_1' => 'newArgumentValue1_1'],
+                    'type2' => ['argument2_1' => 'newArgumentValue2_1']
+                ],
+                'expectedVirtualTypes' => [
+                    'instanceType1' => 'instanceTypeValue1', 'instanceType2' => 'newInstanceTypeValue2',
+                    'instanceType3' => 'newInstanceTypeValue3'
+                ],
+                'expectedPreferences' => [
+                    'preference1' => 'newPreferenceValue1', 'preference2' => 'preferenceValue2'
+                ]
+            ]
+        ];
+    }
+}
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 209db5d024acc..0b3354b622896 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -101,13 +101,12 @@
         'SO': [new RegExp('^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true],
         'SM': [new RegExp('(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true],
         'VI': [new RegExp('^4[0-9]{12}([0-9]{3})?$'), new RegExp('^[0-9]{3}$'), true],
-        'MC': [new RegExp('^5[1-5][0-9]{14}$'), new RegExp('^[0-9]{3}$'), true],
+        'MC': [new RegExp('^(?:5[1-5][0-9]{2}|222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}$'), new RegExp('^[0-9]{3}$'), true],
         'AE': [new RegExp('^3[47][0-9]{13}$'), new RegExp('^[0-9]{4}$'), true],
-        'DI': [new RegExp('^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}|5[0-9]{14}))$'), new RegExp('^[0-9]{3}$'), true],
-        'JCB': [new RegExp('^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}|5[0-9]{14}))$'), new RegExp('^[0-9]{3}$'), true],
-        'OT': [new RegExp('^([0-9]+)$'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), false],
-        'DN': [new RegExp('^3((0([0-5]\\d*)?)|[689]\\d*)?$'), new RegExp('^[0-9]{3}$'), true],
-        'UN': [new RegExp('^6(2\\d*)?$'), new RegExp('^[0-9]{3}$'), true],
+        'DI': [new RegExp('^(6011(0|[2-4]|74|7[7-9]|8[6-9]|9)|6(4[4-9]|5))\\d*$'), new RegExp('^[0-9]{3}$'), true],
+        'JCB': [new RegExp('^35(2[8-9]|[3-8])\\d*$'), new RegExp('^[0-9]{3}$'), true],
+        'DN': [new RegExp('^(3(0[0-5]|095|6|[8-9]))\\d*$'), new RegExp('^[0-9]{3}$'), true],
+        'UN': [new RegExp('^(622(1(2[6-9]|[3-9])|[3-8]|9([[0-1]|2[0-5]))|62[4-6]|628([2-8]))\\d*?$'), new RegExp('^[0-9]{3}$'), true],
         'MI': [new RegExp('^(5(0|[6-9])|63|67(?!59|6770|6774))\\d*$'), new RegExp('^[0-9]{3}$'), true],
         'MD': [new RegExp('^6759(?!24|38|40|6[3-9]|70|76)|676770|676774\\d*$'), new RegExp('^[0-9]{3}$'), true]
     };