From ed87bf68202aaf80a48535366c49a5b8dec6cf9f Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 17 Dec 2014 13:17:29 -0600
Subject: [PATCH 001/101] MAGETWO-31732: Blacklisted ComposerTest

- restored the test for CE
---
 .../Magento/Test/Integrity/ComposerTest.php   | 418 ++++++++++++++++++
 .../Framework/Composer/MagentoComponent.php   |  28 ++
 2 files changed, 446 insertions(+)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
 create mode 100644 lib/internal/Magento/Framework/Composer/MagentoComponent.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
new file mode 100644
index 00000000000..f79d5aaae07
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -0,0 +1,418 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Test\Integrity;
+
+use Magento\Framework\Composer\MagentoComponent;
+use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\Shell;
+use Magento\Framework\Exception;
+
+/**
+ * A test that enforces validity of composer.json files and any other conventions in Magento components
+ */
+class ComposerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\Shell
+     */
+    private static $shell;
+
+    /**
+     * @var bool
+     */
+    private static $isComposerAvailable;
+
+    /**
+     * @var string
+     */
+    private static $root;
+
+    /**
+     * @var \stdClass
+     */
+    private static $rootJson;
+
+    /**
+     * @var array
+     */
+    private static $dependencies;
+
+    /**
+     * @var string
+     */
+    private static $composerPath = 'composer';
+
+    public static function setUpBeforeClass()
+    {
+        if (defined('TESTS_COMPOSER_PATH')) {
+            self::$composerPath = TESTS_COMPOSER_PATH;
+        }
+        self::$shell = self::createShell();
+        self::$isComposerAvailable = self::isComposerAvailable();
+        self::$root = Files::init()->getPathToSource();
+        self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
+        self::$dependencies = [];
+    }
+
+    public function testValidComposerJson()
+    {
+        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker(
+        /**
+         * @param string $dir
+         * @param string $packageType
+         */
+            function ($dir, $packageType) {
+                $this->assertComposerAvailable();
+                $file = $dir . '/composer.json';
+                $this->assertFileExists($file);
+                self::$shell->execute(self::$composerPath . ' validate --working-dir=%s', [$dir]);
+                $contents = file_get_contents($file);
+                $json = json_decode($contents);
+                $this->assertCodingStyle($contents);
+                $this->assertMagentoConventions($dir, $packageType, $json);
+            },
+            $this->validateComposerJsonDataProvider()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function validateComposerJsonDataProvider()
+    {
+        $root = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+        $result = [];
+        foreach (glob("{$root}/app/code/Magento/*", GLOB_ONLYDIR) as $dir) {
+            $result[$dir] = [$dir, 'magento2-module'];
+        }
+        foreach (glob("{$root}/app/i18n/magento/*", GLOB_ONLYDIR) as $dir) {
+            $result[$dir] = [$dir, 'magento2-language'];
+        }
+        foreach (glob("{$root}/app/design/adminhtml/Magento/*", GLOB_ONLYDIR) as $dir) {
+            $result[$dir] = [$dir, 'magento2-theme'];
+        }
+        foreach (glob("{$root}/app/design/frontend/Magento/*", GLOB_ONLYDIR) as $dir) {
+            $result[$dir] = [$dir, 'magento2-theme'];
+        }
+        foreach (glob("{$root}/lib/internal/Magento/*", GLOB_ONLYDIR) as $dir) {
+            $result[$dir] = [$dir, 'magento2-library'];
+        }
+        $result[$root] = [$root, 'project'];
+
+        return $result;
+    }
+
+    /**
+     * Some of coding style conventions
+     *
+     * @param string $contents
+     */
+    private function assertCodingStyle($contents)
+    {
+        $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: no space before colon.');
+        $this->assertNotRegExp('/":["{]/', $contents, 'Coding style: a space is necessary after colon.');
+    }
+
+    /**
+     * Enforce Magento-specific conventions to a composer.json file
+     *
+     * @param string $dir
+     * @param string $packageType
+     * @param \StdClass $json
+     * @throws \InvalidArgumentException
+     */
+    private function assertMagentoConventions($dir, $packageType, \StdClass $json)
+    {
+        $this->assertObjectHasAttribute('name', $json);
+        $this->assertObjectHasAttribute('license', $json);
+        $this->assertObjectHasAttribute('type', $json);
+        $this->assertObjectHasAttribute('version', $json);
+        $this->assertVersionInSync($json->name, $json->version);
+        $this->assertObjectHasAttribute('require', $json);
+        $this->assertEquals($packageType, $json->type);
+        if ($packageType !== 'project') {
+            self::$dependencies[] = $json->name;
+            $this->assertHasMap($json);
+            $this->assertMapConsistent($dir, $json);
+        }
+        switch ($packageType) {
+            case 'magento2-module':
+                $xml = simplexml_load_file("$dir/etc/module.xml");
+                $this->assertConsistentModuleName($xml, $json->name);
+                $this->assertDependsOnPhp($json->require);
+                $this->assertDependsOnFramework($json->require);
+                $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
+                break;
+            case 'magento2-language':
+                $this->assertRegExp('/^magento\/language\-[a-z]{2}_[a-z]{2}$/', $json->name);
+                $this->assertDependsOnFramework($json->require);
+                $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
+                break;
+            case 'magento2-theme':
+                $this->assertRegExp('/^magento\/theme-(?:adminhtml|frontend)(\-[a-z0-9_]+)+$/', $json->name);
+                $this->assertDependsOnPhp($json->require);
+                $this->assertDependsOnFramework($json->require);
+                $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
+                break;
+            case 'magento2-library':
+                $this->assertDependsOnPhp($json->require);
+                $this->assertRegExp('/^magento\/framework$/', $json->name);
+                $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
+                break;
+            case 'project':
+                sort(self::$dependencies);
+                $dependenciesListed = [];
+                foreach (array_keys((array)self::$rootJson['replace']) as $key) {
+                    if (MagentoComponent::matchMagentoComponent($key)) {
+                        $dependenciesListed[] = $key;
+                    }
+                }
+                sort($dependenciesListed);
+                $nonDeclaredDependencies = array_diff(self::$dependencies, $dependenciesListed);
+                $nonexistentDependencies = array_diff($dependenciesListed, self::$dependencies);
+                $this->assertEmpty(
+                    $nonDeclaredDependencies,
+                    'Following dependencies are not declared in the root composer.json: '
+                    . join(', ', $nonDeclaredDependencies)
+                );
+                $this->assertEmpty(
+                    $nonexistentDependencies,
+                    'Following dependencies declared in the root composer.json do not exist: '
+                    . join(', ', $nonexistentDependencies)
+                );
+                break;
+            default:
+                throw new \InvalidArgumentException("Unknown package type {$packageType}");
+        }
+    }
+
+    /**
+     * Assert that there is map in specified composer json
+     *
+     * @param \StdClass $json
+     */
+    private function assertHasMap(\StdClass $json)
+    {
+        $error = 'There must be an "extra->map" node in composer.json of each Magento component.';
+        $this->assertObjectHasAttribute('extra', $json, $error);
+        $this->assertObjectHasAttribute('map', $json->extra, $error);
+        $this->assertInternalType('array', $json->extra->map, $error);
+    }
+
+    /**
+     * Assert that component directory name and mapping information are consistent
+     *
+     * @param string $dir
+     * @param \StdClass $json
+     */
+    private function assertMapConsistent($dir, $json)
+    {
+        preg_match('/^.+\/(.+)\/(.+)$/', $dir, $matches);
+        list(, $vendor, $name) = $matches;
+        $map = $json->extra->map;
+        $this->assertArrayHasKey(0, $map);
+        $this->assertArrayHasKey(1, $map[0]);
+        $this->assertRegExp(
+            "/{$vendor}\\/{$name}$/",
+            $map[0][1],
+            'Mapping info is inconsistent with the directory structure'
+        );
+    }
+
+    /**
+     * Enforce package naming conventions for modules
+     *
+     * @param \SimpleXMLElement $xml
+     * @param string $packageName
+     */
+    private function assertConsistentModuleName(\SimpleXMLElement $xml, $packageName)
+    {
+        $moduleName = (string)$xml->module->attributes()->name;
+        $this->assertEquals(
+            $packageName,
+            $this->convertModuleToPackageName($moduleName),
+            "For the module '{$moduleName}', the expected package name is '{$packageName}'"
+        );
+    }
+
+    /**
+     * Make sure a component depends on php version
+     *
+     * @param \StdClass $json
+     */
+    private function assertDependsOnPhp(\StdClass $json)
+    {
+        $this->assertObjectHasAttribute('php', $json, 'This component is expected to depend on certain PHP version(s)');
+    }
+
+    /**
+     * Make sure a component depends on magento/framework component
+     *
+     * @param \StdClass $json
+     */
+    private function assertDependsOnFramework(\StdClass $json)
+    {
+        $this->assertObjectHasAttribute(
+            'magento/framework',
+            $json,
+            'This component is expected to depend on magento/framework'
+        );
+    }
+
+    /**
+     * Make sure a component depends on Magento Composer Installer component
+     *
+     * @param \StdClass $json
+     */
+    private function assertDependsOnInstaller(\StdClass $json)
+    {
+        $this->assertObjectHasAttribute(
+            'magento/magento-composer-installer',
+            $json,
+            'This component is expected to depend on magento/magento-composer-installer'
+        );
+    }
+
+    /**
+     * Assert that versions in root composer.json and Magento component's composer.json are not out of sync
+     *
+     * @param string $name
+     * @param string $version
+     */
+    private function assertVersionInSync($name, $version)
+    {
+        $this->assertEquals(
+            self::$rootJson['version'],
+            $version,
+            "Version {$version} in component {$name} is inconsistent with version "
+            . self::$rootJson['version'] . ' in root composer.json'
+        );
+    }
+
+    /**
+     * Make sure requirements of components are reflected in root composer.json
+     *
+     * @param \StdClass $json
+     */
+    private function assertRequireInSync(\StdClass $json)
+    {
+        $name = $json->name;
+        if (isset($json->require)) {
+            $errors = [];
+            foreach (array_keys((array)$json->require) as $depName) {
+                if ($depName == 'magento/magento-composer-installer') {
+                    // Magento Composer Installer is not needed for already existing components
+                    continue;
+                }
+                if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
+                    && !isset(self::$rootJson['replace'][$depName])) {
+                    $errors[] = "'$name' depends on '$depName'";
+                }
+            }
+            if (!empty($errors)) {
+                $this->fail(
+                    "The following dependencies are missing in root 'composer.json',"
+                    . " while declared in child components.\n"
+                    . "Consider adding them to 'require-dev' section (if needed for child components only),"
+                    . " to 'replace' section (if they are present in the project),"
+                    . " to 'require' section (if needed for the skeleton).\n"
+                    . join("\n", $errors)
+                );
+            }
+        }
+    }
+
+    /**
+     * Convert a fully qualified module name to a composer package name according to conventions
+     *
+     * @param string $moduleName
+     * @return string
+     */
+    private function convertModuleToPackageName($moduleName)
+    {
+        list($vendor, $name) = explode('_', $moduleName, 2);
+        $package = 'module';
+        foreach (preg_split('/([A-Z][a-z\d]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
+            $package .= $chunk ? "-{$chunk}" : '';
+        }
+        return strtolower("{$vendor}/{$package}");
+    }
+
+    /**
+     * Create shell wrapper
+     *
+     * @return \Magento\Framework\Shell
+     */
+    private static function createShell()
+    {
+        return new Shell(new Shell\CommandRenderer, null);
+    }
+
+    /**
+     * Check if composer command is available in the environment
+     *
+     * @return bool
+     */
+    private static function isComposerAvailable()
+    {
+        try {
+            self::$shell->execute(self::$composerPath . ' --version');
+        } catch (Exception $e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Skip the test if composer is unavailable
+     */
+    private function assertComposerAvailable()
+    {
+        if (!self::$isComposerAvailable) {
+            $this->markTestSkipped();
+        }
+    }
+
+    public function testComponentPathsInRoot()
+    {
+        if (!isset(self::$rootJson['extra']) || !isset(self::$rootJson['extra']['component_paths'])) {
+            $this->markTestSkipped("The root composer.json file doesn't mention any extra component paths information");
+        }
+        $this->assertArrayHasKey(
+            'replace',
+            self::$rootJson,
+            "If there are any component paths specified, then they must be reflected in 'replace' section"
+        );
+        $flat = [];
+        foreach (self::$rootJson['extra']['component_paths'] as $key => $element) {
+            if (is_string($element)) {
+                $flat[] = [$key, $element];
+            } elseif (is_array($element)) {
+                foreach ($element as $path) {
+                    $flat[] = [$key, $path];
+                }
+            } else {
+                throw new \Exception("Unexpected element 'in extra->component_paths' section");
+            }
+        }
+        while (list(, list($component, $path)) = each($flat)) {
+            $this->assertFileExists(
+                self::$root . '/' . $path,
+                "Missing or invalid component path: {$component} -> {$path}"
+            );
+            $this->assertArrayHasKey(
+                $component,
+                self::$rootJson['replace'],
+                "The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
new file mode 100644
index 00000000000..4ec96eeed9f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Composer;
+
+class MagentoComponent {
+    /**
+     * Get matched Magento component or empty array, if it's not a Magento component
+     *
+     * @param string $key
+     * @return string[] ['type' => '<type>', 'area' => '<area>', 'name' => '<name>']
+     *             Ex.: ['type' => 'module', 'name' => 'catalog']
+     *                  ['type' => 'theme', 'area' => 'frontend', 'name' => 'blank']
+     */
+    public static function matchMagentoComponent($key)
+    {
+        $typePattern = 'module|theme|language|framework';
+        $areaPattern = 'frontend|adminhtml';
+        $namePattern = '[a-z_-]+';
+        $regex = '/^magento\/(?P<type>' . $typePattern . ')(?:-(?P<area>' . $areaPattern . '))?(?:-(?P<name>'
+            . $namePattern . '))?$/';
+        if (preg_match($regex, $key, $matches)) {
+            return $matches;
+        }
+        return [];
+    }
+}
-- 
GitLab


From 3ff27c21c8b2a1b1bebddd8d1b3c382f3f46526f Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Thu, 18 Dec 2014 16:54:21 -0600
Subject: [PATCH 002/101] MAGETWO-31118: Subtotal Including Tax on invoice is
 discounted

 - fixed
---
 .../Model/Order/Invoice/Total/Subtotal.php    | 35 ++-----------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
index 959820d7712..b15fce9617d 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
@@ -36,46 +36,15 @@ class Subtotal extends AbstractTotal
 
         $allowedSubtotal = $order->getSubtotal() - $order->getSubtotalInvoiced();
         $baseAllowedSubtotal = $order->getBaseSubtotal() - $order->getBaseSubtotalInvoiced();
-        $allowedSubtotalInclTax = $allowedSubtotal +
-            $order->getHiddenTaxAmount() +
-            $order->getTaxAmount() -
-            $order->getTaxInvoiced() -
-            $order->getHiddenTaxInvoiced();
-        $baseAllowedSubtotalInclTax = $baseAllowedSubtotal +
-            $order->getBaseHiddenTaxAmount() +
-            $order->getBaseTaxAmount() -
-            $order->getBaseTaxInvoiced() -
-            $order->getBaseHiddenTaxInvoiced();
-
-        /**
-         * Check if shipping tax calculation is included to current invoice.
-         */
-        $includeShippingTax = true;
-        foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
-            if ($previousInvoice->getShippingAmount() && !$previousInvoice->isCanceled()) {
-                $includeShippingTax = false;
-                break;
-            }
-        }
-
-        if ($includeShippingTax) {
-            $allowedSubtotalInclTax -= $order->getShippingTaxAmount();
-            $baseAllowedSubtotalInclTax -= $order->getBaseShippingTaxAmount();
-        } else {
-            $allowedSubtotalInclTax += $order->getShippingHiddenTaxAmount();
-            $baseAllowedSubtotalInclTax += $order->getBaseShippingHiddenTaxAmount();
-        }
+        //Note: The $subtotalInclTax and $baseSubtotalInclTax are not adjusted from those provide by the line items
+        //because the "InclTax" is displayed before any tax adjustments based on discounts, shipping, etc.
 
         if ($invoice->isLast()) {
             $subtotal = $allowedSubtotal;
             $baseSubtotal = $baseAllowedSubtotal;
-            $subtotalInclTax = $allowedSubtotalInclTax;
-            $baseSubtotalInclTax = $baseAllowedSubtotalInclTax;
         } else {
             $subtotal = min($allowedSubtotal, $subtotal);
             $baseSubtotal = min($baseAllowedSubtotal, $baseSubtotal);
-            $subtotalInclTax = min($allowedSubtotalInclTax, $subtotalInclTax);
-            $baseSubtotalInclTax = min($baseAllowedSubtotalInclTax, $baseSubtotalInclTax);
         }
 
         $invoice->setSubtotal($subtotal);
-- 
GitLab


From fb6714b6578e8c6cbb389962e13f0ef31d6df12f Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 13:27:52 +0200
Subject: [PATCH 003/101] MAGETWO-31966: Empty title for success placed order
 page

---
 app/code/Magento/Checkout/Controller/Onepage/Success.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 9870718aef5..b09ac1a2616 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,6 +23,7 @@ class Success extends \Magento\Checkout\Controller\Onepage
         //@todo: Refactor it to match CQRS
         $this->_view->loadLayout();
         $this->_view->getLayout()->initMessages();
+        $this->_view->getPage()->getConfig()->getTitle()->set(__('Thank you for your purchase!'));
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
             ['order_ids' => [$session->getLastOrderId()]]
-- 
GitLab


From 256fc4434eb88ea12e65c04bff7d189a84ed0bc6 Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 13:29:35 +0200
Subject: [PATCH 004/101] MAGETWO-31966: Empty title for success placed order
 page

---
 app/code/Magento/Checkout/Controller/Onepage/Success.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index b09ac1a2616..072ed80dc1b 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,7 +23,7 @@ class Success extends \Magento\Checkout\Controller\Onepage
         //@todo: Refactor it to match CQRS
         $this->_view->loadLayout();
         $this->_view->getLayout()->initMessages();
-        $this->_view->getPage()->getConfig()->getTitle()->set(__('Thank you for your purchase!'));
+        $this->_view->getPage()->getConfig()->getTitle()->set(__('Success Page'));
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
             ['order_ids' => [$session->getLastOrderId()]]
-- 
GitLab


From daa1c7b88309b256ba5ee832d96d92c44490dd3d Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 17:08:21 +0200
Subject: [PATCH 005/101] MAGETWO-31966: Empty title for success placed order
 page - move to layout

---
 app/code/Magento/Checkout/Controller/Onepage/Success.php       | 1 -
 .../Checkout/view/frontend/layout/checkout_onepage_success.xml | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 072ed80dc1b..9870718aef5 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,7 +23,6 @@ class Success extends \Magento\Checkout\Controller\Onepage
         //@todo: Refactor it to match CQRS
         $this->_view->loadLayout();
         $this->_view->getLayout()->initMessages();
-        $this->_view->getPage()->getConfig()->getTitle()->set(__('Success Page'));
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
             ['order_ids' => [$session->getLastOrderId()]]
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
index 539bc06711c..ef4db4f99e2 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
@@ -5,6 +5,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Success Page</title>
+    </head>
     <body>
         <referenceBlock name="page.main.title">
             <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="button.phtml"/>
-- 
GitLab


From 375d189372b7291d3529f0e0fa5113aaefbe3324 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:16:06 -0600
Subject: [PATCH 006/101] MAGETWO-28549: typo in public function
 getCalculationAgorithm

 - fixed
---
 .../Bundle/Pricing/Adjustment/Calculator.php  |  2 +-
 app/code/Magento/Tax/Helper/Data.php          |  2 +-
 app/code/Magento/Tax/Model/Config.php         |  2 +-
 app/code/Magento/Tax/Model/Observer.php       |  2 +-
 .../Weee/Model/Total/Quote/WeeeTaxTest.php    | 18 ++++++++---------
 .../Weee/Model/Total/Quote/WeeeTest.php       | 20 +++++++++----------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index e15bbbf89f1..3a1c5b56dc5 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -313,7 +313,7 @@ class Calculator implements BundleCalculatorInterface
 
         /** @var  Store $store */
         $store = $bundleProduct->getStore();
-        $roundingMethod = $this->taxHelper->getCalculationAgorithm($store);
+        $roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
         foreach ($amountList as $amountInfo) {
             /** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
             $itemAmount = $amountInfo['amount'];
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 26e3386435f..9ce9e7ca4d5 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -628,7 +628,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param  null|string|bool|int|Store $store
      * @return string
      */
-    public function getCalculationAgorithm($store = null)
+    public function getCalculationAlgorithm($store = null)
     {
         return $this->_config->getAlgorithm($store);
     }
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index bfd8e11e649..86a5e6d7dbc 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -269,7 +269,7 @@ class Config
     }
 
     /**
-     * Get defined tax calculation agorithm
+     * Get defined tax calculation algorithm
      *
      * @param   null|string|bool|int|Store $store
      * @return  string
diff --git a/app/code/Magento/Tax/Model/Observer.php b/app/code/Magento/Tax/Model/Observer.php
index da2ad2ba127..d674c3d7a47 100644
--- a/app/code/Magento/Tax/Model/Observer.php
+++ b/app/code/Magento/Tax/Model/Observer.php
@@ -299,7 +299,7 @@ class Observer
             return $this;
         }
 
-        $algorithm = $this->_taxData->getCalculationAgorithm();
+        $algorithm = $this->_taxData->getCalculationAlgorithm();
         $options['calculationAlgorithm'] = $algorithm;
         // prepare correct template for options render
         if ($this->_taxData->displayBothPrices()) {
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
index 6086e0a44b0..ab317faba4d 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
@@ -278,7 +278,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -322,7 +322,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -366,7 +366,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -410,7 +410,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -448,7 +448,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_non_taxable_unit_include_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -486,7 +486,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_row_include_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -530,7 +530,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_taxable_row_include_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -574,7 +574,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_non_taxable_row_include_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -612,7 +612,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
index 62935f81d6b..fd673096c7e 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
@@ -220,7 +220,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -260,7 +260,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -300,7 +300,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -340,7 +340,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -382,7 +382,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -424,7 +424,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_taxable_row_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -464,7 +464,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_taxable_row_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -504,7 +504,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_incl_tax_weee_non_taxable_row_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => true,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -546,7 +546,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_non_taxable_row_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
@@ -588,7 +588,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
         $data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
             'tax_config' => [
                 'priceIncludesTax' => false,
-                'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+                'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
             ],
             'weee_config' => [
                 'isEnabled' => true,
-- 
GitLab


From e1e4dd6e5cd2018775d7943fcb271dc7fe0be1ec Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:29:00 -0600
Subject: [PATCH 007/101] MAGETWO-28380: Totals taxes sorting is different on
 order/invoice/refund create and view pages

 - fixed
 - updated unit test
---
 app/code/Magento/Tax/Helper/Data.php          | 49 +++++++------
 .../testsuite/Magento/Tax/Helper/DataTest.php | 70 +++++++++++++++++++
 2 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 26e3386435f..a30fc64cc96 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -682,17 +682,23 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *      'tax_amount'        => $taxAmount,
      *      'base_tax_amount'   => $baseTaxAmount,
      *      'title'             => $title,
-     *      'percent'           => $percent
+     *      'percent'           => $percent,
+     *      'type'              => $type
      *  )
      * )
      *
      * @param  array                        $taxClassAmount
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
      * @param  float                        $ratio
+     * @param  string                       $type
      * @return array
      */
-    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
-    {
+    private function _aggregateTaxes(
+        $taxClassAmount,
+        OrderTaxDetailsItemInterface $itemTaxDetail,
+        $ratio,
+        $type = 'product'
+    ) {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
             $taxAmount = $itemAppliedTax->getAmount() * $ratio;
@@ -705,6 +711,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
             if (!isset($taxClassAmount[$taxCode])) {
                 $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
                 $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
+                $taxClassAmount[$taxCode]['type'] = $type;
                 $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
                 $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
             } else {
@@ -796,23 +803,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
 
-        // Apply any taxes for shipping
-        $shippingTaxAmount = $salesItem->getShippingTaxAmount();
-        $originalShippingTaxAmount = $order->getShippingTaxAmount();
-        if ($shippingTaxAmount && $originalShippingTaxAmount &&
-            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
-        ) {
-            //An invoice or credit memo can have a different qty than its order
-            $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
-            $itemTaxDetails = $orderTaxDetails->getItems();
-            foreach ($itemTaxDetails as $itemTaxDetail) {
-                //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
-                    $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
-                }
-            }
-        }
-
         // Apply any taxes for the items
         /** @var $item \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item */
         foreach ($salesItem->getItems() as $item) {
@@ -844,6 +834,25 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
             }
         }
 
+        // Apply any taxes for shipping
+        $shippingType = \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING;
+        $shippingTaxAmount = $salesItem->getShippingTaxAmount();
+        $originalShippingTaxAmount = $order->getShippingTaxAmount();
+        if ($shippingTaxAmount && $originalShippingTaxAmount &&
+            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
+        ) {
+            //An invoice or credit memo can have a different qty than its order
+            $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
+            $itemTaxDetails = $orderTaxDetails->getItems();
+            foreach ($itemTaxDetails as $itemTaxDetail) {
+                //Aggregate taxable items associated with shipping
+                if ($itemTaxDetail->getType() == $shippingType) {
+                    $taxClassAmount =
+                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio, $shippingType);
+                }
+            }
+        }
+
         return $taxClassAmount;
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 01af7e21592..6b01c6385e2 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -301,6 +301,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
                         'percent' => 20.0,
                         'tax_amount' => 2.5,
                         'base_tax_amount' => 2.5,
+                        'type' => 'product',
                     ],
                 ],
             ],
@@ -362,6 +363,75 @@ class DataTest extends \PHPUnit_Framework_TestCase
                         'percent' => 20.0,
                         'tax_amount' => 6.5,
                         'base_tax_amount' => 6.5,
+                        'type' => 'product',
+                    ],
+                ],
+            ],
+            //Scenario 3: one item, with both shipping and product taxes
+            'one_item_with_both_shipping_and_product_taxes' => [
+                'order' => [
+                    'order_id' => 1,
+                    'shipping_tax_amount' => 2,
+                    'order_tax_details' => [
+                        'items' => [
+                            'shippingTax1' => [
+                                'item_id' => null,
+                                'type' => 'shipping',
+                                'applied_taxes' => [
+                                    [
+                                        'amount' => 2.0,
+                                        'base_amount' => 2.0,
+                                        'code' => 'US-CA-Ship',
+                                        'title' => 'US-CA-Sales-Tax-Ship',
+                                        'percent' => 10.0,
+                                    ],
+                                ],
+                            ],
+                            'itemTax1' => [
+                                'item_id' => 1,
+                                'applied_taxes' => [
+                                    [
+                                        'amount' => 5.0,
+                                        'base_amount' => 5.0,
+                                        'code' => 'US-CA',
+                                        'title' => 'US-CA-Sales-Tax',
+                                        'percent' => 20.0,
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'invoice' => [
+                    'shipping_tax_amount' => 2,
+                    'invoice_items' => [
+                        'item1' => new MagentoObject(
+                            [
+                                'order_item' => new MagentoObject(
+                                    [
+                                        'id' => 1,
+                                        'tax_amount' => 5.00,
+                                    ]
+                                ),
+                                'tax_amount' => 5.00,
+                            ]
+                        ),
+                    ],
+                ],
+                'expected_results' => [
+                    [
+                        'title' => 'US-CA-Sales-Tax',
+                        'percent' => 20.0,
+                        'tax_amount' => 5.00,
+                        'base_tax_amount' => 5.00,
+                        'type' => 'product',
+                    ],
+                    [
+                        'title' => 'US-CA-Sales-Tax-Ship',
+                        'percent' => 10.0,
+                        'tax_amount' => 2.00,
+                        'base_tax_amount' => 2.00,
+                        'type' => 'shipping',
                     ],
                 ],
             ],
-- 
GitLab


From d5ab0710c1ddcc23dfd1f517f743366dbdfa5091 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:58:27 -0600
Subject: [PATCH 008/101] MAGETWO-30745: CsvImportHandler Tests still refer to
 links from Tax module instead of TaxImportExport Module

 - fixed
---
 .../Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
index 2f3fe5e8ca8..6d6515c6ed6 100644
--- a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -7,7 +7,7 @@ namespace Magento\TaxImportExport\Model\Rate;
 class CsvImportHandlerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Tax\Model\Rate\CsvImportHandler
+     * @var \Magento\TaxImportExport\Model\Rate\CsvImportHandler
      */
     protected $_importHandler;
 
-- 
GitLab


From e7db99eb424eb95f290a71a845f0a2fbc3a7c035 Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Mon, 22 Dec 2014 16:18:08 +0200
Subject: [PATCH 009/101] MAGETWO-31967: Exception page instead of 404 when
 edit url for product with required configuration

---
 .../Checkout/Controller/Cart/Configure.php    |  13 +-
 .../Controller/Cart/ConfigureTest.php         | 252 ++++++++++++++++++
 2 files changed, 259 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php

diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 8731afaae8d..b514eefc596 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -43,18 +43,19 @@ class Configure extends \Magento\Checkout\Controller\Cart
     {
         // Extract item and product to configure
         $id = (int)$this->getRequest()->getParam('id');
+        $productId = (int)$this->getRequest()->getParam('product_id');
         $quoteItem = null;
         if ($id) {
             $quoteItem = $this->cart->getQuote()->getItemById($id);
         }
 
-        if (!$quoteItem) {
-            $this->messageManager->addError(__("We can't find the quote item."));
-            $this->_redirect('checkout/cart');
-            return;
-        }
-
         try {
+            if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
+                $this->messageManager->addError(__("We can't find the quote item."));
+                $this->_redirect('checkout/cart');
+                return;
+            }
+
             $params = new \Magento\Framework\Object();
             $params->setCategoryId(false);
             $params->setConfigureMode(true);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
new file mode 100644
index 00000000000..7548af64e81
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Checkout\Controller\Cart;
+
+/**
+ * Shopping cart edit tests
+ */
+class ConfigureTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $responseMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageManagerMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\RedirectInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $redirectMock;
+
+    /**
+     * @var \Magento\Checkout\Controller\Cart\Configure | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configureController;
+
+    /**
+     * @var \Magento\Framework\App\Action\Context | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+    /**
+     * @var \Magento\Checkout\Model\Cart | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cartMock;
+
+    public function setUp()
+    {
+        $eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $urlMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $actionFlagMock = $this->getMockBuilder('Magento\Framework\App\ActionFlag')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['getParam'])
+            ->getMockForAbstractClass();
+        $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
+            ->setConstructorArgs(
+                [
+                    $this->requestMock,
+                    $this->responseMock,
+                    $this->objectManagerMock,
+                    $eventManagerMock,
+                    $urlMock,
+                    $this->redirectMock,
+                    $actionFlagMock,
+                    $viewMock,
+                    $this->messageManagerMock
+                ]
+            )
+            ->setMethods([])
+            ->getMock();
+        $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
+        $this->contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock);
+        $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
+        $this->contextMock->expects($this->any())->method('getRedirect')->willReturn($this->redirectMock);
+        $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $session = $this->getMockBuilder('Magento\Checkout\Model\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $formKeyValidator = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configureController = new \Magento\Checkout\Controller\Cart\Configure(
+            $this->contextMock,
+            $scopeConfig,
+            $session,
+            $storeManager,
+            $formKeyValidator,
+            $this->cartMock,
+            $this->resultPageFactoryMock
+        );
+    }
+
+    /**
+     * Test checks controller call product view and send parameter to it
+     *
+     * @return void
+     */
+    public function testPrepareAndRenderCall()
+    {
+        $quoteId = 1;
+        $actualProductId = 1;
+        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $viewMock = $this->getMockBuilder('Magento\Catalog\Helper\Product\View')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $pageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
+        //expects
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('id')
+            ->willReturn($quoteId);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('product_id')
+            ->willReturn($actualProductId);
+        $this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
+
+        $quoteItemMock->expects($this->exactly(1))->method('getBuyRequest')->willReturn($buyRequestMock);
+
+        $this->resultPageFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+        $this->objectManagerMock->expects($this->at(0))
+            ->method('get')
+            ->with('Magento\Catalog\Helper\Product\View')
+            ->willReturn($viewMock);
+
+        $viewMock->expects($this->once())->method('prepareAndRender')->with(
+            $pageMock,
+            $actualProductId,
+            $this->configureController,
+            $this->callback(
+                function ($subject) use ($buyRequestMock) {
+                    return $subject->getBuyRequest() === $buyRequestMock;
+                }
+            )
+        )->willReturn($pageMock);
+
+        $quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
+        $quoteItemMock->expects($this->exactly(2))->method('getProduct')->willReturn($productMock);
+
+        $productMock->expects($this->exactly(2))->method('getId')->willReturn($actualProductId);
+
+        $this->assertSame($pageMock, $this->configureController->execute());
+    }
+
+    /**
+     * Test checks controller redirect user to cart
+     * if user request product id in cart edit page is not same as quota product id
+     *
+     * @return void
+     */
+    public function testRedirectWithWrongProductId()
+    {
+        $quotaId = 1;
+        $productIdInQuota = 1;
+        $productIdInRequest = null;
+        $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('id')
+            ->willReturn($quotaId);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('product_id')
+            ->willReturn($productIdInRequest);
+        $this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
+        $quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
+        $quoteItemMock->expects($this->exactly(1))->method('getProduct')->willReturn($productMock);
+        $productMock->expects($this->exactly(1))->method('getId')->willReturn($productIdInQuota);
+        $this->messageManagerMock->expects($this->once())->method('addError');
+        $this->redirectMock->expects($this->once())->method('redirect')->with($this->responseMock, 'checkout/cart', []);
+        $this->configureController->execute();
+    }
+}
-- 
GitLab


From 45921f2bf8f46bd3ea3a1799d9abbcce09212940 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 24 Dec 2014 17:31:25 -0600
Subject: [PATCH 010/101] MAGETWO-31732: Blacklisted ComposerTest

- added test for forgotten "replace" packages
---
 composer.json                                            | 2 --
 .../testsuite/Magento/Test/Integrity/ComposerTest.php    | 9 +++++++++
 .../Magento/Framework/Composer/MagentoComponent.php      | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 7d2f6520184..8735194635f 100644
--- a/composer.json
+++ b/composer.json
@@ -143,9 +143,7 @@
         "magento/language-pt_br": "self.version",
         "magento/language-zh_cn": "self.version",
         "magento/framework": "self.version",
-        "magento/project-setup": "0.1.0",
         "oyejorge/less.php": "1.7.0",
-        "symfony/yaml": "2.3.x-dev",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/handlebars.js": "1.3.0",
         "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc",
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index f79d5aaae07..87ee01254e8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -414,5 +414,14 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
                 "The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
             );
         }
+        foreach (array_keys(self::$rootJson['replace']) as $replace) {
+            if (!MagentoComponent::matchMagentoComponent($replace)) {
+                $this->assertArrayHasKey(
+                    $replace,
+                    self::$rootJson['extra']['component_paths'],
+                    "The {$replace} is specified in 'replace', but missing in 'extra->component_paths' section"
+                );
+            }
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
index 4ec96eeed9f..b73b873e68d 100644
--- a/lib/internal/Magento/Framework/Composer/MagentoComponent.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -4,7 +4,8 @@
  */
 namespace Magento\Framework\Composer;
 
-class MagentoComponent {
+class MagentoComponent
+{
     /**
      * Get matched Magento component or empty array, if it's not a Magento component
      *
-- 
GitLab


From 51b74d14eee2ff8e383e9e6d755ab87d9fdf889b Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Thu, 25 Dec 2014 18:46:45 +0200
Subject: [PATCH 011/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Added test to new repo
---
 .../Catalog/Test/Block/Product/Price.php      |  10 +-
 .../GroupPriceOptions.php                     |   2 +
 .../Test/TestStep/CreateProductStep.php       |   3 +-
 .../Test/Repository/CatalogRule.php           |  11 +
 .../Test/TestStep/CreateCatalogRuleStep.php   |  64 +++++
 .../Checkout/Test/Block/Cart/CartItem.php     |  34 ++-
 .../Checkout/Test/Block/Cart/Totals.php       |  59 ++--
 ...axCalculationAfterCheckoutDownloadable.php |  73 +++++
 ...axRuleIsAppliedToAllPricesDownloadable.php |  71 +++++
 ...ckoutDownloadableExcludingIncludingTax.php |  62 +++++
 ...nAfterCheckoutDownloadableExcludingTax.php |  65 +++++
 ...nAfterCheckoutDownloadableIncludingTax.php |  62 +++++
 ...ricesDownloadableExcludingIncludingTax.php |  72 +++++
 ...iedToAllPricesDownloadableExcludingTax.php |  73 +++++
 ...iedToAllPricesDownloadableIncludingTax.php |  72 +++++
 .../Fixture/DownloadableProductInjectable.php |   2 +-
 .../CheckoutData.php                          |  17 ++
 .../GroupPriceOptions.php                     |  42 +++
 .../DownloadableProductInjectable.php         |  60 ++++
 .../DownloadableTaxCalculationTest.php        |  35 +++
 .../DownloadableTaxCalculationTest/test.csv   |  17 ++
 .../Downloadable/Test/etc/constraint.xml      |  27 ++
 .../Downloadable/Test/etc/scenario.xml        |  36 +++
 .../Adminhtml/Order/AbstractForm/Product.php  |  86 ++++++
 .../Adminhtml/Order/AbstractForm/Totals.php   | 210 ++++++++++++++
 .../Sales/Test/Block/Adminhtml/Order/Grid.php |   7 +
 .../Block/Adminhtml/Order/Invoice/Form.php    |   2 +-
 .../Block/Adminhtml/Order/Invoice/Totals.php  |   3 +-
 .../Test/Block/Adminhtml/Order/Totals.php     |  37 +--
 .../Test/Block/Adminhtml/Order/View/Items.php |  94 +++++++
 .../Magento/Sales/Test/Block/Order/View.php   | 256 ++++++++++++++++++
 .../Page/Adminhtml/OrderCreditMemoNew.xml     |   5 +
 .../AbstractAssertOrderTaxOnBackend.php       | 206 ++++++++++++++
 ...tractAssertTaxCalculationAfterCheckout.php | 157 +++++++++++
 ...ractAssertTaxRuleIsAppliedToAllPrices.php} | 141 +++-------
 ...stractAssertTaxWithCrossBorderApplying.php |   2 +-
 ...OrderTaxOnBackendExcludingIncludingTax.php |  89 ++++++
 .../AssertOrderTaxOnBackendExcludingTax.php   |  91 +++++++
 .../AssertOrderTaxOnBackendIncludingTax.php   |  89 ++++++
 ...tionAfterCheckoutExcludingIncludingTax.php |  62 +++++
 ...axCalculationAfterCheckoutExcludingTax.php |  63 +++++
 ...axCalculationAfterCheckoutIncludingTax.php |  62 +++++
 ...ppliedToAllPricesExcludingIncludingTax.php |  73 +++++
 ...axRuleIsAppliedToAllPricesExcludingTax.php |  73 +++++
 ...axRuleIsAppliedToAllPricesIncludingTax.php |  73 +++++
 .../Tax/Test/TestStep/CreateTaxRuleStep.php   |  65 +++++
 .../app/Magento/Tax/Test/etc/constraint.xml   |  27 ++
 .../app/Magento/Tax/Test/etc/scenario.xml     |  39 +++
 48 files changed, 2794 insertions(+), 187 deletions(-)
 create mode 100644 dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
 create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
 rename dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/{AssertTaxRuleIsAppliedToAllPrices.php => AbstractAssertTaxRuleIsAppliedToAllPrices.php} (54%)
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 10a1c191bd1..0b74cb899d9 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -293,21 +293,23 @@ class Price extends Block
      * Get price excluding tax
      *
      * @param string $currency
-     * @return string
+     * @return string|null
      */
     public function getPriceExcludingTax($currency = '$')
     {
-        return trim($this->_rootElement->find($this->priceExcludingTax)->getText(), $currency);
+        $priceElement = $this->_rootElement->find($this->priceExcludingTax);
+        return $priceElement->isVisible() ? trim($priceElement->getText(), $currency) : null;
     }
 
     /**
      * Get price including tax
      *
      * @param string $currency
-     * @return string
+     * @return string|null
      */
     public function getPriceIncludingTax($currency = '$')
     {
-        return trim($this->_rootElement->find($this->priceIncludingTax)->getText(), $currency);
+        $priceElement = $this->_rootElement->find($this->priceIncludingTax);
+        return $priceElement->isVisible() ? trim($priceElement->getText(), $currency) : null;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
index 7cfc80091db..9d22c52bed2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
@@ -68,6 +68,8 @@ class GroupPriceOptions implements FixtureInterface
     }
 
     /**
+     * Get preset array
+     *
      * @param string $name
      * @return mixed|null
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
index 7d173332e1b..453b3c7f875 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
@@ -54,7 +54,6 @@ class CreateProductStep implements TestStepInterface
         if ($product->hasData('id') === false) {
             $product->persist();
         }
-
-        return ['product' => $product];
+         return ['product' => $product];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
index b0ea023ce42..1576f4e5e46 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
@@ -87,5 +87,16 @@ class CatalogRule extends AbstractRepository
             'simple_action' => 'By Fixed Amount',
             'discount_amount' => '10',
         ];
+
+        $this->_data['catalog_price_rule_all_groups'] = [
+            'name' => 'catalog_price_rule_all_groups_%isolation%',
+            'description' => '-50% of price, Priority = 0',
+            'is_active' => 'Active',
+            'website_ids' => ['Main Website'],
+            'customer_group_ids' => ['NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'],
+            'sort_order' => '0',
+            'simple_action' => 'By Percentage of the Original Price',
+            'discount_amount' => '50',
+        ];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
new file mode 100644
index 00000000000..f0c087db7ab
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\CatalogRule\Test\TestStep;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestStep\TestStepInterface;
+
+/**
+ * Creating catalog rule
+ */
+class CreateCatalogRuleStep implements TestStepInterface
+{
+    /**
+     * Catalog Rule dataset name
+     *
+     * @var string
+     */
+    protected $catalogRule;
+
+    /**
+     * Factory for Fixture
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Preparing step properties
+     *
+     * @constructor
+     * @param FixtureFactory $fixtureFactory
+     * @param string $catalogRule
+     */
+    public function __construct(FixtureFactory $fixtureFactory, $catalogRule)
+    {
+        $this->fixtureFactory = $fixtureFactory;
+        $this->catalogRule = $catalogRule;
+    }
+
+    /**
+     * Create catalog rule
+     *
+     * @return array
+     */
+    public function run()
+    {
+        $result['catalogRule'] = null;
+        if ($this->catalogRule != '-') {
+            $catalogRule = $this->fixtureFactory->createByCode(
+                'catalogRule',
+                ['dataSet' => $this->catalogRule]
+            );
+            $catalogRule->persist();
+            $result['catalogRule'] = $catalogRule;
+        }
+        return $result;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
index c16fd46bb96..57d4fd6ad31 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -68,23 +68,27 @@ class CartItem extends AbstractCartItem
     /**
      * Get product price
      *
-     * @return string
+     * @return string|null
      */
     public function getPrice()
     {
-        $cartProductPrice = $this->_rootElement->find($this->price, Locator::SELECTOR_XPATH)->getText();
-        return str_replace(',', '', $this->escapeCurrency($cartProductPrice));
+        $cartProductPrice = $this->_rootElement->find($this->price, Locator::SELECTOR_XPATH);
+        return $cartProductPrice->isVisible()
+            ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+            : null;
     }
 
     /**
      * Get product price including tax
      *
-     * @return string
+     * @return string|null
      */
     public function getPriceInclTax()
     {
-        $cartProductPrice = $this->_rootElement->find($this->priceInclTax, Locator::SELECTOR_XPATH)->getText();
-        return str_replace(',', '', $this->escapeCurrency($cartProductPrice));
+        $cartProductPrice = $this->_rootElement->find($this->priceInclTax, Locator::SELECTOR_XPATH);
+        return $cartProductPrice->isVisible()
+            ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+            : null;
     }
 
     /**
@@ -111,29 +115,33 @@ class CartItem extends AbstractCartItem
     /**
      * Get sub-total for the specified item in the cart
      *
-     * @return string
+     * @return string|null
      */
     public function getSubtotalPrice()
     {
-        $price = $this->_rootElement->find($this->subtotalPrice, Locator::SELECTOR_XPATH)->getText();
-        return str_replace(',', '', $this->escapeCurrency($price));
+        $cartProductPrice = $this->_rootElement->find($this->subtotalPrice, Locator::SELECTOR_XPATH);
+        return $cartProductPrice->isVisible()
+            ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+            : null;
     }
 
     /**
      * Get sub-total including tax for the specified item in the cart
      *
-     * @return string
+     * @return string|null
      */
     public function getSubtotalPriceInclTax()
     {
-        $price = $this->_rootElement->find($this->subTotalPriceInclTax, Locator::SELECTOR_XPATH)->getText();
-        return str_replace(',', '', $this->escapeCurrency($price));
+        $cartProductPrice = $this->_rootElement->find($this->subTotalPriceInclTax, Locator::SELECTOR_XPATH);
+        return $cartProductPrice->isVisible()
+            ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+            : null;
     }
 
     /**
      * Get product options in the cart
      *
-     * @return string
+     * @return array
      */
     public function getOptions()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
index a9db2d56823..8c595162815 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -75,7 +75,7 @@ class Totals extends Block
      *
      * @var string
      */
-    protected $discount = '//tr[normalize-space(th)="Discount"]//span';
+    protected $discount = '[class=totals] .amount .price';
 
     /**
      * Get shipping price including tax selector
@@ -94,45 +94,45 @@ class Totals extends Block
     /**
      * Get Grand Total Text
      *
-     * @return array|string
+     * @return string
      */
     public function getGrandTotal()
     {
-        $grandTotal = $this->_rootElement->find($this->grandTotal)->getText();
+        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText();
         return $this->escapeCurrency($grandTotal);
     }
 
     /**
      * Get Grand Total Text
      *
-     * @return string
+     * @return string|null
      */
     public function getGrandTotalIncludingTax()
     {
-        $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($grandTotal);
+        $priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Get Grand Total Text
      *
-     * @return string
+     * @return string|null
      */
     public function getGrandTotalExcludingTax()
     {
-        $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($grandTotal);
+        $priceElement = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Get Tax text from Order Totals
      *
-     * @return array|string
+     * @return string|null
      */
     public function getTax()
     {
-        $taxPrice = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($taxPrice);
+        $priceElement = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
@@ -152,37 +152,37 @@ class Totals extends Block
      */
     public function getSubtotal()
     {
-        $subTotal = $this->_rootElement->find($this->subtotal)->getText();
+        $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_CSS)->getText();
         return $this->escapeCurrency($subTotal);
     }
 
     /**
      * Get Subtotal text
      *
-     * @return string
+     * @return string|null
      */
     public function getSubtotalIncludingTax()
     {
-        $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($subTotal);
+        $priceElement = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Get Subtotal text
      *
-     * @return string
+     * @return string|null
      */
     public function getSubtotalExcludingTax()
     {
-        $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($subTotal);
+        $priceElement = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Method that escapes currency symbols
      *
      * @param string $price
-     * @return string
+     * @return string|null
      */
     protected function escapeCurrency($price)
     {
@@ -193,35 +193,34 @@ class Totals extends Block
     /**
      * Get discount
      *
-     * @return string
+     * @return string|null
      */
     public function getDiscount()
     {
-        $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($discount);
+        $priceElement = $this->_rootElement->find($this->discount, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Get shipping price
      *
-     * @return string
+     * @return string|null
      */
     public function getShippingPrice()
     {
-        $shippingPrice = $this->_rootElement->find($this->shippingPriceSelector, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($shippingPrice);
+        $priceElement = $this->_rootElement->find($this->shippingPriceSelector, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
      * Get shipping price
      *
-     * @return string
+     * @return string|null
      */
     public function getShippingPriceInclTax()
     {
-        $shippingPrice = $this->_rootElement
-            ->find($this->shippingPriceInclTaxSelector, Locator::SELECTOR_CSS)->getText();
-        return $this->escapeCurrency($shippingPrice);
+        $priceElement = $this->_rootElement->find($this->shippingPriceInclTaxSelector, Locator::SELECTOR_CSS);
+        return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
new file mode 100644
index 00000000000..7bc83be16a6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Sales\Test\Page\OrderView;
+use Mtf\Fixture\InjectableFixture;
+use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
+
+/**
+ * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that prices on order review and customer order pages are equal to specified in dataset.
+     *
+     * @param array $prices
+     * @param InjectableFixture $product
+     * @param CheckoutCart $checkoutCart
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
+     * @param OrderView $orderView
+     * @return void
+     */
+    public function processAssert(
+        array $prices,
+        InjectableFixture $product,
+        CheckoutCart $checkoutCart,
+        CheckoutOnepage $checkoutOnepage,
+        CheckoutOnepageSuccess $checkoutOnepageSuccess,
+        OrderView $orderView
+    ) {
+        $this->checkoutOnepage = $checkoutOnepage;
+        $this->orderView = $orderView;
+
+        $checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
+        $checkoutOnepage->getBillingBlock()->clickContinue();
+        $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod(['method' => 'check_money_order']);
+        $checkoutOnepage->getPaymentMethodsBlock()->clickContinue();
+        $actualPrices = [];
+        $actualPrices = $this->getReviewPrices($actualPrices, $product);
+        $actualPrices = $this->getReviewTotals($actualPrices);
+        $prices = $this->preparePrices($prices);
+        //Order review prices verification
+        $message = 'Prices on order review should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+
+        $checkoutOnepage->getReviewBlock()->placeOrder();
+        $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+        $checkoutOnepageSuccess->getSuccessBlock()->openOrder();
+        $actualPrices = [];
+        $actualPrices = $this->getOrderPrices($actualPrices, $product);
+        $actualPrices = $this->getOrderTotals($actualPrices);
+
+        //Frontend order prices verification
+        $message = 'Prices on order view page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
new file mode 100644
index 00000000000..6075d98c4c5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Tax\Test\Constraint\AbstractAssertTaxRuleIsAppliedToAllPrices;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that specified prices are actual on category, product and cart pages.
+     *
+     * @param InjectableFixture $product
+     * @param array $prices
+     * @param int $qty
+     * @param CmsIndex $cmsIndex
+     * @param CatalogCategoryView $catalogCategoryView
+     * @param CatalogProductView $catalogProductView
+     * @param CheckoutCart $checkoutCart
+     * @param FixtureFactory $fixtureFactory
+     * @return void
+     */
+    public function processAssert(
+        InjectableFixture $product,
+        array $prices,
+        $qty,
+        CmsIndex $cmsIndex,
+        CatalogCategoryView $catalogCategoryView,
+        CatalogProductView $catalogProductView,
+        CheckoutCart $checkoutCart,
+        FixtureFactory $fixtureFactory
+    ) {
+        $this->cmsIndex = $cmsIndex;
+        $this->catalogCategoryView = $catalogCategoryView;
+        $this->catalogProductView = $catalogProductView;
+        $this->checkoutCart = $checkoutCart;
+        $actualPrices = [];
+        //Assertion steps
+        $productName = $product->getName();
+        $productCategory = $product->getCategoryIds()[0];
+        $this->openCategory($productCategory);
+        $actualPrices = $this->getCategoryPrices($productName, $actualPrices);
+        $catalogCategoryView->getListProductBlock()->openProductViewPage($productName);
+        $catalogProductView->getViewBlock()->fillOptions($product);
+        $actualPrices = $this->getProductPagePrices($actualPrices);
+        $catalogProductView->getViewBlock()->clickAddToCart();
+        $actualPrices = $this->getCartPrices($product, $actualPrices);
+        $actualPrices = $this->getTotals($actualPrices);
+        //Prices verification
+        $message = 'Prices from dataset should be equal to prices on frontend';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
new file mode 100644
index 00000000000..a686bf97175
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax
+    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotalInclTax();
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
new file mode 100644
index 00000000000..6244b27448f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+
+/**
+ * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax
+    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
new file mode 100644
index 00000000000..65bef8f5c92
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax
+    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotal();
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
new file mode 100644
index 00000000000..4882be04642
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax
+    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
+        $actualPrices['category_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = $viewBlock->getProductPriceExcludingTax();
+        $actualPrices['product_view_price_incl_tax'] = $viewBlock->getProductPriceIncludingTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
new file mode 100644
index 00000000000..d22ef997023
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
+    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = $priceBlock->getEffectivePrice();
+        $actualPrices['category_price_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+        $actualPrices['product_view_price_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
new file mode 100644
index 00000000000..3c824099019
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
+    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = null;
+        $actualPrices['category_price_incl_tax'] = $priceBlock->getEffectivePrice();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = null;
+        $actualPrices['product_view_price_incl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
index 1e61caaeb5e..1776aee3b32 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
@@ -143,7 +143,7 @@ class DownloadableProductInjectable extends InjectableFixture
         'default_value' => '',
         'input' => 'text',
         'group' => 'advanced-pricing',
-        'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions',
+        'source' => '\Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\GroupPriceOptions'
     ];
 
     protected $has_options = [
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
index 46d459335b3..5ee427ea18e 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
@@ -79,6 +79,23 @@ class CheckoutData extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\Ch
                     ],
                 ],
             ],
+
+            'one_custom_option_and_downloadable_link' => [
+                'options' => [
+                    'custom_options' => [
+                        [
+                            'title' => 'attribute_key_0',
+                            'value' => 'option_key_0'
+                        ],
+                    ],
+                    'links' => [
+                        [
+                            'label' => 'link_1',
+                            'value' => 'Yes'
+                        ]
+                    ],
+                ]
+            ],
         ];
         return isset($presets[$name]) ? $presets[$name] : [];
     }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
new file mode 100644
index 00000000000..14a1482d939
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
+
+/**
+ * Class GroupPriceOptions
+ *
+ * Data keys:
+ *  - preset (Price options preset name)
+ *  - products (comma separated sku identifiers)
+ */
+class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions
+{
+    /**
+     * Get preset array
+     *
+     * @param string $name
+     * @return mixed|null
+     */
+    protected function getPreset($name)
+    {
+        $presets = [
+            'downloadable_with_tax' => [
+                [
+                    'price' => 20.00,
+                    'website' => 'All Websites [USD]',
+                    'customer_group' => 'General',
+                ],
+            ],
+        ];
+        if (!isset($presets[$name])) {
+            return null;
+        }
+        return $presets[$name];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index 65b604c6bb4..53f2d5dc804 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -73,5 +73,65 @@ class DownloadableProductInjectable extends AbstractRepository
             'downloadable_links' => ['preset' => 'with_two_separately_links'],
             'checkout_data' => ['preset' => 'with_two_bought_links'],
         ];
+        $this->_data['with_two_separately_links_special_price_and_category'] = [
+            'name' => 'Downloadable product %isolation%',
+            'sku' => 'downloadable_product_%isolation%',
+            'type_id' => 'downloadable',
+            'url_key' => 'downloadable-product-%isolation%',
+            'price' => ['value' => '30'],
+            'special_price' => '20',
+            'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+            'quantity_and_stock_status' => [
+                'qty' => 1111,
+                'is_in_stock' => 'In Stock'
+            ],
+            'status' => 'Product online',
+            'category_ids' => ['presets' => 'default'],
+            'visibility' => 'Catalog, Search',
+            'is_virtual' => 'Yes',
+            'website_ids' => ['Main Website'],
+            'downloadable_links' => ['preset' => 'with_two_separately_links'],
+            'checkout_data' => ['preset' => 'with_two_separately_links']
+        ];
+        $this->_data['with_two_separately_links_group_price_and_category'] = [
+            'name' => 'Downloadable product %isolation%',
+            'sku' => 'downloadable_product_%isolation%',
+            'type_id' => 'downloadable',
+            'url_key' => 'downloadable-product-%isolation%',
+            'price' => ['value' => '30'],
+            'group_price' => ['preset' => 'downloadable_with_tax'],
+            'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+            'quantity_and_stock_status' => [
+                'qty' => 1111,
+                'is_in_stock' => 'In Stock'
+            ],
+            'status' => 'Product online',
+            'category_ids' => ['presets' => 'default'],
+            'visibility' => 'Catalog, Search',
+            'is_virtual' => 'Yes',
+            'website_ids' => ['Main Website'],
+            'downloadable_links' => ['preset' => 'with_two_separately_links'],
+            'checkout_data' => ['preset' => 'with_two_separately_links']
+        ];
+        $this->_data['with_two_separately_links_custom_options_and_category'] = [
+            'name' => 'Downloadable product %isolation%',
+            'sku' => 'downloadable_product_%isolation%',
+            'type_id' => 'downloadable',
+            'url_key' => 'downloadable-product-%isolation%',
+            'price' => ['value' => '20'],
+            'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+            'quantity_and_stock_status' => [
+                'qty' => 1111,
+                'is_in_stock' => 'In Stock'
+            ],
+            'status' => 'Product online',
+            'category_ids' => ['presets' => 'default'],
+            'visibility' => 'Catalog, Search',
+            'is_virtual' => 'Yes',
+            'website_ids' => ['Main Website'],
+            'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'],
+            'downloadable_links' => ['preset' => 'with_two_separately_links'],
+            'checkout_data' => ['preset' => 'one_custom_option_and_downloadable_link']
+        ];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
new file mode 100644
index 00000000000..bc7d8f9327e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\TestCase;
+
+use Magento\Tax\Test\TestCase\TaxCalculationTest;
+
+/**
+ * Test DownloadableTaxCalculationTest
+ *
+ * Test Flow:
+ * Steps:
+ * 1. Log in as default admin user.
+ * 2. Go to Stores > Taxes > Tax Rules.
+ * 3. Click 'Add New Tax Rule' button.
+ * 4. Assign default rates to rule.
+ * 5. Save Tax Rate.
+ * 6. Go to Products > Catalog.
+ * 7. Add new product.
+ * 8. Fill data according to dataset.
+ * 9. Save product.
+ * 10. Go to Stores > Configuration.
+ * 11. Fill Tax configuration according to data set.
+ * 12. Save tax configuration.
+ * 13. Perform all assertions.
+ *
+ * @group Tax_(CS)
+ * @ZephyrId MAGETWO-32076
+ */
+class DownloadableTaxCalculationTest extends TaxCalculationTest
+{
+    //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
new file mode 100644
index 00000000000..b173ea5f5a2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
@@ -0,0 +1,17 @@
+"description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"prices/category_price_excl_tax";"prices/category_price_incl_tax";"prices/product_view_price_excl_tax";"prices/product_view_price_incl_tax";"prices/cart_item_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_incl_tax";"prices/subtotal_excl_tax";"prices/subtotal_incl_tax";"prices/discount";"prices/shipping_excl_tax";"prices/shipping_incl_tax";"prices/tax";"prices/grand_total_excl_tax";"prices/grand_total_incl_tax";"constraint";"issue"
+"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_exin";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
+"Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_exin";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
+"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
+																						
+																						
+																						
+																						
+																						
+																						
+																						
+																						
+																						
+																						
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
index b10f5bbe514..d3a31c7be16 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
@@ -25,4 +25,31 @@
     <assertDownloadableProductInCustomerWishlistOnBackendGrid module="Magento_Downloadable">
         <severity>low</severity>
     </assertDownloadableProductInCustomerWishlistOnBackendGrid>
+    <assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax>
+    <assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax>
+    <assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax>
+    <assertTaxCalculationAfterCheckoutDownloadableExcludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutDownloadableExcludingTax>
+    <assertTaxCalculationAfterCheckoutDownloadableIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutDownloadableIncludingTax>
+    <assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax>
+    <assertOrderTaxOnBackendDownloadableExcludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendDownloadableExcludingTax>
+    <assertOrderTaxOnBackendDownloadableIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendDownloadableIncludingTax>
+    <assertOrderTaxOnBackendDownloadableExcludingIncludingTax module="Magento_Downloadable">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendDownloadableExcludingIncludingTax>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
new file mode 100644
index 00000000000..ce97ab96f36
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+    <scenario name="DownloadableTaxCalculationTest" module="Magento_Downloadable">
+        <methods>
+            <method name="test">
+                <steps>
+                    <first>setupConfiguration</first>
+                    <step name="setupConfiguration" module="Magento_Core">
+                        <next>createSalesRule</next>
+                    </step>
+                    <step name="createSalesRule" module="Magento_SalesRule">
+                        <next>createCatalogRule</next>
+                    </step>
+                    <step name="createCatalogRule" module="Magento_CatalogRule">
+                        <next>createTaxRule</next>
+                    </step>
+                    <step name="createTaxRule" module="Magento_Tax">
+                        <next>createProduct</next>
+                    </step>
+                    <step name="createProduct" module="Magento_Catalog">
+                        <next>createCustomer</next>
+                    </step>
+                    <step name="createCustomer" module="Magento_Customer">
+                        <next>loginCustomerOnFrontend</next>
+                    </step>
+                    <step name="loginCustomerOnFrontend" module="Magento_Customer" />
+                </steps>
+            </method>
+        </methods>
+    </scenario>
+</scenarios>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
index cae80b47c51..afdc7c0ed9f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
 
 use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
 
 /**
  * Class Product
@@ -13,6 +14,91 @@ use Mtf\Block\Form;
  */
 class Product extends Form
 {
+    /**
+     * Product price excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemExclTax = '//td[@class="col-price"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price including tax search mask
+     *
+     * @var string
+     */
+    protected $itemInclTax = '//td[@class="col-price"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price subtotal excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubExclTax = '//td[@class="col-subtotal"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price subtotal including tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubInclTax = '//td[@class="col-subtotal"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @return string|null
+     */
+    public function getItemPriceExclTax()
+    {
+        $price = $this->_rootElement->find($this->itemExclTax, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price including tax
+     *
+     * @return string|null
+     */
+    public function getItemPriceInclTax()
+    {
+        $price = $this->_rootElement->find($this->itemInclTax, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @return string|null
+     */
+    public function getItemSubExclTax()
+    {
+        $price = $this->_rootElement->find($this->itemSubExclTax, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @return string|null
+     */
+
+    public function getItemSubInclTax()
+    {
+        $price = $this->_rootElement->find($this->itemSubInclTax, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Method that escapes currency symbols
+     *
+     * @param string $price
+     * @return string|null
+     */
+    protected function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
+
     /**
      * Fill item product data
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
new file mode 100644
index 00000000000..e1e57b8961f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Invoice totals block
+ */
+class Totals extends Block
+{
+    /**
+     * Grand total search mask
+     *
+     * @var string
+     */
+    protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
+
+    /**
+     * Grand total excluding tax search mask
+     *
+     * @var string
+     */
+    protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
+
+    /**
+     * Grand total including tax search mask
+     *
+     * @var string
+     */
+    protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
+
+    /**
+     * Subtotal search mask
+     *
+     * @var string
+     */
+    protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
+
+    /**
+     * Subtotal excluding tax search mask
+     *
+     * @var string
+     */
+    protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
+
+    /**
+     * Subtotal including tax search mask
+     *
+     * @var string
+     */
+    protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
+
+    /**
+     * Tax search mask
+     *
+     * @var string
+     */
+    protected $tax = '//tr[normalize-space(td)="Tax"]//span';
+
+    /**
+     * Discount search mask
+     *
+     * @var string
+     */
+    protected $discount = '//tr[normalize-space(td)="Discount"]//span';
+
+    /**
+     * Shipping excluding tax search mask
+     *
+     * @var string
+     */
+    protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
+
+    /**
+     * Shipping including tax search mask
+     *
+     * @var string
+     */
+    protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
+
+    /**
+     * Get Grand Total Text
+     *
+     * @return string
+     */
+    public function getGrandTotal()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Grand Total Excluding Tax Text
+     *
+     * @return string
+     */
+    public function getGrandTotalExclTax()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Grand Total Including Tax Text
+     *
+     * @return string
+     */
+    public function getGrandTotalInclTax()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Tax text from Order Totals
+     *
+     * @return string
+     */
+    public function getTax()
+    {
+        $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($tax);
+    }
+
+    /**
+     * Get Tax text from Order Totals
+     *
+     * @return string|null
+     */
+    public function getDiscount()
+    {
+        $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
+        return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotal()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotalExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotalInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Shipping Excluding tax price text
+     *
+     * @return string|null
+     */
+    public function getShippingInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Get Shipping Including tax price text
+     *
+     * @return string|null
+     */
+    public function getShippingExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Method that escapes currency symbols
+     *
+     * @param string $price
+     * @return string|null
+     */
+    protected function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index d3bd69d03a0..3ffa76d1e47 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -42,6 +42,13 @@ class Grid extends GridInterface
      */
     protected $editLink = 'td[class*=col-action] a';
 
+    /**
+     * First row selector
+     *
+     * @var string
+     */
+    protected $firstRowSelector = '//tbody/tr[1]//a';
+
     /**
      * {@inheritdoc}
      */
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
index d7931b7c648..586ce942ea4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
@@ -26,7 +26,7 @@ class Form extends AbstractForm
      *
      * @return Items
      */
-    protected function getItemsBlock()
+    public function getItemsBlock()
     {
         return $this->blockFactory->create(
             'Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items',
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 32f2d54254c..819c75229fa 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -5,14 +5,13 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
 
-use Mtf\Block\Block;
 use Mtf\Client\Element\Locator;
 
 /**
  * Class Totals
  * Invoice totals block
  */
-class Totals extends Block
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
 {
     /**
      * Submit invoice button selector
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index cff130c94a3..88b5b445d3f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -5,43 +5,10 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
-
 /**
- * Class Totals
  * Order totals block
- *
  */
-class Totals extends Block
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
 {
-    /**
-     * Grand total search mask
-     *
-     * @var string
-     */
-    protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
-
-    /**
-     * Get Grand Total Text
-     *
-     * @return array|string
-     */
-    public function getGrandTotal()
-    {
-        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($grandTotal);
-    }
-
-    /**
-     * Method that escapes currency symbols
-     *
-     * @param string $price
-     * @return string|null
-     */
-    protected function escapeCurrency($price)
-    {
-        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
-        return (isset($matches[1])) ? $matches[1] : null;
-    }
+    //
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index d70210c7c11..85b4c41ee09 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -23,6 +23,36 @@ class Items extends Block
      */
     protected $priceSelector = '//div[@class="price-excl-tax"]//span[@class="price"]';
 
+    // @codingStandardsIgnoreStart
+    /**
+     * Product price excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemExclTax = '//tr[contains (.,"%s")]/td[@class="col-price"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price including tax search mask
+     *
+     * @var string
+     */
+    protected $itemInclTax = '//tr[contains (.,"%s")]/td[@class="col-price"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price subtotal excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubExclTax = '//tr[contains (.,"%s")]/td[@class="col-subtotal"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+    /**
+     * Product price subtotal including tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubInclTax = '//tr[contains (.,"%s")]/td[@class="col-subtotal"]/div[@class="price-incl-tax"]/span[@class="price"]';
+    // @codingStandardsIgnoreEnd
+
     /**
      * Returns the item price for the specified product.
      *
@@ -52,4 +82,68 @@ class Items extends Block
 
         return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->getText();
     }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemPriceExclTax($productName)
+    {
+        $locator = sprintf($this->itemExclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price including tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemPriceInclTax($productName)
+    {
+        $locator = sprintf($this->itemInclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemSubExclTax($productName)
+    {
+        $locator = sprintf($this->itemSubExclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemSubInclTax($productName)
+    {
+        $locator = sprintf($this->itemSubInclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Method that escapes currency symbols
+     *
+     * @param string $price
+     * @return string|null
+     */
+    protected function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index cb7a16398d8..e230d1ab368 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -35,6 +35,99 @@ class View extends Block
      */
     protected $link = '//*[contains(@class,"order-links")]//a[normalize-space(.)="%s"]';
 
+    /**
+     * Grand total search mask
+     *
+     * @var string
+     */
+    protected $grandTotal = '.grand_total span';
+
+    /**
+     * Grand total including tax search mask
+     *
+     * @var string
+     */
+    protected $grandTotalInclTax = '.grand_total_incl span';
+
+    /**
+     * Subtotal search mask
+     *
+     * @var string
+     */
+    protected $subtotal = '.subtotal .amount span';
+
+    /**
+     * Subtotal excluding tax search mask
+     *
+     * @var string
+     */
+    protected $subtotalExclTax = '.subtotal_excl span';
+
+    /**
+     * Subtotal including tax search mask
+     *
+     * @var string
+     */
+    protected $subtotalInclTax = '.subtotal_incl span';
+
+    /**
+     * Tax search mask
+     *
+     * @var string
+     */
+    protected $tax = '.totals-tax span';
+
+    /**
+     * Discount search mask
+     *
+     * @var string
+     */
+    protected $discount = '.discount span';
+
+    /**
+     * Shipping search mask
+     *
+     * @var string
+     */
+    protected $shippingExclTax = '.shipping span';
+
+    /**
+     * Shipping search mask
+     *
+     * @var string
+     */
+    protected $shippingInclTax = '.shipping_incl span';
+
+    /**
+     * Product price excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemExclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-excluding-tax"]/span';
+
+    /**
+     * Product price including tax search mask
+     *
+     * @var string
+     */
+    protected $itemInclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-including-tax"]/span';
+
+    // @codingStandardsIgnoreStart
+    /**
+     * Product price subtotal excluding tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubExclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-excluding-tax"]/span';
+
+    /**
+     * Product price subtotal including tax search mask
+     *
+     * @var string
+     */
+    protected $itemSubInclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-including-tax"]/span';
+    // @codingStandardsIgnoreEnd
+
     /**
      * Get item block
      *
@@ -60,4 +153,167 @@ class View extends Block
     {
         $this->_rootElement->find(sprintf($this->link, $name), Locator::SELECTOR_XPATH)->click();
     }
+
+    /**
+     * Get Grand Total Text
+     *
+     * @return string
+     */
+    public function getGrandTotal()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemPriceExclTax($productName)
+    {
+        $locator = sprintf($this->itemExclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemPriceInclTax($productName)
+    {
+        $locator = sprintf($this->itemInclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemSubExclTax($productName)
+    {
+        $locator = sprintf($this->itemSubExclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Item price excluding tax
+     *
+     * @param string $productName
+     * @return string|null
+     */
+    public function getItemSubInclTax($productName)
+    {
+        $locator = sprintf($this->itemSubInclTax, $productName);
+        $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+        return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+    }
+
+    /**
+     * Get Grand Total Text
+     *
+     * @return string|null
+     */
+    public function getGrandTotalInclTax()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Tax text from Order Totals
+     *
+     * @return string
+     */
+    public function getTax()
+    {
+        $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($tax);
+    }
+
+    /**
+     * Get Tax text from Order Totals
+     *
+     * @return string|null
+     */
+    public function getDiscount()
+    {
+        $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_CSS);
+        return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotal()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotalExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text
+     *
+     * @return string
+     */
+    public function getSubtotalInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Shipping Excluding tax price text
+     *
+     * @return string|null
+     */
+    public function getShippingInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_CSS);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Get Shipping Including tax price text
+     *
+     * @return string|null
+     */
+    public function getShippingExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_CSS);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Method that escapes currency symbols
+     *
+     * @param string $price
+     * @return string|null
+     */
+    protected function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
index 4dc2f4dec9a..5091b94e8d1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
@@ -16,5 +16,10 @@
             <locator>#edit_form</locator>
             <strategy>css selector</strategy>
         </formBlock>
+        <totalsBlock>
+            <class>Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\Totals</class>
+            <locator>.creditmemo-totals</locator>
+            <strategy>css selector</strategy>
+        </totalsBlock>
     </blocks>
 </page>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
new file mode 100644
index 00000000000..aa48b9bf01c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderView;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew;
+use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that prices displayed excluding tax in order are correct on backend.
+ */
+abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
+{
+    /**
+     * Order View Page.
+     *
+     * @var OrderView
+     */
+    protected $orderView;
+
+    /**
+     * Order View Page.
+     *
+     * @var OrderInvoiceNew
+     */
+    protected $orderInvoiceNew;
+
+    /**
+     * Order View Page.
+     *
+     * @var OrderCreditMemoNew
+     */
+    protected $orderCreditMemoNew;
+
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that specified prices are actual on order, invoice and refund pages.
+     *
+     * @param array $prices
+     * @param InjectableFixture $product
+     * @param OrderIndex $orderIndex ,
+     * @param OrderView $orderView
+     * @param OrderInvoiceNew $orderInvoiceNew
+     * @param OrderCreditMemoNew $orderCreditMemoNew
+     * @return void
+     */
+    public function processAssert(
+        array $prices,
+        InjectableFixture $product,
+        OrderIndex $orderIndex,
+        OrderView $orderView,
+        OrderInvoiceNew $orderInvoiceNew,
+        OrderCreditMemoNew $orderCreditMemoNew
+    ) {
+        $this->orderView = $orderView;
+        $this->orderInvoiceNew = $orderInvoiceNew;
+        $this->orderCreditMemoNew = $orderCreditMemoNew;
+        $orderIndex->open();
+        $orderIndex->getSalesOrderGrid()->openFirstRow();
+        //Check prices on order page
+        $actualPrices = [];
+        $actualPrices = $this->getOrderPrices($actualPrices, $product);
+        $actualPrices = $this->getOrderTotals($actualPrices);
+        $prices = $this->preparePrices($prices);
+        $message = 'Prices on order view page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        $orderView->getPageActions()->invoice();
+        //Check prices on invoice creation page
+        $actualPrices = [];
+        $actualPrices = $this->getInvoiceNewPrices($actualPrices, $product);
+        $actualPrices = $this->getInvoiceNewTotals($actualPrices);
+        $message = 'Prices on invoice new page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        $orderInvoiceNew->getTotalsBlock()->submit();
+        //Check prices after invoice on order page
+        $actualPrices = [];
+        $actualPrices = $this->getOrderPrices($actualPrices, $product);
+        $actualPrices = $this->getOrderTotals($actualPrices);
+        $message = 'Prices on invoice page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        $orderView->getPageActions()->orderCreditMemo();
+        //Check prices on credit memo creation page
+        $pricesCreditMemo = $this->preparePricesCreditMemo($prices);
+        $actualPrices = [];
+        $actualPrices = $this->getCreditMemoNewPrices($actualPrices, $product);
+        $actualPrices = $this->getCreditMemoNewTotals($actualPrices);
+        $message = 'Prices on credit memo new page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($pricesCreditMemo, $actualPrices, $message);
+        $orderCreditMemoNew->getFormBlock()->submit();
+        //Check prices after refund on order page
+        $actualPrices = [];
+        $actualPrices = $this->getOrderPrices($actualPrices, $product);
+        $actualPrices = $this->getOrderTotals($actualPrices);
+        $message = 'Prices on credit memo page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+    }
+
+    /**
+     * Unset category and product page expected prices.
+     *
+     * @param array $prices
+     * @return array
+     */
+    protected function preparePrices($prices)
+    {
+        if (isset($prices['category_price_excl_tax'])) {
+            unset($prices['category_price_excl_tax']);
+        }
+        if (isset($prices['category_price_incl_tax'])) {
+            unset($prices['category_price_incl_tax']);
+        }
+        if (isset($prices['product_view_price_excl_tax'])) {
+            unset($prices['product_view_price_excl_tax']);
+        }
+        if (isset($prices['product_view_price_incl_tax'])) {
+            unset($prices['product_view_price_incl_tax']);
+        }
+        return $prices;
+    }
+
+    /**
+     * Unset category and product page expected prices.
+     *
+     * @param array $prices
+     * @return array
+     */
+    protected function preparePricesCreditMemo($prices)
+    {
+        $prices['shipping_excl_tax'] = null;
+        $prices['shipping_incl_tax'] = null;
+        return $prices;
+    }
+
+    /**
+     * Get order product prices.
+     *
+     * @param InjectableFixture $product
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderPrices($actualPrices, InjectableFixture $product)
+    {
+        $viewBlock = $this->orderView->getItemsOrderedBlock();
+        $actualPrices['cart_item_price_excl_tax'] = $viewBlock->getItemPriceExclTax($product->getName());
+        $actualPrices['cart_item_price_incl_tax'] = $viewBlock->getItemPriceInclTax($product->getName());
+        $actualPrices['cart_item_subtotal_excl_tax'] = $viewBlock->getItemSubExclTax($product->getName());
+        $actualPrices['cart_item_subtotal_incl_tax'] = $viewBlock->getItemSubInclTax($product->getName());
+        return $actualPrices;
+    }
+
+    /**
+     * Get invoice new product prices.
+     *
+     * @param InjectableFixture $product
+     * @param $actualPrices
+     * @return array
+     */
+    public function getInvoiceNewPrices($actualPrices, InjectableFixture $product)
+    {
+        $productBlock = $this->orderInvoiceNew->getFormBlock()->getItemsBlock()->getItemProductBlock($product);
+        $actualPrices['cart_item_price_excl_tax'] = $productBlock->getItemPriceExclTax();
+        $actualPrices['cart_item_price_incl_tax'] = $productBlock->getItemPriceInclTax();
+        $actualPrices['cart_item_subtotal_excl_tax'] = $productBlock->getItemSubExclTax();
+        $actualPrices['cart_item_subtotal_incl_tax'] = $productBlock->getItemSubInclTax();
+        return $actualPrices;
+    }
+
+    /**
+     * Get Credit Memo new product prices.
+     *
+     * @param InjectableFixture $product
+     * @param $actualPrices
+     * @return array
+     */
+    public function getCreditMemoNewPrices($actualPrices, InjectableFixture $product)
+    {
+        $productBlock = $this->orderCreditMemoNew->getFormBlock()->getItemsBlock()->getItemProductBlock($product);
+        $actualPrices['cart_item_price_excl_tax'] = $productBlock->getItemPriceExclTax();
+        $actualPrices['cart_item_price_incl_tax'] = $productBlock->getItemPriceInclTax();
+        $actualPrices['cart_item_subtotal_excl_tax'] = $productBlock->getItemSubExclTax();
+        $actualPrices['cart_item_subtotal_incl_tax'] = $productBlock->getItemSubInclTax();
+        return $actualPrices;
+    }
+
+    /**
+     * Text of price verification after order creation.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Prices on backend after order creation is correct.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
new file mode 100644
index 00000000000..e83ccc15583
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Sales\Test\Page\OrderView;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that prices excluding tax on order review and customer order pages are equal to specified in dataset.
+ */
+abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstraint
+{
+    /**
+     * Checkout page.
+     *
+     * @var CheckoutOnepage
+     */
+    protected $checkoutOnepage;
+
+    /**
+     * Order view page.
+     *
+     * @var OrderView
+     */
+    protected $orderView;
+
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that prices on order review and customer order pages are equal to specified in dataset.
+     *
+     * @param array $prices
+     * @param InjectableFixture $product
+     * @param CheckoutCart $checkoutCart
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
+     * @param OrderView $orderView
+     * @return void
+     */
+    public function processAssert(
+        array $prices,
+        InjectableFixture $product,
+        CheckoutCart $checkoutCart,
+        CheckoutOnepage $checkoutOnepage,
+        CheckoutOnepageSuccess $checkoutOnepageSuccess,
+        OrderView $orderView
+    ) {
+        $this->checkoutOnepage = $checkoutOnepage;
+        $this->orderView = $orderView;
+
+        $checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
+        $checkoutOnepage->getBillingBlock()->clickContinue();
+        $shippingMethod = ['shipping_service' => 'Flat Rate', 'shipping_method' => 'Fixed'];
+        $checkoutOnepage->getShippingMethodBlock()->selectShippingMethod($shippingMethod);
+        $checkoutOnepage->getShippingMethodBlock()->clickContinue();
+        $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod(['method' => 'check_money_order']);
+        $checkoutOnepage->getPaymentMethodsBlock()->clickContinue();
+        $actualPrices = [];
+        $actualPrices = $this->getReviewPrices($actualPrices, $product);
+        $actualPrices = $this->getReviewTotals($actualPrices);
+        $prices = $this->preparePrices($prices);
+        //Order review prices verification
+        $message = 'Prices on order review should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+
+        $checkoutOnepage->getReviewBlock()->placeOrder();
+        $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+        $checkoutOnepageSuccess->getSuccessBlock()->openOrder();
+        $actualPrices = [];
+        $actualPrices = $this->getOrderPrices($actualPrices, $product);
+        $actualPrices = $this->getOrderTotals($actualPrices);
+
+        //Frontend order prices verification
+        $message = 'Prices on order view page should be equal to defined in dataset.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+    }
+
+    /**
+     * Prepare expected prices prices.
+     *
+     * @param array $prices
+     * @return array $prices
+     */
+    protected function preparePrices($prices)
+    {
+        if (isset($prices['category_price_excl_tax'])) {
+            unset($prices['category_price_excl_tax']);
+        }
+        if (isset($prices['category_price_incl_tax'])) {
+            unset($prices['category_price_incl_tax']);
+        }
+        if (isset($prices['product_view_price_excl_tax'])) {
+            unset($prices['product_view_price_excl_tax']);
+        }
+        if (isset($prices['product_view_price_incl_tax'])) {
+            unset($prices['product_view_price_incl_tax']);
+        }
+        return $prices;
+    }
+
+    /**
+     * Get review product prices.
+     *
+     * @param InjectableFixture $product
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewPrices($actualPrices, InjectableFixture $product)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['cart_item_price_excl_tax'] = $reviewBlock->getItemPriceExclTax($product->getName());
+        $actualPrices['cart_item_price_incl_tax'] = $reviewBlock->getItemPriceInclTax($product->getName());
+        $actualPrices['cart_item_subtotal_excl_tax'] = $reviewBlock->getItemSubExclTax($product->getName());
+        $actualPrices['cart_item_subtotal_incl_tax'] = $reviewBlock->getItemSubInclTax($product->getName());
+        return $actualPrices;
+    }
+
+    /**
+     * Get order product prices.
+     *
+     * @param InjectableFixture $product
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderPrices($actualPrices, InjectableFixture $product)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['cart_item_price_excl_tax'] = $viewBlock->getItemPriceExclTax($product->getName());
+        $actualPrices['cart_item_price_incl_tax'] = $viewBlock->getItemPriceInclTax($product->getName());
+        $actualPrices['cart_item_subtotal_excl_tax'] = $viewBlock->getItemSubExclTax($product->getName());
+        $actualPrices['cart_item_subtotal_incl_tax'] = $viewBlock->getItemSubInclTax($product->getName());
+        return $actualPrices;
+    }
+
+    /**
+     * Text of price verification after order creation
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Prices on front after order creation is correct.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
similarity index 54%
rename from dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
rename to dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index ac4a53f3f31..6eb167d44c4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -5,58 +5,61 @@
 
 namespace Magento\Tax\Test\Constraint;
 
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\InjectableFixture;
 
 /**
- * Class AssertTaxRuleIsAppliedToAllPrice
- * Checks that prices on category, product and cart pages are equal to specified in dataset
+ * Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
  */
-class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
+abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
 {
-    /* tags */
-    const SEVERITY = 'high';
-    /* end tags */
-
     /**
-     * Cms index page
+     * Cms index page.
      *
      * @var CmsIndex
      */
     protected $cmsIndex;
 
     /**
-     * Catalog product page
+     * Catalog product page.
      *
      * @var catalogCategoryView
      */
     protected $catalogCategoryView;
 
     /**
-     * Catalog product page
+     * Catalog product page.
      *
      * @var CatalogProductView
      */
     protected $catalogProductView;
 
     /**
-     * Catalog product page
+     * Catalog product page.
      *
      * @var CheckoutCart
      */
     protected $checkoutCart;
 
     /**
-     * Assert that specified prices are actual on category, product and cart pages
+     * Constraint severeness.
      *
-     * @param CatalogProductSimple $product
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that specified prices are actual on category, product and cart pages.
+     *
+     * @param InjectableFixture $product
      * @param array $prices
+     * @param int $qty
      * @param CmsIndex $cmsIndex
      * @param CatalogCategoryView $catalogCategoryView
      * @param CatalogProductView $catalogProductView
@@ -65,8 +68,9 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
      * @return void
      */
     public function processAssert(
-        CatalogProductSimple $product,
+        InjectableFixture $product,
         array $prices,
+        $qty,
         CmsIndex $cmsIndex,
         CatalogCategoryView $catalogCategoryView,
         CatalogProductView $catalogProductView,
@@ -80,98 +84,60 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
         //Preconditions
         $address = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'US_address_NY']);
         $shipping = ['carrier' => 'Flat Rate', 'method' => 'Fixed'];
-
+        $actualPrices = [];
         //Assertion steps
         $productName = $product->getName();
-        $this->openCategory($product);
-        $actualPrices = [];
+        $productCategory = $product->getCategoryIds()[0];
+        $this->openCategory($productCategory);
         $actualPrices = $this->getCategoryPrices($productName, $actualPrices);
         $catalogCategoryView->getListProductBlock()->openProductViewPage($productName);
+        $catalogProductView->getViewBlock()->fillOptions($product);
         $actualPrices = $this->getProductPagePrices($actualPrices);
-        $catalogProductView->getViewBlock()->setQtyAndClickAddToCart(3);
-        $actualPrices = $this->getCartPrices($product, $actualPrices);
+        $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($qty);
         $this->fillEstimateBlock($address, $shipping);
+        $actualPrices = $this->getCartPrices($product, $actualPrices);
         $actualPrices = $this->getTotals($actualPrices);
-
         //Prices verification
-        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, 'Arrays should be equal');
+        $message = 'Prices from dataset should be equal to prices on frontend.';
+        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
     }
 
     /**
-     * Open product category
+     * Open product category.
      *
-     * @param CatalogProductSimple $product
+     * @param string $productCategory
      * @return void
      */
-    public function openCategory(CatalogProductSimple $product)
+    public function openCategory($productCategory)
     {
         $this->cmsIndex->open();
-        $this->cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
+        $this->cmsIndex->getTopmenu()->selectCategoryByName($productCategory);
     }
 
-    /**
-     * Get prices on category page
-     *
-     * @param $productName
-     * @param array $actualPrices
-     * @return array
-     */
-    public function getCategoryPrices($productName, $actualPrices)
-    {
-        $actualPrices['category_price_excl_tax'] =
-            $this->catalogCategoryView
-                ->getListProductBlock()
-                ->getProductPriceBlock($productName)
-                ->getPriceExcludingTax();
-        $actualPrices['category_price_incl_tax'] =
-            $this->catalogCategoryView
-                ->getListProductBlock()
-                ->getProductPriceBlock($productName)
-                ->getPriceIncludingTax();
-        return $actualPrices;
-    }
 
     /**
-     * Get product view prices
+     * Get cart prices.
      *
+     * @param InjectableFixture $product
      * @param $actualPrices
      * @return array
      */
-    public function getProductPagePrices($actualPrices)
+    public function getCartPrices(InjectableFixture $product, $actualPrices)
     {
-        $actualPrices['product_view_price_excl_tax'] =
-            $this->catalogProductView
-                ->getViewBlock()
-                ->getProductPriceExcludingTax();
-        $actualPrices['product_view_price_incl_tax'] =
-            $this->catalogProductView
-                ->getViewBlock()
-                ->getProductPriceIncludingTax();
-        return $actualPrices;
-    }
-
-    /**
-     * Get cart prices
-     *
-     * @param CatalogProductSimple $product
-     * @param $actualPrices
-     * @return array
-     */
-    public function getCartPrices(CatalogProductSimple $product, $actualPrices)
-    {
-        $actualPrices['cart_item_subtotal_excl_tax'] =
-            $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPrice();
-        $actualPrices['cart_item_subtotal_incl_tax'] =
-            $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
         $actualPrices['cart_item_price_excl_tax'] =
             $this->checkoutCart->getCartBlock()->getCartItem($product)->getPrice();
         $actualPrices['cart_item_price_incl_tax'] =
             $this->checkoutCart->getCartBlock()->getCartItem($product)->getPriceInclTax();
+        $actualPrices['cart_item_subtotal_excl_tax'] =
+            $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPrice();
+        $actualPrices['cart_item_subtotal_incl_tax'] =
+            $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
+
         return $actualPrices;
     }
 
     /**
-     * Fill estimate block
+     * Fill estimate block.
      *
      * @param AddressInjectable $address
      * @param array $shipping
@@ -183,27 +149,6 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
         $this->checkoutCart->getShippingBlock()->selectShippingMethod($shipping);
     }
 
-    /**
-     * Get totals
-     *
-     * @param $actualPrices
-     * @return array
-     */
-    public function getTotals($actualPrices)
-    {
-        $actualPrices['subtotal_excl_tax'] = $this->checkoutCart->getTotalsBlock()->getSubtotalExcludingTax();
-        $actualPrices['subtotal_incl_tax'] = $this->checkoutCart->getTotalsBlock()->getSubtotalIncludingTax();
-        $actualPrices['discount'] = $this->checkoutCart->getTotalsBlock()->getDiscount();
-        $actualPrices['shipping_excl_tax'] = $this->checkoutCart->getTotalsBlock()->getShippingPrice();
-        $actualPrices['shipping_incl_tax'] = $this->checkoutCart->getTotalsBlock()->getShippingPriceInclTax();
-        $actualPrices['tax'] = $this->checkoutCart->getTotalsBlock()->getTax();
-        $actualPrices['grand_total_excl_tax'] =
-            $this->checkoutCart->getTotalsBlock()->getGrandTotalExcludingTax();
-        $actualPrices['grand_total_incl_tax'] =
-            $this->checkoutCart->getTotalsBlock()->getGrandTotalIncludingTax();
-        return $actualPrices;
-    }
-
     /**
      * Text of Tax Rule is applied
      *
@@ -211,6 +156,6 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
      */
     public function toString()
     {
-        return 'Prices on front is correct';
+        return 'Prices on front is correct.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
index 0dc49a4adda..be4e4cf38d3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
@@ -166,7 +166,7 @@ abstract class AbstractAssertTaxWithCrossBorderApplying extends AbstractConstrai
         $actualPrices['cart_item_subtotal_incl_tax'] =
             $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
         $actualPrices['grand_total'] =
-            $this->checkoutCart->getTotalsBlock()->getGrandTotal();
+            $this->checkoutCart->getTotalsBlock()->getGrandTotalIncludingTax();
         return $actualPrices;
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
new file mode 100644
index 00000000000..35c2ef23572
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices displayed excluding and including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTaxOnBackend
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get invoice new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getInvoiceNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalInclTax();
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get Credit Memo new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getCreditMemoNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalInclTax();
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
new file mode 100644
index 00000000000..56a46a082f9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendExcludingTax extends AbstractAssertOrderTaxOnBackend
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+        return $actualPrices;
+    }
+
+    /**
+     * Get invoice new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getInvoiceNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get Credit Memo new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getCreditMemoNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
new file mode 100644
index 00000000000..71b228adcc3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendIncludingTax extends AbstractAssertOrderTaxOnBackend
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get invoice new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getInvoiceNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get Credit Memo new totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getCreditMemoNewTotals($actualPrices)
+    {
+        $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
new file mode 100644
index 00000000000..29040ace551
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutExcludingIncludingTax
+    extends AbstractAssertTaxCalculationAfterCheckout
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotalInclTax();
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
new file mode 100644
index 00000000000..dba356b8e41
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutExcludingTax extends
+    AbstractAssertTaxCalculationAfterCheckout
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
new file mode 100644
index 00000000000..89611a8946d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutIncludingTax extends
+    AbstractAssertTaxCalculationAfterCheckout
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get review totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getReviewTotals($actualPrices)
+    {
+        $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotal();
+        $actualPrices['discount'] = $reviewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $reviewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+        $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get order totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getOrderTotals($actualPrices)
+    {
+        $viewBlock = $this->orderView->getOrderViewBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+        $actualPrices['discount'] = $viewBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+        $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+        $actualPrices['tax'] = $viewBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
new file mode 100644
index 00000000000..a5badd6fd90
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+/**
+ * Checks that prices excl and incl tax on category, product and cart pages are equal to specified in dataset
+ */
+class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax
+    extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
+        $actualPrices['category_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = $viewBlock->getProductPriceExcludingTax();
+        $actualPrices['product_view_price_incl_tax'] = $viewBlock->getProductPriceIncludingTax();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+        $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
new file mode 100644
index 00000000000..165d6cd23ac
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesExcludingTax extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = $priceBlock->getEffectivePrice();
+        $actualPrices['category_price_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+        $actualPrices['product_view_price_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['subtotal_incl_tax'] = null;
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+        $actualPrices['grand_total_incl_tax'] = null;
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
new file mode 100644
index 00000000000..ce12c61fbf1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesIncludingTax extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Get prices on category page.
+     *
+     * @param $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getCategoryPrices($productName, $actualPrices)
+    {
+        $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+        $actualPrices['category_price_excl_tax'] = null;
+        $actualPrices['category_price_incl_tax'] = $priceBlock->getEffectivePrice();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get product view prices.
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    public function getProductPagePrices($actualPrices)
+    {
+        $viewBlock = $this->catalogProductView->getViewBlock();
+        $actualPrices['product_view_price_excl_tax'] = null;
+        $actualPrices['product_view_price_incl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+
+        return $actualPrices;
+    }
+
+    /**
+     * Get totals.
+     *
+     * @param $actualPrices
+     * @return array
+     */
+    public function getTotals($actualPrices)
+    {
+        $totalsBlock = $this->checkoutCart->getTotalsBlock();
+        $actualPrices['subtotal_excl_tax'] = null;
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+        $actualPrices['discount'] = $totalsBlock->getDiscount();
+        $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+        $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+        $actualPrices['tax'] = $totalsBlock->getTax();
+        $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+        $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+
+        return $actualPrices;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
new file mode 100644
index 00000000000..94bc1cd3b81
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Tax\Test\TestStep;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestStep\TestStepInterface;
+
+/**
+ * Creating tax rule
+ */
+class CreateTaxRuleStep implements TestStepInterface
+{
+    /**
+     * Tax Rule
+     *
+     * @var string
+     */
+    protected $taxRule;
+
+    /**
+     * Factory for Fixture
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Preparing step properties
+     *
+     * @constructor
+     * @param FixtureFactory $fixtureFactory
+     * @param string $taxRule
+     */
+    public function __construct(FixtureFactory $fixtureFactory, $taxRule)
+    {
+        $this->fixtureFactory = $fixtureFactory;
+        $this->taxRule = $taxRule;
+    }
+
+    /**
+     * Create tax rule
+     *
+     * @return array
+     */
+    public function run()
+    {
+        $result['taxRule'] = null;
+        if ($this->taxRule != '-') {
+            $taxRule = $this->fixtureFactory->createByCode(
+                'taxRule',
+                ['dataSet' => $this->taxRule]
+            );
+            $taxRule->persist();
+            $result['taxRule'] = $taxRule;
+        }
+
+        return $result;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
index f61aa496c07..f44433948ca 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
@@ -56,6 +56,33 @@
     <assertTaxRuleIsApplied module="Magento_Tax">
         <severity>high</severity>
     </assertTaxRuleIsApplied>
+    <assertTaxRuleIsAppliedToAllPricesExcludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesExcludingTax>
+    <assertTaxRuleIsAppliedToAllPricesIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesIncludingTax>
+    <assertTaxRuleIsAppliedToAllPricesExcludingIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxRuleIsAppliedToAllPricesExcludingIncludingTax>
+    <assertTaxCalculationAfterCheckoutExcludingIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutExcludingIncludingTax>
+    <assertTaxCalculationAfterCheckoutExcludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutExcludingTax>
+    <assertTaxCalculationAfterCheckoutIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertTaxCalculationAfterCheckoutIncludingTax>
+    <assertOrderTaxOnBackendExcludingIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendExcludingIncludingTax>
+    <assertOrderTaxOnBackendIncludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendIncludingTax>
+    <assertOrderTaxOnBackendExcludingTax module="Magento_Tax">
+        <severeness>high</severeness>
+    </assertOrderTaxOnBackendExcludingTax>
     <assertTaxRuleIsAppliedToAllPrices module="Magento_Tax">
         <severity>high</severity>
     </assertTaxRuleIsAppliedToAllPrices>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
new file mode 100644
index 00000000000..a1d4d406e4f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+    <scenario name="TaxCalculationTest" module="Magento_Checkout">
+        <methods>
+            <method name="test">
+                <steps>
+                    <first>setupConfiguration</first>
+                    <step name="setupConfiguration" module="Magento_Core">
+                        <next>createSalesRule</next>
+                    </step>
+                    <step name="createSalesRule" module="Magento_SalesRule">
+                        <next>createCatalogRule</next>
+                    </step>
+                    <step name="createCatalogRule" module="Magento_CatalogRule">
+                        <next>createTaxRule</next>
+                    </step>
+                    <step name="createTaxRule" module="Magento_Tax">
+                        <next>createProduct</next>
+                    </step>
+                    <step name="createProduct" module="Magento_Catalog">
+                        <next>createCustomer</next>
+                    </step>
+                    <step name="createCustomer" module="Magento_Customer">
+                        <next>loginCustomerOnFrontend</next>
+                    </step>
+                    <step name="loginCustomerOnFrontend" module="Magento_Customer" />
+                </steps>
+            </method>
+        </methods>
+    </scenario>
+</scenarios>
-- 
GitLab


From dd9e3f91f36b0af7c1b69a90e109ee30f851d609 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 15:33:36 +0200
Subject: [PATCH 012/101] MAGETWO-32115: Implement ObjectManager

---
 .../lib/Mtf/ObjectManagerFactory.php          | 41 +++++++++----------
 dev/tests/functional/utils/bootstrap.php      |  7 +++-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index 6c8be6f8dd8..e41357231db 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -6,8 +6,8 @@
 namespace Mtf;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\ObjectManagerInterface as MagentoObjectManager;
-use Magento\Framework\Stdlib\BooleanUtils;
+use Mtf\ObjectManagerInterface as MagentoObjectManager;
+use Mtf\Stdlib\BooleanUtils;
 use Mtf\ObjectManager\Factory;
 use Mtf\System\Config as SystemConfig;
 
@@ -53,14 +53,11 @@ class ObjectManagerFactory
         }
 
         $diConfig = new $this->configClassName();
-        $systemConfig = new SystemConfig();
-        $configuration = $systemConfig->getConfigParam();
-        $diConfig->extend($configuration);
         $factory = new Factory($diConfig);
         $argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
-        $argumentMapper = new \Magento\Framework\ObjectManager\Config\Mapper\Dom($argInterpreter);
+        $argumentMapper = new \Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
 
-        $sharedInstances['Magento\Framework\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
+        $sharedInstances['Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
         $objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
 
         $factory->setObjectManager($objectManager);
@@ -85,35 +82,35 @@ class ObjectManagerFactory
         return new \Magento\Framework\App\DeploymentConfig(
             new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
             isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
-            ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
-            : null
+                ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
+                : null
         );
     }
 
     /**
      * Return newly created instance on an argument interpreter, suitable for processing DI arguments
      *
-     * @param \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
-     * @return \Magento\Framework\Data\Argument\InterpreterInterface
+     * @param \Mtf\Stdlib\BooleanUtils $booleanUtils
+     * @return \Mtf\Data\Argument\InterpreterInterface
      */
     protected function createArgumentInterpreter(
-        \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
+        \Mtf\Stdlib\BooleanUtils $booleanUtils
     ) {
-        $constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
-        $result = new \Magento\Framework\Data\Argument\Interpreter\Composite(
+        $constInterpreter = new \Mtf\Data\Argument\Interpreter\Constant();
+        $result = new \Mtf\Data\Argument\Interpreter\Composite(
             [
-                'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
-                'string' => new \Magento\Framework\Data\Argument\Interpreter\String($booleanUtils),
-                'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
-                'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
+                'boolean' => new \Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
+                'string' => new \Mtf\Data\Argument\Interpreter\String($booleanUtils),
+                'number' => new \Mtf\Data\Argument\Interpreter\Number(),
+                'null' => new \Mtf\Data\Argument\Interpreter\NullType(),
                 'const' => $constInterpreter,
-                'object' => new \Magento\Framework\Data\Argument\Interpreter\Object($booleanUtils),
-                'init_parameter' => new \Magento\Framework\App\Arguments\ArgumentInterpreter($constInterpreter),
+                'object' => new \Mtf\Data\Argument\Interpreter\Object($booleanUtils),
+                'init_parameter' => new \Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
             ],
-            \Magento\Framework\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
+            \Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
         );
         // Add interpreters that reference the composite
-        $result->addInterpreter('array', new \Magento\Framework\Data\Argument\Interpreter\ArrayType($result));
+        $result->addInterpreter('array', new \Mtf\Data\Argument\Interpreter\ArrayType($result));
         return $result;
     }
 
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index 34492b32b8f..c07502fbf21 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -13,6 +13,9 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
 require $appRoot . '/app/bootstrap.php';
 require __DIR__ . '/../vendor/autoload.php';
 
-$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$objectManager = $objectManagerFactory->create($_SERVER);
+
+$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
+//@TODO Remove below
+//$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+//$objectManager = $objectManagerFactory->create($_SERVER);
 \Mtf\ObjectManagerFactory::configure($objectManager);
-- 
GitLab


From 2cb62aac1c64f51b251aa44391ce6228616f7843 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 15:50:56 +0200
Subject: [PATCH 013/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/composer.json | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index ab4bd87728a..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,16 +1,22 @@
 {
-    "require": {
-        "magento/mtf": "1.0.0-rc10",
-        "php": ">=5.4.0",
-        "phpunit/phpunit": "4.1.0",
-        "phpunit/phpunit-selenium": ">=1.2",
-        "netwing/selenium-server-standalone": ">=2.35"
-    },
-    "autoload": {
-        "psr-4": {
-            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
-            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
-            "Test\\": "generated/Test/"
-        }
+  "repositories": [
+    {
+      "type": "vcs",
+      "url":  "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
     }
+  ],
+  "require": {
+    "magento/mtf": "dev-MAGETWO-32115",
+    "php": ">=5.4.0",
+    "phpunit/phpunit": "4.1.0",
+    "phpunit/phpunit-selenium": ">=1.2",
+    "netwing/selenium-server-standalone": ">=2.35"
+  },
+  "autoload": {
+    "psr-4": {
+      "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+      "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+      "Test\\": "generated/Test/"
+    }
+  }
 }
-- 
GitLab


From 8c0837dae3266a00504205622f3074f9ba2cc554 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 16:26:08 +0200
Subject: [PATCH 014/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/composer.json | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index e2e3d4ad289..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,16 +1,22 @@
 {
-    "require": {
-        "magento/mtf": "1.0.0-rc11",
-        "php": ">=5.4.0",
-        "phpunit/phpunit": "4.1.0",
-        "phpunit/phpunit-selenium": ">=1.2",
-        "netwing/selenium-server-standalone": ">=2.35"
-    },
-    "autoload": {
-        "psr-4": {
-            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
-            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
-            "Test\\": "generated/Test/"
-        }
+  "repositories": [
+    {
+      "type": "vcs",
+      "url":  "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
     }
+  ],
+  "require": {
+    "magento/mtf": "dev-MAGETWO-32115",
+    "php": ">=5.4.0",
+    "phpunit/phpunit": "4.1.0",
+    "phpunit/phpunit-selenium": ">=1.2",
+    "netwing/selenium-server-standalone": ">=2.35"
+  },
+  "autoload": {
+    "psr-4": {
+      "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+      "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+      "Test\\": "generated/Test/"
+    }
+  }
 }
-- 
GitLab


From 3b859ad302070f101388c6a9df94448f5c3b9c61 Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Sat, 27 Dec 2014 09:19:14 +0100
Subject: [PATCH 015/101] Made Topmenu HTML Editable

---
 app/code/Magento/Theme/Block/Html/Topmenu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index 70f82259f9f..c9c9f294615 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -61,6 +61,7 @@ class Topmenu extends Template implements IdentityInterface
             'page_block_html_topmenu_gethtml_after',
             ['menu' => $this->_menu, 'transportObject' => $transportObject]
         );
+        $html = $transportObject->getHtml();
 
         return $html;
     }
-- 
GitLab


From 1d894a4312dfa6856382cf9e2cb2a253ff3cedc1 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 11:40:46 +0200
Subject: [PATCH 016/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/lib/Mtf/ObjectManagerFactory.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index e41357231db..76acdd72b7b 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -5,11 +5,9 @@
 
 namespace Mtf;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Mtf\ObjectManagerInterface as MagentoObjectManager;
 use Mtf\Stdlib\BooleanUtils;
 use Mtf\ObjectManager\Factory;
-use Mtf\System\Config as SystemConfig;
 
 /**
  * Class ObjectManagerFactory
-- 
GitLab


From 56a79ede923a443f3538a57fa027a48f064277e7 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 18:04:08 +0200
Subject: [PATCH 017/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/lib/Mtf/Util/Generate/Factory.php      | 4 ++--
 .../lib/Mtf/Util/Generate/Fixture/FieldsProvider.php        | 4 ++--
 .../lib/Mtf/Util/Generate/Repository/CollectionProvider.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
index a652604eb96..e57ed53ce83 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
@@ -6,7 +6,7 @@
 namespace Mtf\Util\Generate;
 
 use Magento\Framework\App;
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
 
 /**
  * Class Factory
@@ -17,7 +17,7 @@ use Magento\Framework\ObjectManagerInterface;
 class Factory extends AbstractGenerate
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var \Mtf\ObjectManagerInterface
      */
     protected $objectManager;
 
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
index fcdd68334a4..882970878db 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -6,7 +6,7 @@
 namespace Mtf\Util\Generate\Fixture;
 
 use Magento\Framework\App\Resource;
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
 
 /**
  * Class FieldsProvider
@@ -26,7 +26,7 @@ class FieldsProvider implements FieldsProviderInterface
 
     /**
      * @constructor
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param \Mtf\ObjectManagerInterface $objectManager
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
index ce0fcdfbc2f..73230a4a5ba 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -5,7 +5,7 @@
 
 namespace Mtf\Util\Generate\Repository;
 
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
 
 /**
  * Class CollectionProvider
@@ -14,13 +14,13 @@ use Magento\Framework\ObjectManagerInterface;
 class CollectionProvider implements CollectionProviderInterface
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var \Mtf\ObjectManagerInterface
      */
     protected $objectManager;
 
     /**
      * @constructor
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param \Mtf\ObjectManagerInterface $objectManager
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
-- 
GitLab


From bcd54a4cf782f0833de3e5b3734881a98f9ac19d Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 18:18:45 +0200
Subject: [PATCH 018/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/lib/Mtf/Util/Generate/Factory.php      | 4 ++--
 .../lib/Mtf/Util/Generate/Fixture/FieldsProvider.php        | 4 ++--
 .../lib/Mtf/Util/Generate/Repository/CollectionProvider.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
index e57ed53ce83..a652604eb96 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
@@ -6,7 +6,7 @@
 namespace Mtf\Util\Generate;
 
 use Magento\Framework\App;
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class Factory
@@ -17,7 +17,7 @@ use Mtf\ObjectManagerInterface;
 class Factory extends AbstractGenerate
 {
     /**
-     * @var \Mtf\ObjectManagerInterface
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
index 882970878db..fcdd68334a4 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -6,7 +6,7 @@
 namespace Mtf\Util\Generate\Fixture;
 
 use Magento\Framework\App\Resource;
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class FieldsProvider
@@ -26,7 +26,7 @@ class FieldsProvider implements FieldsProviderInterface
 
     /**
      * @constructor
-     * @param \Mtf\ObjectManagerInterface $objectManager
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
index 73230a4a5ba..ce0fcdfbc2f 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -5,7 +5,7 @@
 
 namespace Mtf\Util\Generate\Repository;
 
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class CollectionProvider
@@ -14,13 +14,13 @@ use Mtf\ObjectManagerInterface;
 class CollectionProvider implements CollectionProviderInterface
 {
     /**
-     * @var \Mtf\ObjectManagerInterface
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 
     /**
      * @constructor
-     * @param \Mtf\ObjectManagerInterface $objectManager
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
      */
     public function __construct(ObjectManagerInterface $objectManager)
     {
-- 
GitLab


From 8b1186e23e2523fd9f5965b735222ed794d50a84 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:24:46 +0200
Subject: [PATCH 019/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/utils/bootstrap.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index c07502fbf21..2c0a8066139 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -13,9 +13,5 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
 require $appRoot . '/app/bootstrap.php';
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
-//@TODO Remove below
-//$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-//$objectManager = $objectManagerFactory->create($_SERVER);
 \Mtf\ObjectManagerFactory::configure($objectManager);
-- 
GitLab


From 26e1938017f1f12e0669bb96a20e1b5b9280cd70 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:36:35 +0200
Subject: [PATCH 020/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/composer.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index d5fd8645d29..65e0688fc00 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,12 +1,6 @@
 {
-  "repositories": [
-    {
-      "type": "vcs",
-      "url":  "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
-    }
-  ],
   "require": {
-    "magento/mtf": "dev-MAGETWO-32115",
+    "magento/mtf": "1.0.0-rc11",
     "php": ">=5.4.0",
     "phpunit/phpunit": "4.1.0",
     "phpunit/phpunit-selenium": ">=1.2",
-- 
GitLab


From 2f0965fe4de535d377ee66af3a009cc208bad4b0 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:57:01 +0200
Subject: [PATCH 021/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/composer.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 65e0688fc00..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,12 @@
 {
+  "repositories": [
+    {
+      "type": "vcs",
+      "url":  "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
+    }
+  ],
   "require": {
-    "magento/mtf": "1.0.0-rc11",
+    "magento/mtf": "dev-MAGETWO-32115",
     "php": ">=5.4.0",
     "phpunit/phpunit": "4.1.0",
     "phpunit/phpunit-selenium": ">=1.2",
-- 
GitLab


From 8eb7dcd62e9850259e1a74027ffa62e786cfaeb3 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 12:58:05 +0200
Subject: [PATCH 022/101] MAGETWO-32115: Implement ObjectManager

---
 dev/tests/functional/composer.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index d5fd8645d29..65e0688fc00 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,12 +1,6 @@
 {
-  "repositories": [
-    {
-      "type": "vcs",
-      "url":  "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
-    }
-  ],
   "require": {
-    "magento/mtf": "dev-MAGETWO-32115",
+    "magento/mtf": "1.0.0-rc11",
     "php": ">=5.4.0",
     "phpunit/phpunit": "4.1.0",
     "phpunit/phpunit-selenium": ">=1.2",
-- 
GitLab


From b104ff2744d551145a766cea3db7816288b459bb Mon Sep 17 00:00:00 2001
From: agurzhyi <agurzhyi@ebay.com>
Date: Tue, 30 Dec 2014 16:12:58 +0200
Subject: [PATCH 023/101] MAGETWO-32079: Alternative WebDriver support

---
 dev/tests/functional/composer.json            | 13 +++-
 .../Element/OptgroupselectElement.php         | 55 -----------------
 .../Element/ConditionsElement.php             | 37 ++++++------
 .../Element/DatepickerElement.php             |  7 +--
 .../Element/GlobalsearchElement.php           | 41 +++++++------
 .../Element/JquerytreeElement.php             | 10 +---
 .../Element/LiselectstoreElement.php          | 33 +++++------
 .../Element/MultiselectgrouplistElement.php   | 35 +++++------
 .../Element/MultiselectlistElement.php        | 26 ++------
 .../Element/MultisuggestElement.php           | 41 +++++--------
 .../Client/Element/OptgroupselectElement.php  | 50 ++++++++++++++++
 .../Element/SelectstoreElement.php            | 20 +++----
 .../Selenium => }/Element/SuggestElement.php  | 33 +++--------
 .../{Driver/Selenium => }/Element/Tree.php    | 38 ++++++------
 .../Selenium => }/Element/TreeElement.php     |  3 +-
 .../Util/Generate/Factory/AbstractFactory.php |  3 +-
 dev/tests/functional/phpunit.xml.dist         |  4 +-
 .../Backend/Test/Block/Admin/Login.php        |  2 +-
 .../app/Magento/Backend/Test/Block/Cache.php  |  4 +-
 .../app/Magento/Backend/Test/Block/Denied.php |  2 +-
 .../Backend/Test/Block/FormPageActions.php    |  5 +-
 .../Backend/Test/Block/Page/Header.php        |  4 +-
 .../Backend/Test/Block/System/Config/Form.php |  2 +-
 .../Test/Block/System/Config/Form/Group.php   |  9 ++-
 .../Test/Block/System/Config/PageActions.php  |  4 +-
 .../Test/Block/System/Store/Delete/Form.php   |  6 +-
 .../System/Store/Edit/Form/GroupForm.php      |  2 +-
 .../System/Store/Edit/Form/StoreForm.php      |  2 +-
 .../Test/Block/System/Store/StoreGrid.php     |  2 +-
 .../Backend/Test/Block/Widget/Form.php        |  2 +-
 .../Backend/Test/Block/Widget/FormTabs.php    | 26 ++++----
 .../Backend/Test/Block/Widget/Grid.php        | 13 ++--
 .../Magento/Backend/Test/Block/Widget/Tab.php | 18 +++---
 .../Backend/Test/Page/AdminAuthLogin.php      |  2 +-
 .../Catalog/Product/Edit/Tab/Bundle.php       |  9 +--
 .../Product/Edit/Tab/Bundle/Option.php        |  5 +-
 .../Test/Block/Catalog/Product/View.php       |  3 +-
 .../Catalog/Product/View/Type/Bundle.php      | 29 ++++-----
 .../AssertBundleItemsOnProductPage.php        |  6 +-
 .../Test/Constraint/AssertBundlePriceType.php |  6 +-
 .../Test/Constraint/AssertBundlePriceView.php |  6 +-
 .../AssertTierPriceOnBundleProductPage.php    | 11 ++--
 .../Adminhtml/Category/Edit/Tab/Product.php   |  5 +-
 .../Test/Block/Adminhtml/Category/Tree.php    |  9 ++-
 .../Adminhtml/Category/Widget/Chooser.php     |  2 +-
 .../Product/Attribute/AttributeForm.php       |  9 +--
 .../Product/Attribute/CustomAttribute.php     | 15 ++---
 .../Product/Attribute/Edit/AttributeForm.php  | 11 ++--
 .../Product/Attribute/Edit/Options.php        | 12 ++--
 .../Product/Attribute/Edit/Tab/Advanced.php   |  5 +-
 .../Product/Attribute/Edit/Tab/Options.php    |  5 +-
 .../Adminhtml/Product/Attribute/Set/Main.php  |  6 +-
 .../Adminhtml/Product/Composite/Configure.php |  7 +--
 .../Product/Edit/Action/Attribute.php         |  4 +-
 .../Product/Edit/AdvancedPricingTab.php       | 11 ++--
 .../Edit/AdvancedPricingTab/OptionGroup.php   |  6 +-
 .../Edit/AdvancedPricingTab/OptionTier.php    |  6 +-
 .../Adminhtml/Product/Edit/ProductTab.php     |  2 +-
 .../Product/Edit/Tab/AbstractRelated.php      | 16 ++---
 .../Product/Edit/Tab/Attributes/Search.php    |  3 +-
 .../Adminhtml/Product/Edit/Tab/Crosssell.php  |  6 +-
 .../Adminhtml/Product/Edit/Tab/Options.php    | 15 +++--
 .../Edit/Tab/Options/AbstractOptions.php      | 12 ++--
 .../Edit/Tab/Options/Type/DropDown.php        |  7 ++-
 .../Edit/Tab/ProductDetails/AttributeSet.php  |  2 +-
 .../Edit/Tab/ProductDetails/CategoryIds.php   |  4 +-
 .../ProductDetails/ProductOnlineSwitcher.php  |  6 +-
 .../Adminhtml/Product/Edit/Tab/Related.php    |  7 ++-
 .../Adminhtml/Product/Edit/Tab/Upsell.php     |  7 ++-
 .../Product/Edit/Tab/Websites/StoreTree.php   |  6 +-
 .../Adminhtml/Product/FormPageActions.php     |  2 +-
 .../Adminhtml/Product/GridPageAction.php      |  2 +-
 .../Block/Adminhtml/Product/ProductForm.php   | 17 +++---
 .../Catalog/Test/Block/Category/View.php      |  5 +-
 .../Catalog/Test/Block/Product/Additional.php | 17 +++---
 .../Block/Product/Compare/ListCompare.php     | 12 ++--
 .../Test/Block/Product/Compare/Sidebar.php    |  6 +-
 .../Product/Grouped/AssociatedProducts.php    | 13 ++--
 .../ListAssociatedProducts.php                | 12 ++--
 .../ListAssociatedProducts/Product.php        |  3 +
 .../AssociatedProducts/Search/Grid.php        |  5 +-
 .../Test/Block/Product/ListProduct.php        |  8 +--
 .../Catalog/Test/Block/Product/Price.php      |  6 +-
 .../Block/Product/ProductList/Crosssell.php   |  8 +--
 .../Block/Product/ProductList/Related.php     |  6 +-
 .../Test/Block/Product/ProductList/Upsell.php |  6 +-
 .../Catalog/Test/Block/Product/View.php       |  2 +-
 .../Test/Block/Product/View/CustomOptions.php | 59 ++++++++++---------
 .../app/Magento/Catalog/Test/Block/Search.php |  2 +-
 .../AssertCategoryAbsenceOnFrontend.php       | 11 ++--
 .../AssertCategoryForAssignedProducts.php     | 11 ++--
 .../Constraint/AssertCategoryIsNotActive.php  |  6 +-
 .../AssertCategoryIsNotIncludeInMenu.php      |  6 +-
 .../Test/Constraint/AssertCategoryPage.php    |  6 +-
 .../Constraint/AssertCategoryRedirect.php     | 11 ++--
 .../AssertCrossSellsProductsSection.php       |  6 +-
 .../AssertNoCrossSellsProductsSection.php     |  6 +-
 .../AssertNoRelatedProductsSection.php        |  6 +-
 .../AssertNoUpSellsProductsSection.php        |  6 +-
 ...rtProductAttributeDisplayingOnFrontend.php |  6 +-
 .../AssertProductAttributeIsComparable.php    |  6 +-
 .../AssertProductAttributeIsHtmlAllowed.php   |  6 +-
 .../AssertProductCompareBlockOnCmsPage.php    | 12 ++--
 ...ssertProductCustomOptionsOnProductPage.php | 11 ++--
 ...AssertProductGroupedPriceOnProductPage.php | 11 ++--
 .../Test/Constraint/AssertProductInCart.php   |  6 +-
 .../Test/Constraint/AssertProductInStock.php  | 11 ++--
 ...AssertProductIsNotDisplayingOnFrontend.php |  8 +--
 .../Constraint/AssertProductOutOfStock.php    | 11 ++--
 .../Test/Constraint/AssertProductPage.php     | 11 ++--
 ...AssertProductSpecialPriceOnProductPage.php | 11 ++--
 .../AssertProductTierPriceOnProductPage.php   |  6 +-
 .../Test/Constraint/AssertProductView.php     |  8 +--
 .../AssertRelatedProductsSection.php          |  6 +-
 .../AssertUpSellsProductsSection.php          |  6 +-
 .../Catalog/Test/Fixture/ProductAttribute.php |  2 +-
 .../Test/Page/Category/CatalogCategory.php    |  2 +-
 .../Page/Category/CatalogCategoryEdit.php     |  2 +-
 .../CatalogProductActionAttributeEdit.php     |  2 +-
 .../Product/AbstractCompareProductsTest.php   |  8 +--
 .../TestStep/OpenProductsOnFrontendStep.php   |  8 +--
 .../Test/Block/Adminhtml/Promo/Catalog.php    |  6 +-
 .../Promo/Catalog/Edit/PromoForm.php          |  5 +-
 .../Promo/Catalog/Edit/Tab/Conditions.php     |  8 +--
 .../CatalogRule/Test/Block/Conditions.php     |  2 +-
 .../Test/Block/Advanced/Form.php              | 13 ++--
 .../Test/Block/Advanced/Result.php            |  2 +-
 ...rtSearchSynonymMassActionNotOnFrontend.php |  6 +-
 .../AssertSearchSynonymNotOnFrontend.php      |  6 +-
 ...ssertSearchTermMassActionNotOnFrontend.php |  6 +-
 .../AssertSearchTermNotOnFrontend.php         |  6 +-
 .../Constraint/AssertSearchTermOnFrontend.php |  6 +-
 .../AssertSearchTermSynonymOnFrontend.php     |  6 +-
 .../app/Magento/Checkout/Test/Block/Cart.php  |  2 +-
 .../Checkout/Test/Block/Cart/CartEmpty.php    |  2 +-
 .../Checkout/Test/Block/Cart/CartItem.php     |  6 +-
 .../Test/Block/Cart/DiscountCodes.php         |  2 +-
 .../Checkout/Test/Block/Cart/Shipping.php     |  3 +-
 .../Checkout/Test/Block/Cart/Sidebar.php      |  2 +-
 .../Checkout/Test/Block/Cart/Sidebar/Item.php |  2 +-
 .../Checkout/Test/Block/Cart/Totals.php       |  2 +-
 .../Test/Constraint/AssertCartIsEmpty.php     |  6 +-
 .../AddProductsToShoppingCartEntityTest.php   |  8 +--
 .../DeleteProductsFromShoppingCartTest.php    |  8 +--
 .../Test/TestCase/UpdateShoppingCartTest.php  |  8 +--
 .../TestStep/AddProductsToTheCartStep.php     |  8 +--
 .../Product/AffectedAttributeSet.php          |  9 +--
 .../Product/Edit/Tab/Super/Config.php         | 14 +++--
 .../Edit/Tab/Super/Config/Attribute.php       | 23 ++++----
 .../Config/Attribute/AttributeSelector.php    |  2 +-
 .../Super/Config/Attribute/ToggleDropdown.php | 10 ++--
 .../Product/Edit/Tab/Super/Config/Matrix.php  | 16 ++---
 .../Adminhtml/Product/FormPageActions.php     |  2 +-
 .../Block/Adminhtml/Product/ProductForm.php   |  8 ++-
 .../Product/View/ConfigurableOptions.php      |  5 +-
 ...figurableAttributesAbsentOnProductPage.php |  6 +-
 ...leAttributesBlockIsAbsentOnProductPage.php |  6 +-
 .../AssertConfigurableProductInCart.php       |  6 +-
 .../System/Variable/FormPageActions.php       |  8 ++-
 .../app/Magento/Core/Test/Block/Messages.php  |  4 +-
 .../Constraint/AssertCustomVariableInPage.php |  6 +-
 .../Block/Account/AddressesAdditional.php     |  4 +-
 .../Test/Block/Account/AddressesDefault.php   |  2 +-
 .../Customer/Test/Block/Account/Links.php     |  2 +-
 .../Customer/Test/Block/Address/Edit.php      |  2 +-
 .../Block/Adminhtml/Edit/Tab/Addresses.php    |  8 ++-
 .../Test/Block/Form/ForgotPassword.php        |  2 +-
 .../Customer/Test/Block/Form/Login.php        |  2 +-
 .../Customer/Test/Block/Form/Register.php     |  2 +-
 .../Test/Page/Address/DefaultAddress.php      |  2 +-
 .../Page/CustomerAccountForgotPassword.php    |  2 +-
 .../Test/Page/CustomerAddressEdit.php         |  2 +-
 .../Catalog/Product/Edit/Tab/Downloadable.php | 17 +++---
 .../Product/Edit/Tab/Downloadable/Links.php   | 16 ++---
 .../Product/Edit/Tab/Downloadable/Samples.php | 16 ++---
 .../Test/Block/Catalog/Product/View.php       |  2 +-
 .../Test/Block/Catalog/Product/View/Links.php |  4 +-
 .../Block/Catalog/Product/View/Samples.php    |  2 +-
 .../Block/Customer/Products/ListProducts.php  |  2 +-
 .../AssertDownloadableLinksData.php           |  6 +-
 .../AssertDownloadableSamplesData.php         |  6 +-
 .../Block/Adminhtml/Order/Create/Form.php     |  6 +-
 .../Block/Adminhtml/Order/Create/Items.php    |  2 +-
 .../Order/Create/Items/ItemProduct.php        |  3 +-
 .../Test/Block/Adminhtml/Order/View/Items.php |  2 +-
 .../Order/View/Items/ItemProduct.php          |  3 +-
 .../GiftMessage/Test/Block/Message/Inline.php |  2 +-
 .../Test/Block/Message/Order/Items/View.php   |  2 +-
 .../Types/Edit/GoogleShoppingForm.php         | 10 ++--
 .../Product/Grouped/AssociatedProducts.php    | 13 ++--
 .../ListAssociatedProducts.php                |  3 +-
 .../AssociatedProducts/Search/Grid.php        |  1 -
 .../Catalog/Product/View/Type/Grouped.php     |  2 +-
 .../Test/Block/Checkout/Cart/CartItem.php     |  1 -
 ...bstractAssertPriceOnGroupedProductPage.php |  6 +-
 ...AssertGroupedPriceOnGroupedProductPage.php |  6 +-
 .../AssertGroupedProductsDefaultQty.php       |  6 +-
 ...AssertSpecialPriceOnGroupedProductPage.php |  6 +-
 .../AssertTierPriceOnGroupedProductPage.php   |  6 +-
 .../Adminhtml/Integration/IntegrationGrid.php |  2 +-
 .../IntegrationGrid/DeleteDialog.php          |  2 +-
 .../Test/Block/Adminhtml/Template/Grid.php    |  2 +-
 .../Test/Block/Adminhtml/Template/Preview.php |  4 +-
 .../Constraint/AssertNewsletterPreview.php    |  6 +-
 .../Block/Adminhtml/Customer/AccountsGrid.php |  2 +-
 .../Block/Adminhtml/Customer/Totals/Grid.php  |  6 +-
 .../Adminhtml/Refresh/Statistics/Grid.php     |  2 +-
 .../Block/Adminhtml/Review/Customer/Grid.php  |  2 +-
 .../Block/Adminhtml/Review/Products/Grid.php  |  2 +-
 .../Review/Products/Viewed/ProductGrid.php    |  2 +-
 .../Sales/Orders/Viewed/FilterGrid.php        |  2 +-
 .../Block/Adminhtml/Shopcart/Product/Grid.php |  2 +-
 .../AbandonedCartsReportEntityTest.php        | 14 ++---
 .../CustomerReviewReportEntityTest.php        |  6 +-
 .../TestCase/ProductsInCartReportEntity.php   |  6 +-
 .../ViewedProductsReportEntityTest.php        |  8 +--
 .../Block/Adminhtml/Edit/RatingElement.php    | 10 ++--
 .../Test/Block/Adminhtml/ReviewForm.php       |  3 +-
 .../app/Magento/Review/Test/Block/Form.php    | 14 ++---
 .../Test/Block/Product/View/Summary.php       |  4 +-
 .../AssertProductRatingInProductPage.php      |  6 +-
 .../AssertProductRatingNotInProductPage.php   |  6 +-
 .../AssertProductReviewNotOnProductPage.php   |  6 +-
 .../AssertProductReviewOnProductPage.php      |  6 +-
 .../CreateProductReviewFrontendEntityTest.php |  6 +-
 ...anageProductReviewFromCustomerPageTest.php |  8 +--
 .../Block/Adminhtml/Order/AbstractForm.php    |  1 -
 .../Block/Adminhtml/Order/AbstractItems.php   |  2 +-
 .../Test/Block/Adminhtml/Order/Actions.php    |  4 +-
 .../Test/Block/Adminhtml/Order/Create.php     |  2 +-
 .../Order/Create/Billing/Address.php          |  1 -
 .../Order/Create/CustomerActivities.php       |  2 +-
 .../Create/CustomerActivities/Sidebar.php     |  2 +-
 .../Sidebar/RecentlyViewedProducts.php        |  5 +-
 .../Block/Adminhtml/Order/Create/Items.php    |  4 +-
 .../Order/Create/Items/ItemProduct.php        |  2 +-
 .../Order/Create/Shipping/Address.php         |  2 +-
 .../Order/Create/Shipping/Method.php          |  2 +-
 .../Block/Adminhtml/Order/Create/Store.php    |  2 +-
 .../Sales/Test/Block/Adminhtml/Order/Grid.php |  2 +-
 .../Test/Block/Adminhtml/Order/History.php    |  2 +-
 .../Adminhtml/Order/Invoice/Form/Items.php    |  2 +-
 .../Block/Adminhtml/Order/Invoice/Totals.php  |  3 +-
 .../Adminhtml/Order/Shipment/View/Items.php   |  2 +-
 .../Test/Block/Adminhtml/Order/Totals.php     |  2 +-
 .../Test/Block/Adminhtml/Order/View/Info.php  |  2 +-
 .../Test/Block/Adminhtml/Order/View/Items.php |  2 +-
 .../Order/View/Tab/CreditMemos/Grid.php       |  2 +-
 .../Block/Adminhtml/Order/View/Tab/Info.php   |  2 +-
 .../Order/View/Tab/Invoices/Grid.php          |  2 +-
 .../Order/View/Tab/Shipments/Grid.php         |  2 +-
 .../Sales/Test/Block/Order/History.php        |  6 +-
 .../Magento/Sales/Test/Block/Order/Info.php   |  2 +-
 .../Magento/Sales/Test/Block/Order/Items.php  |  2 +-
 .../Magento/Sales/Test/Block/Order/View.php   |  2 +-
 .../Test/Block/Order/View/ActionsToolbar.php  |  2 +-
 .../Sales/Test/Page/SalesOrderShipmentNew.php |  2 +-
 .../TestStep/PrintOrderOnFrontendStep.php     |  8 +--
 .../Test/Block/Adminhtml/Order/Tracking.php   |  2 +-
 .../Shipping/Test/Block/Order/Info.php        |  2 +-
 .../Shipping/Test/Block/Order/Shipment.php    |  2 +-
 .../Test/Block/Adminhtml/SitemapGrid.php      |  2 +-
 .../app/Magento/Store/Test/Block/Switcher.php |  2 +-
 .../Test/Block/Adminhtml/Rule/Edit/Form.php   | 25 ++++----
 .../Tax/Test/Block/Adminhtml/Rule/Grid.php    |  1 -
 .../Test/Constraint/AssertTaxRuleApplying.php |  6 +-
 .../Magento/Theme/Test/Block/Html/Footer.php  |  6 +-
 .../Magento/Theme/Test/Block/Html/Topmenu.php |  2 +-
 .../app/Magento/Theme/Test/Block/Links.php    |  7 ++-
 .../Block/Adminhtml/Catalog/Category/Tree.php |  2 +-
 .../Adminhtml/Catalog/Edit/UrlRewriteForm.php |  5 +-
 .../Test/Block/Adminhtml/Selector.php         |  2 +-
 .../AssertPageByUrlRewriteIsNotFound.php      |  6 +-
 .../AssertUrlRewriteCategoryRedirect.php      |  6 +-
 .../AssertUrlRewriteCustomRedirect.php        |  6 +-
 .../AssertUrlRewriteCustomSearchRedirect.php  |  6 +-
 .../AssertUrlRewriteProductRedirect.php       |  6 +-
 ...AssertUrlRewriteSuccessOutsideRedirect.php |  6 +-
 .../Test/Block/Adminhtml/Role/Tab/Role.php    |  6 +-
 .../Test/Block/Adminhtml/User/Edit/Form.php   |  2 +-
 .../Block/Adminhtml/User/Edit/PageActions.php |  2 +-
 .../Test/Block/Adminhtml/User/Tab/Role.php    |  7 +--
 .../Adminhtml/Customer/Edit/Tab/Wishlist.php  |  2 +-
 .../Customer/Edit/Tab/Wishlist/Grid.php       | 12 ++--
 .../Test/Block/Customer/Wishlist/Items.php    |  4 +-
 .../Block/Customer/Wishlist/Items/Product.php |  6 +-
 .../Test/TestCase/ShareWishlistEntityTest.php |  6 +-
 .../TestStep/AddProductsToWishlistStep.php    |  8 +--
 288 files changed, 1041 insertions(+), 1033 deletions(-)
 delete mode 100644 dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/ConditionsElement.php (92%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/DatepickerElement.php (94%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/GlobalsearchElement.php (82%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/JquerytreeElement.php (95%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/LiselectstoreElement.php (80%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultiselectgrouplistElement.php (91%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultiselectlistElement.php (75%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultisuggestElement.php (65%)
 create mode 100644 dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/SelectstoreElement.php (69%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/SuggestElement.php (70%)
 mode change 100755 => 100644
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/Tree.php (79%)
 rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/TreeElement.php (94%)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index ab4bd87728a..fc1d2bfa0db 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,17 @@
 {
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/giorgiosironi/phpunit-selenium.git"
+        }
+    ],
     "require": {
-        "magento/mtf": "1.0.0-rc10",
+        "magento/mtf": "dev-MAGETWO-32079-2",
+        "facebook/webdriver": "dev-master",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
deleted file mode 100644
index b2156bcf2c6..00000000000
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-namespace Mtf\Client\Driver\Selenium\Element;
-
-use Mtf\Client\Driver\Selenium\Element;
-
-/**
- * Class OptgroupselectElement
- * Typified element class for option group selectors
- */
-class OptgroupselectElement extends SelectElement
-{
-    /**
-     * Option group selector
-     *
-     * @var string
-     */
-    protected $optGroup = 'optgroup[option[contains(.,"%s")]]';
-
-    /**
-     * Get the value of form element
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
-        $selectedLabel = trim($this->_getWrappedElement()->selectedLabel());
-        $value = trim(
-            $this->_getWrappedElement()->byXPath(sprintf($this->optGroup, $selectedLabel))->attribute('label'),
-            chr(0xC2) . chr(0xA0)
-        );
-        $value .= '/' . $selectedLabel;
-        return $value;
-    }
-
-    /**
-     * Select value in dropdown which has option groups
-     *
-     * @param string $value
-     * @return void
-     */
-    public function setValue($value)
-    {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
-        list($group, $option) = explode('/', $value);
-        $optionLocator = ".//optgroup[@label='$group']/option[contains(text(), '$option')]";
-        $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('xpath');
-        $criteria->value($optionLocator);
-        $this->_getWrappedElement(true)->selectOptionByCriteria($criteria);
-    }
-}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
similarity index 92%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 358a5df3f25..17fe72704a2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -3,12 +3,10 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element as AbstractElement;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
 use Mtf\ObjectManager;
+use Mtf\Client\Locator;
 
 /**
  * Class ConditionsElement
@@ -36,7 +34,7 @@ use Mtf\ObjectManager;
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
-class ConditionsElement extends AbstractElement
+class ConditionsElement extends SimpleElement
 {
     /**
      * Main condition
@@ -186,10 +184,10 @@ class ConditionsElement extends AbstractElement
      * Add condition combination
      *
      * @param string $condition
-     * @param Element $context
-     * @return Element
+     * @param SimpleElement $context
+     * @return SimpleElement
      */
-    protected function addConditionsCombination($condition, Element $context)
+    protected function addConditionsCombination($condition, SimpleElement $context)
     {
         $condition = $this->parseCondition($condition);
         $newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH);
@@ -209,10 +207,10 @@ class ConditionsElement extends AbstractElement
      * Add conditions
      *
      * @param array $conditions
-     * @param Element $context
+     * @param SimpleElement $context
      * @return void
      */
-    protected function addMultipleCondition(array $conditions, Element $context)
+    protected function addMultipleCondition(array $conditions, SimpleElement $context)
     {
         foreach ($conditions as $key => $condition) {
             $elementContext = is_numeric($key) ? $context : $this->addConditionsCombination($key, $context);
@@ -228,10 +226,10 @@ class ConditionsElement extends AbstractElement
      * Add single Condition
      *
      * @param string $condition
-     * @param Element $context
+     * @param SimpleElement $context
      * @return void
      */
-    protected function addSingleCondition($condition, Element $context)
+    protected function addSingleCondition($condition, SimpleElement $context)
     {
         $condition = $this->parseCondition($condition);
 
@@ -255,14 +253,15 @@ class ConditionsElement extends AbstractElement
      * Fill single condition
      *
      * @param array $rules
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      * @throws \Exception
      */
-    protected function fillCondition(array $rules, Element $element)
+    protected function fillCondition(array $rules, SimpleElement $element)
     {
         $this->resetKeyParam();
         foreach ($rules as $rule) {
+            /** @var SimpleElement $param */
             $param = $this->findNextParam($element);
             $param->find('a')->click();
 
@@ -286,13 +285,13 @@ class ConditionsElement extends AbstractElement
                     return $element->isVisible() ? true : null;
                 }
             );
-            $value = $param->find('select', Locator::SELECTOR_CSS, 'select');
+            $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
             if ($value->isVisible()) {
                 $value->setValue($rule);
                 $this->click();
                 continue;
             }
-            $value = $param->find('input');
+            $value = $param->find('input', Locator::SELECTOR_TAG_NAME);
             if ($value->isVisible()) {
                 $value->setValue($rule);
 
@@ -355,11 +354,11 @@ class ConditionsElement extends AbstractElement
     /**
      * Find next param of condition for fill
      *
-     * @param Element $context
-     * @return Element
+     * @param SimpleElement $context
+     * @return SimpleElement
      * @throws \Exception
      */
-    protected function findNextParam(Element $context)
+    protected function findNextParam(SimpleElement $context)
     {
         do {
             if (!isset($this->mapParams[$this->findKeyParam])) {
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php b/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
index 3c21916b834..1362eafe84d 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
@@ -3,15 +3,14 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * General class for datepicker elements.
  */
-class DatepickerElement extends Element
+class DatepickerElement extends SimpleElement
 {
     /**
      * DatePicker button.
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
similarity index 82%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
index 6d59992fcdf..8cd5a1b424f 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
@@ -3,16 +3,21 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Element\Locator;
-use Mtf\Client\Driver\Selenium\Element;
+use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
 
 /**
  * Typified element class for global search element.
  */
-class GlobalsearchElement extends Element
+class GlobalsearchElement extends SimpleElement
 {
+    /**
+     * "Backspace" key code.
+     */
+    const BACKSPACE = "\xEE\x80\x83";
+
     /**
      * Search icon selector.
      *
@@ -48,11 +53,6 @@ class GlobalsearchElement extends Element
      */
     protected $resultItem = 'li';
 
-    /**
-     * "Backspace" key code.
-     */
-    const BACKSPACE = "\xEE\x80\x83";
-
     /**
      * Set value.
      *
@@ -61,7 +61,7 @@ class GlobalsearchElement extends Element
      */
     public function setValue($value)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         $this->waitInitElement();
 
@@ -70,7 +70,7 @@ class GlobalsearchElement extends Element
         }
         $this->selectWindow();
         $this->clear();
-        $this->find($this->searchInput)->_getWrappedElement()->value($value);
+        $this->find($this->searchInput)->setValue($value);
         $this->selectWindow();
 
         $this->waitResult();
@@ -85,7 +85,7 @@ class GlobalsearchElement extends Element
     {
         $element = $this->find($this->searchInput);
         while ('' != $element->getValue()) {
-            $element->keys([self::BACKSPACE]);
+            $element->setValue([self::BACKSPACE]);
         }
     }
 
@@ -96,8 +96,7 @@ class GlobalsearchElement extends Element
      */
     protected function selectWindow()
     {
-        $windowHandles = $this->_driver->windowHandles();
-        $this->_driver->window(end($windowHandles));
+        $this->driver->closeWindow();
     }
 
     /**
@@ -108,10 +107,10 @@ class GlobalsearchElement extends Element
      */
     protected function waitInitElement()
     {
-        $browser = clone $this;
         $selector = $this->initializedSuggest;
 
-        $browser->waitUntil(
+        $browser = $this->driver;
+        $this->driver->waitUntil(
             function () use ($browser, $selector) {
                 return $browser->find($selector, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
             }
@@ -125,10 +124,10 @@ class GlobalsearchElement extends Element
      */
     public function waitResult()
     {
-        $browser = clone $this;
         $selector = $this->searchResult;
+        $browser = $this->driver;
 
-        $browser->waitUntil(
+        $this->driver->waitUntil(
             function () use ($browser, $selector) {
                 if ($browser->find($selector)->isVisible()) {
                     return true;
@@ -173,12 +172,12 @@ class GlobalsearchElement extends Element
      */
     protected function getSearchResults()
     {
-        /** @var Element $searchResult */
+        /** @var ElementInterface $searchResult */
         $searchResult = $this->find($this->searchResult);
-        $resultItems = $searchResult->find($this->resultItem)->getElements();
+        $resultItems = $searchResult->getElements($this->resultItem);
         $resultArray = [];
 
-        /** @var Element $resultItem */
+        /** @var SimpleElement $resultItem */
         foreach ($resultItems as $resultItem) {
             $resultItemLink = $resultItem->find('a');
             $resultText = $resultItemLink->isVisible()
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
index 280ef001138..f661b723fa0 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
@@ -3,15 +3,11 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
-
-use Mtf\Client\Element;
+namespace Mtf\Client\Element;
 
 /**
  * Class JquerytreeElement
  * Typified element class for JqueryTree elements
- *
- * @package Mtf\Client\Element
  */
 class JquerytreeElement extends Tree
 {
@@ -63,11 +59,11 @@ class JquerytreeElement extends Tree
     /**
      *  Recursive walks tree
      *
-     * @param Element $node
+     * @param SimpleElement $node
      * @param string $parentCssClass
      * @return array
      */
-    protected function _getNodeContent($node, $parentCssClass)
+    protected function _getNodeContent(SimpleElement $node, $parentCssClass)
     {
         $counter = 1;
         $nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
similarity index 80%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
index cd7350b5228..7183fb6d0c8 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
@@ -3,16 +3,15 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class LiselectstoreElement
  * Typified element class for lists selectors
  */
-class LiselectstoreElement extends Element
+class LiselectstoreElement extends SimpleElement
 {
     /**
      * Template for each element of option
@@ -64,8 +63,8 @@ class LiselectstoreElement extends Element
      */
     public function setValue($value)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
-        $this->_context->find($this->toggleSelector)->click();
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->driver->find($this->toggleSelector)->click();
 
         $value = explode('/', $value);
         $optionSelector = [];
@@ -74,7 +73,7 @@ class LiselectstoreElement extends Element
         }
         $optionSelector = './/' . implode($this->optionMaskFollowing, $optionSelector) . '/a';
 
-        $option = $this->_context->find($optionSelector, Locator::SELECTOR_XPATH);
+        $option = $this->driver->find($optionSelector, Locator::SELECTOR_XPATH);
         if (!$option->isVisible()) {
             throw new \Exception('[' . implode('/', $value) . '] option is not visible in store switcher.');
         }
@@ -88,13 +87,11 @@ class LiselectstoreElement extends Element
      */
     protected function getLiElements()
     {
-        $this->_context->find($this->toggleSelector)->click();
-        $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('css selector');
-        $criteria->value('li');
-        $elements = $this->_getWrappedElement()->elements($criteria);
+        $this->driver->find($this->toggleSelector)->click();
+        $elements = $this->driver->getElements('li', Locator::SELECTOR_TAG_NAME);
         $dropdownData = [];
         foreach ($elements as $element) {
-            $class = $element->attribute('class');
+            $class = $element->getAttribute('class');
             $dropdownData[] = [
                 'element' => $element,
                 'storeView' => $this->isSubstring($class, "store-switcher-store-view"),
@@ -120,7 +117,7 @@ class LiselectstoreElement extends Element
             if ($dropdownElement['storeView']) {
                 $data[] = $this->findNearestElement('website', $key, $dropdownData) . "/"
                     . $this->findNearestElement('store', $key, $dropdownData) . "/"
-                    . $dropdownElement['element']->text();
+                    . $dropdownElement['element']->getText();
             }
         }
         return $data;
@@ -150,7 +147,7 @@ class LiselectstoreElement extends Element
     {
         $elementText = false;
         while ($elementText == false) {
-            $elementText = $elements[$key][$criteria] == true ? $elements[$key]['element']->text() : false;
+            $elementText = $elements[$key][$criteria] == true ? $elements[$key]['element']->getText() : false;
             $key--;
         }
         return $elementText;
@@ -164,18 +161,20 @@ class LiselectstoreElement extends Element
      */
     public function getValue()
     {
-        $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+        $this->eventManager->dispatchEvent(['get_value'], [$this->getAbsoluteSelector()]);
         $elements = $this->getLiElements();
         foreach ($elements as $key => $element) {
             if ($element['current'] == true) {
                 if ($element['default_config'] == true) {
-                    return $element['element']->text();
+                    return $element['element']->getText();
                 }
                 $path = $this->findNearestElement('website', $key, $elements) . "/"
                     . $this->findNearestElement('store', $key, $elements) . "/"
-                    . $element['element']->text();
+                    . $element['element']->getText();
                 return $path;
             }
         }
+
+        return '';
     }
 }
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
index ca2e200beec..760323525a4 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -3,10 +3,9 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class MultiselectgrouplistElement
@@ -104,7 +103,7 @@ class MultiselectgrouplistElement extends MultiselectElement
      */
     public function setValue($values)
     {
-        $this->clearSelectedOptions();
+        $this->deselectAll();
         $values = is_array($values) ? $values : [$values];
         foreach ($values as $value) {
             $this->selectOption($value);
@@ -151,16 +150,17 @@ class MultiselectgrouplistElement extends MultiselectElement
      * Get optgroup
      *
      * @param string $value
-     * @param Element $context
-     * @return Element
+     * @param SimpleElement $context
+     * @return SimpleElement
      * @throws \Exception
      */
-    protected function getOptgroup($value, Element $context)
+    protected function getOptgroup($value, SimpleElement $context)
     {
         $optgroup = $context->find(sprintf($this->optgroupByLabel, $value), Locator::SELECTOR_XPATH);
         if (!$optgroup->isVisible()) {
             throw new \Exception("Can't find group \"{$value}\".");
         }
+
         return $optgroup;
     }
 
@@ -168,11 +168,11 @@ class MultiselectgrouplistElement extends MultiselectElement
      * Get child optgroup
      *
      * @param string $value
-     * @param Element $context
-     * @return Element
+     * @param SimpleElement $context
+     * @return SimpleElement
      * @throws \Exception
      */
-    protected function getChildOptgroup($value, Element $context)
+    protected function getChildOptgroup($value, SimpleElement $context)
     {
         $childOptgroup = null;
         $count = 1;
@@ -209,7 +209,7 @@ class MultiselectgrouplistElement extends MultiselectElement
         foreach ($this->getSelectedOptions() as $option) {
             $value = [];
 
-            /** @var Element $option */
+            /** @var SimpleElement $option */
             $optionText = $option->getText();
             $optionValue = trim($optionText, $this->trim);
             $value[] = $optionValue;
@@ -219,8 +219,8 @@ class MultiselectgrouplistElement extends MultiselectElement
             }
 
             $pathOptgroup = sprintf($this->parentOptgroup, $this->indent . $optionValue);
-            $optgroup = $this->_getWrappedElement()->byXPath($pathOptgroup);
-            $optgroupText = $optgroup->attribute('label');
+            $optgroup = $this->find($pathOptgroup, Locator::SELECTOR_XPATH);
+            $optgroupText = $optgroup->getAttribute('label');
             $optgroupValue = trim($optgroupText, $this->trim);
             $amountIndent = strlen($optgroupText) - strlen($optgroupValue);
             $amountIndent = $amountIndent ? ($amountIndent / strlen($this->indent)) : 0;
@@ -234,8 +234,8 @@ class MultiselectgrouplistElement extends MultiselectElement
             $indent = $amountIndent ? str_repeat($this->indent, $amountIndent) : '';
             $pathOptgroup .= sprintf($this->precedingOptgroup, $amountIndent * self::INDENT_LENGTH, $indent);
             while (0 <= $amountIndent && $this->find($pathOptgroup, Locator::SELECTOR_XPATH)->isVisible()) {
-                $optgroup = $this->_getWrappedElement()->byXPath($pathOptgroup);
-                $optgroupText = $optgroup->attribute('label');
+                $optgroup = $this->find($pathOptgroup, Locator::SELECTOR_XPATH);
+                $optgroupText = $optgroup->getAttribute('label');
                 $optgroupValue = trim($optgroupText, $this->trim);
                 $value[] = $optgroupValue;
 
@@ -253,7 +253,7 @@ class MultiselectgrouplistElement extends MultiselectElement
     /**
      * Get options
      *
-     * @return array
+     * @return SimpleElement[]
      */
     protected function getOptions()
     {
@@ -287,6 +287,7 @@ class MultiselectgrouplistElement extends MultiselectElement
             ++$countOptgroup;
             $optgroup = $this->find(sprintf($this->optgroupByNumber, $countOptgroup), Locator::SELECTOR_XPATH);
         }
+
         return $options;
     }
 
@@ -299,11 +300,11 @@ class MultiselectgrouplistElement extends MultiselectElement
     {
         $options = [];
         foreach ($this->getOptions() as $option) {
-            /** Element $option */
             if ($option->isSelected()) {
                 $options[] = $option;
             }
         }
+
         return $options;
     }
 }
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
similarity index 75%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
index 522f80bc568..1cabb6a0b44 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
@@ -3,10 +3,9 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Typified element class for  Multiple Select List elements
@@ -27,21 +26,6 @@ class MultiselectlistElement extends MultiselectElement
      */
     protected $optionCheckedElement = './/*[contains(@class, "mselect-checked")]/following-sibling::span';
 
-    /**
-     * Return Wrapped Element.
-     * If element was not created before:
-     * 1. Context is defined. If context was not passed to constructor - test case (all page) is taken as context
-     * 2. Attempt to get selenium element is performed in loop
-     * that is terminated if element is found or after timeout set in configuration
-     *
-     * @param bool $waitForElementPresent
-     * @return \PHPUnit_Extensions_Selenium2TestCase_Element|\PHPUnit_Extensions_Selenium2TestCase_Element_Select
-     */
-    protected function _getWrappedElement($waitForElementPresent = true)
-    {
-        return Element::_getWrappedElement($waitForElementPresent);
-    }
-
     /**
      * Select options by values in multiple select list
      *
@@ -54,7 +38,7 @@ class MultiselectlistElement extends MultiselectElement
         $values = is_array($values) ? $values : [$values];
 
         foreach ($options as $option) {
-            /** @var Element $option */
+            /** @var SimpleElement $option */
             $optionText = $option->getText();
             $isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
             $inArray = in_array($optionText, $values);
@@ -75,7 +59,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var Element $option */
+            /** @var SimpleElement $option */
             $checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
             if ($checkedOption->isVisible()) {
                 $checkedOptions[] = $checkedOption->getText();
@@ -116,7 +100,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var Element $option */
+            /** @var SimpleElement $option */
             $optionsValue[] = $option->getText();
         }
 
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
similarity index 65%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
index 3457b67854d..2a9d2a5e8d1 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
@@ -3,10 +3,9 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Typified element class for multi suggest element.
@@ -14,74 +13,73 @@ use Mtf\Client\Element\Locator;
 class MultisuggestElement extends SuggestElement
 {
     /**
-     * Selector list choice.
+     * Selector list choice
      *
      * @var string
      */
     protected $listChoice = './/ul[contains(@class,"mage-suggest-choices")]';
 
     /**
-     * Selector choice item.
+     * Selector choice item
      *
      * @var string
      */
     protected $choice = './/li/div[text()="%s"]/..';
 
     /**
-     * Selector choice value.
+     * Selector choice value
      *
      * @var string
      */
     protected $choiceValue = './/li[contains(@class,"mage-suggest-choice")]/div';
 
     /**
-     * Selector remove choice item.
+     * Selector remove choice item
      *
      * @var string
      */
     protected $choiceClose = '.mage-suggest-choice-close';
 
     /**
-     * Set value.
+     * Set value
      *
      * @param array|string $values
      * @return void
      */
     public function setValue($values)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         $this->clear();
         foreach ((array)$values as $value) {
             if (!$this->isChoice($value)) {
-                $this->selectWindow();
                 parent::setValue($value);
             }
         }
     }
 
     /**
-     * Get value.
+     * Get value
      *
      * @return array
      */
     public function getValue()
     {
-        $this->_eventManager->dispatchEvent(['get_value'], [(string) $this->_locator]);
+        $this->eventManager->dispatchEvent(['get_value'], [(string) $this->getAbsoluteSelector()]);
 
         $listChoice = $this->find($this->listChoice, Locator::SELECTOR_XPATH);
-        $choices = $listChoice->find($this->choiceValue, Locator::SELECTOR_XPATH)->getElements();
+        $choices = $listChoice->getElements($this->choiceValue, Locator::SELECTOR_XPATH);
         $values = [];
 
         foreach ($choices as $choice) {
-            /** @var Element $choice */
+            /** @var SimpleElement $choice */
             $values[] = $choice->getText();
         }
         return $values;
     }
 
     /**
-     * Check exist selected item.
+     * Check exist selected item
      *
      * @param string $value
      * @return bool
@@ -92,7 +90,7 @@ class MultisuggestElement extends SuggestElement
     }
 
     /**
-     * Clear element.
+     * Clear element
      *
      * @return void
      */
@@ -104,15 +102,4 @@ class MultisuggestElement extends SuggestElement
             $choiceClose = $this->find($this->choiceClose);
         }
     }
-
-    /**
-     * Select to last window.
-     *
-     * @return void
-     */
-    protected function selectWindow()
-    {
-        $windowHandles = $this->_driver->windowHandles();
-        $this->_driver->window(end($windowHandles));
-    }
 }
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
new file mode 100644
index 00000000000..fc0353553fd
--- /dev/null
+++ b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Mtf\Client\Element;
+
+use Mtf\Client\Locator;
+
+/**
+ * Class OptgroupselectElement
+ * Typified element class for option group selectors
+ */
+class OptgroupselectElement extends SelectElement
+{
+    /**
+     * Option group selector
+     *
+     * @var string
+     */
+    protected $optGroup = 'optgroup[option[contains(.,"%s")]]';
+
+    /**
+     * Get the value of form element
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        $this->eventManager->dispatchEvent(['get_value'], [(string)$this->getAbsoluteSelector()]);
+        $selectedLabel = trim(parent::getValue());
+        $element = $this->find(sprintf($this->optGroup, $selectedLabel), Locator::SELECTOR_XPATH);
+        $value = trim($element->getAttribute('label'), chr(0xC2) . chr(0xA0));
+        $value .= '/' . $selectedLabel;
+        return $value;
+    }
+
+    /**
+     * Select value in dropdown which has option groups
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue($value)
+    {
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        list($group, $option) = explode('/', $value);
+        parent::setOptionGroupValue($group, $option);
+    }
+}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
similarity index 69%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
index 39a748fca2e..88a62e0f116 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
@@ -3,10 +3,9 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class SelectstoreElement
@@ -35,14 +34,11 @@ class SelectstoreElement extends SelectElement
      */
     public function getValue()
     {
-        $selectedLabel = trim($this->_getWrappedElement()->selectedLabel());
-        $value = trim(
-            $this->_getWrappedElement()->byXPath(sprintf($this->website, $selectedLabel))->attribute('label')
-        );
-        $value .= '/' . trim(
-            $this->_getWrappedElement()->byXPath(sprintf($this->storeGroup, $selectedLabel))->attribute('label'),
-            chr(0xC2) . chr(0xA0)
-        );
+        $selectedLabel = trim(parent::getValue());
+        $element = $this->find(sprintf($this->website, $selectedLabel), Locator::SELECTOR_XPATH);
+        $value = trim($element->getAttribute('label'));
+        $element = $this->find(sprintf($this->storeGroup, $selectedLabel), Locator::SELECTOR_XPATH);
+        $value .= '/' . trim($element->getAttribute('label'), chr(0xC2) . chr(0xA0));
         $value .= '/' . $selectedLabel;
         return $value;
     }
@@ -61,7 +57,7 @@ class SelectstoreElement extends SelectElement
             . $group[0] . '")]/following-sibling::optgroup[contains(@label,"'
             . $group[1] . '")]/option[contains(text(), "'
             . $group[2] . '")]';
-        $option = $this->_context->find($optionLocator, Locator::SELECTOR_XPATH);
+        $option = $this->find($optionLocator, Locator::SELECTOR_XPATH);
         if (!$option->isVisible()) {
             throw new \Exception('[' . implode('/', $value) . '] option is not visible in store switcher.');
         }
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
old mode 100755
new mode 100644
similarity index 70%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
index 225f4634db5..494a7724f2b
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
@@ -3,22 +3,16 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class SuggestElement
  * General class for suggest elements.
  */
-class SuggestElement extends Element
+class SuggestElement extends SimpleElement
 {
-    /**
-     * "Backspace" key code.
-     */
-    const BACKSPACE = "\xEE\x80\x83";
-
     /**
      * Selector suggest input
      *
@@ -48,27 +42,13 @@ class SuggestElement extends Element
      */
     public function setValue($value)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
-        $this->clear();
-        $this->find($this->suggest)->_getWrappedElement()->value($value);
+        $this->find($this->suggest)->setValue($value);
         $this->waitResult();
         $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->click();
     }
 
-    /**
-     * Clear value of element.
-     *
-     * @return void
-     */
-    protected function clear()
-    {
-        $element = $this->find($this->suggest);
-        while ($element->getValue() != '') {
-            $element->keys([self::BACKSPACE]);
-        }
-    }
-
     /**
      * Wait for search result is visible
      *
@@ -92,7 +72,7 @@ class SuggestElement extends Element
      */
     public function getValue()
     {
-        $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+        $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         return $this->find($this->suggest)->getValue();
     }
@@ -112,6 +92,7 @@ class SuggestElement extends Element
         if (!$searchResult->isVisible()) {
             return false;
         }
+
         return $searchResult->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->isVisible();
     }
 }
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
similarity index 79%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php
rename to dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 6c25277a731..fa8572641fc 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -3,18 +3,15 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element as ElementInterface;
+use Mtf\Client\ElementInterface;
 
 /**
  * Class Tree
  * General class for tree elements. Holds general implementation of methods, which overrides in child classes.
- *
- * @package Mtf\Client\Driver\Selenium\Element
  */
-abstract class Tree extends Element
+abstract class Tree extends SimpleElement
 {
     /**
      * Css class for finding tree nodes
@@ -43,27 +40,25 @@ abstract class Tree extends Element
     abstract public function getStructure();
 
     /**
-     * Drag'n'drop method is not accessible in this class.
-     * Throws exception if used.
+     * Drag and drop element to(between) another element(s)
      *
      * @param ElementInterface $target
-     * @throws \BadMethodCallException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Exception
      */
     public function dragAndDrop(ElementInterface $target)
     {
-        throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+        throw new \Exception('Not applicable for this class of elements (TreeElement)');
     }
 
     /**
      * getValue method is not accessible in this class.
      * Throws exception if used.
      *
-     * @throws \BadMethodCallException
+     * @throws \Exception
      */
     public function getValue()
     {
-        throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+        throw new \Exception('Not applicable for this class of elements (TreeElement)');
     }
 
     /**
@@ -71,12 +66,12 @@ abstract class Tree extends Element
      * Throws exception if used.
      *
      * @param array $keys
-     * @throws \BadMethodCallException
+     * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function keys(array $keys)
     {
-        throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+        throw new \Exception('Not applicable for this class of elements (TreeElement)');
     }
 
     /**
@@ -98,6 +93,7 @@ abstract class Tree extends Element
             ++$pathChunkCounter;
         }
         if ($structureChunk) {
+            /** @var SimpleElement $needleElement */
             $needleElement = $structureChunk->find($this->nodeName);
             $needleElement->click();
         } else {
@@ -111,7 +107,7 @@ abstract class Tree extends Element
      *
      * @param string $pathChunk
      * @param array $structureChunk
-     * @return array|Element||false
+     * @return array|SimpleElement|false
      */
     protected function deep($pathChunk, $structureChunk)
     {
@@ -123,17 +119,18 @@ abstract class Tree extends Element
                 }
             }
         }
+
         return false;
     }
 
     /**
      *  Recursive walks tree
      *
-     * @param Element $node
+     * @param SimpleElement $node
      * @param string $parentCssClass
      * @return array
      */
-    protected function _getNodeContent($node, $parentCssClass)
+    protected function _getNodeContent(SimpleElement $node, $parentCssClass)
     {
         $nodeArray = [];
         $nodeList = [];
@@ -147,7 +144,7 @@ abstract class Tree extends Element
         }
         //Write to array values of current node
         foreach ($nodeList as $currentNode) {
-            /** @var Element $currentNode */
+            /** @var SimpleElement $currentNode */
             $nodesNames = $currentNode->find($this->nodeName);
             $nodesContents = $currentNode->find($this->nodeCssClass);
             $text = ltrim($nodesNames->getText());
@@ -155,9 +152,10 @@ abstract class Tree extends Element
                 'name' => $text,
                 'element' => $currentNode,
                 'subnodes' => $nodesContents->isVisible() ?
-                        $this->_getNodeContent($nodesContents, $this->nodeCssClass) : null,
+                    $this->_getNodeContent($nodesContents, $this->nodeCssClass) : null,
             ];
         }
+
         return $nodeArray;
     }
 }
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
index 112b9723724..93ddb87e132 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
@@ -3,12 +3,11 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
 
 /**
  * Class TreeElement
  * Typified element class for Tree elements
- *
  */
 class TreeElement extends Tree
 {
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
index 9ff3fa47857..d6fac2d2a78 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -190,7 +190,8 @@ abstract class AbstractFactory
     {
         $filename = str_replace('\\', '/', $filename);
 
-        $classPath = str_replace(MTF_BP . '/' . $path . '/', '', $filename);
+        $classPath = substr($filename, strpos($filename, $path . '/') + strlen($path . '/'));
+
         $classPath = str_replace('.php', '', $classPath);
         $className = str_replace('/', '\\', $classPath);
 
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index 3cfdfc5ccbd..aa829591746 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -28,8 +28,8 @@
     </listeners>
 
     <php>
-        <env name="app_frontend_url" value="http://localhost/index.php/" />
-        <env name="app_backend_url" value="http://localhost/index.php/backend/" />
+        <env name="app_frontend_url" value="http://magento.loc/" />
+        <env name="app_backend_url" value="http://magento.loc/admin/" />
         <env name="app_config_path" value="config/application.yml.dist" />
         <env name="server_config_path" value="config/server.yml.dist" />
         <env name="isolation_config_path" value="config/isolation.yml.dist" />
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
index 7de696f367f..c364cad0897 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Block\Admin;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
index a4992d093e1..53f53612dea 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 
 /**
@@ -61,7 +61,7 @@ class Cache extends Block
     public function flushCacheStorage()
     {
         $this->_rootElement->find($this->flushCacheStorageButton)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
index 810a13753fc..b11b8cbb557 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Denied
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
index 564bc2518ea..1f673f7ffb1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class FormPageActions
@@ -109,7 +109,7 @@ class FormPageActions extends PageActions
     public function delete()
     {
         $this->_rootElement->find($this->deleteButton)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 
     /**
@@ -130,6 +130,7 @@ class FormPageActions extends PageActions
      */
     protected function waitBeforeClick()
     {
+        time_nanosleep(0, 600000000);
         usleep(500000);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
index 3bc5d6748dd..7a93a7be9e1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
@@ -6,8 +6,8 @@
 namespace Magento\Backend\Test\Block\Page;
 
 use Mtf\Block\Block;
-use Mtf\Client\Driver\Selenium\Element\GlobalsearchElement;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\GlobalsearchElement;
 
 /**
  * Header block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
index e03580e5353..d42d2524b85 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Block\System\Config;
 
 use Mtf\Block\Block;
 use Mtf\Factory\Factory;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 class Form extends Block
 {
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
index 92fdbecd850..952d810096d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
@@ -7,9 +7,12 @@
 
 namespace Magento\Backend\Test\Block\System\Config\Form;
 
+use Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element;
 
+/**
+ * Class Group
+ */
 class Group extends Form
 {
     /**
@@ -66,14 +69,14 @@ class Group extends Form
 
         $element = $this->_rootElement->find(
             sprintf($this->element, $field),
-            Element\Locator::SELECTOR_XPATH,
+            Locator::SELECTOR_XPATH,
             $input
         );
 
         if ($element->isDisabled()) {
             $checkbox = $this->_rootElement->find(
                 sprintf($this->defaultCheckbox, $field),
-                Element\Locator::SELECTOR_XPATH,
+                Locator::SELECTOR_XPATH,
                 'checkbox'
             );
             $checkbox->setValue('No');
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
index fbb974862c0..01ea8eea628 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
@@ -9,7 +9,7 @@ namespace Magento\Backend\Test\Block\System\Config;
 
 use Magento\Backend\Test\Block\FormPageActions as AbstractPageActions;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class PageActions
@@ -34,7 +34,7 @@ class PageActions extends AbstractPageActions
     {
         $this->_rootElement->find($this->scopeSelector, Locator::SELECTOR_CSS, 'liselectstore')
             ->setValue($websiteScope);
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
 
         return $this;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
index 01f38159d9a..d5f0b51a1a8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Backend\Test\Block\System\Store\Delete;
 
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
 
 /**
  * Class Form
@@ -18,10 +18,10 @@ class Form extends AbstractForm
      * Fill Backup Option in delete
      *
      * @param array $data
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    public function fillForm(array $data, Element $element = null)
+    public function fillForm(array $data, SimpleElement $element = null)
     {
         $mapping = $this->dataMapping($data);
         $this->_fill($mapping, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
index 3317dc25a0e..bc63ca15a8c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class GroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
index 27d565173b7..3251560d101 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class StoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index 99eacd6fcae..d77f3b72da9 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -9,7 +9,7 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Store\Test\Fixture\StoreGroup;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class StoreGrid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
index 9aa09d9ca83..c3e5cab6c22 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
@@ -7,7 +7,7 @@
 namespace Magento\Backend\Test\Block\Widget;
 
 use Mtf\Block\Form as FormInstance;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Fixture\FixtureInterface;
 
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
index e2752e545a0..cad401bf830 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
@@ -7,11 +7,11 @@ namespace Magento\Backend\Test\Block\Widget;
 
 use Mtf\Block\BlockFactory;
 use Mtf\Block\Mapper;
-use Mtf\Client\Driver\Selenium\Browser;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\BrowserInterface;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Util\Iterator\File;
 use Mtf\Util\XmlConverter;
 
@@ -43,18 +43,18 @@ class FormTabs extends Form
 
     /**
      * @constructor
-     * @param Element $element
+     * @param SimpleElement $element
      * @param Mapper $mapper
      * @param BlockFactory $blockFactory
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param XmlConverter $xmlConverter
      * @param array $config
      */
     public function __construct(
-        Element $element,
+        SimpleElement $element,
         Mapper $mapper,
         BlockFactory $blockFactory,
-        Browser $browser,
+        BrowserInterface $browser,
         XmlConverter $xmlConverter,
         array $config = []
     ) {
@@ -101,10 +101,10 @@ class FormTabs extends Form
      * Fill form with tabs
      *
      * @param FixtureInterface $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return FormTabs
      */
-    public function fill(FixtureInterface $fixture, Element $element = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         $tabs = $this->getFieldsByTabs($fixture);
         return $this->fillTabs($tabs, $element);
@@ -114,10 +114,10 @@ class FormTabs extends Form
      * Fill specified form with tabs
      *
      * @param array $tabs
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return FormTabs
      */
-    protected function fillTabs(array $tabs, Element $element = null)
+    protected function fillTabs(array $tabs, SimpleElement $element = null)
     {
         $context = ($element === null) ? $this->_rootElement : $element;
         foreach ($tabs as $tabName => $tabFields) {
@@ -178,13 +178,13 @@ class FormTabs extends Form
      * Get data of the tabs
      *
      * @param FixtureInterface|null $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(FixtureInterface $fixture = null, Element $element = null)
+    public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
     {
         $data = [];
 
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
index 39ce3491954..cbdefe2bd9a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -6,8 +6,8 @@
 namespace Magento\Backend\Test\Block\Widget;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Factory\Factory;
 
 /**
@@ -242,7 +242,6 @@ abstract class Grid extends Block
         $this->prepareForSearch($filter);
         $this->_rootElement->find($this->searchButton, Locator::SELECTOR_CSS)->click();
         $this->waitLoader();
-        $this->reinitRootElement();
     }
 
     /**
@@ -322,7 +321,6 @@ abstract class Grid extends Block
         $this->openFilterBlock();
         $this->_rootElement->find($this->resetButton, Locator::SELECTOR_CSS)->click();
         $this->waitLoader();
-        $this->reinitRootElement();
     }
 
     /**
@@ -364,7 +362,7 @@ abstract class Grid extends Block
     {
         $this->_rootElement->find($this->massactionSubmit, Locator::SELECTOR_CSS)->click();
         if ($acceptAlert) {
-            $this->_rootElement->acceptAlert();
+            $this->browser->acceptAlert();
         }
     }
 
@@ -374,7 +372,7 @@ abstract class Grid extends Block
      * @param array $filter
      * @param bool $isSearchable
      * @param bool $isStrict
-     * @return Element
+     * @return SimpleElement
      */
     protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
     {
@@ -405,7 +403,7 @@ abstract class Grid extends Block
     {
         $data = [];
         do {
-            $rows = $this->_rootElement->find($this->rowItem)->getElements();
+            $rows = $this->_rootElement->getElements($this->rowItem);
             foreach ($rows as $row) {
                 $rowData = [];
                 foreach ($columns as $columnName) {
@@ -447,7 +445,6 @@ abstract class Grid extends Block
             $sortBlock->click();
             $this->waitLoader();
         }
-        $this->reinitRootElement();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
index e36ad901128..76ce6a0da55 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
@@ -6,8 +6,8 @@
 namespace Magento\Backend\Test\Block\Widget;
 
 use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
 
 /**
  * Class Tab
@@ -42,10 +42,10 @@ class Tab extends AbstractForm
      * Fill data to fields on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $data = $this->dataMapping($fields);
         $this->_fill($data, $element);
@@ -57,10 +57,10 @@ class Tab extends AbstractForm
      * Get data of tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $data = $this->dataMapping($fields);
         return $this->_getData($data, $element);
@@ -70,9 +70,9 @@ class Tab extends AbstractForm
      * Update data to fields on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      */
-    public function updateFormTab(array $fields, Element $element = null)
+    public function updateFormTab(array $fields, SimpleElement $element = null)
     {
         $this->fillFormTab($fields, $element);
     }
@@ -85,7 +85,7 @@ class Tab extends AbstractForm
     public function getJsErrors()
     {
         $data = [];
-        $elements = $this->_rootElement->find($this->mageErrorField, Locator::SELECTOR_XPATH)->getElements();
+        $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
         foreach ($elements as $element) {
             $error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
             if ($error->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index 382c25e6a61..fde3f028a90 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -4,7 +4,7 @@
  */
 namespace Magento\Backend\Test\Page;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 8ef08c1c0f8..8d52f7d4676 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
 use Mtf\Client\Element;
 
@@ -54,10 +55,10 @@ class Bundle extends Tab
      * Fill bundle options
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (!isset($fields['bundle_selections'])) {
             return $this;
@@ -79,10 +80,10 @@ class Bundle extends Tab
      * Get data to fields on downloadable tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $newFields = [];
         if (!isset($fields['bundle_selections'])) {
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 0e7b128fdf8..45f4ffe51f3 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -8,8 +8,7 @@ namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search\Grid;
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection;
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Option
@@ -91,7 +90,7 @@ class Option extends Form
     {
         $mapping = $this->dataMapping($fields);
         $this->_fill($mapping);
-        $selections = $this->_rootElement->find($this->removeSelection)->getElements();
+        $selections = $this->_rootElement->getElements($this->removeSelection);
         if (count($selections)) {
             foreach ($selections as $itemSelection) {
                 $itemSelection->click();
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
index 806f152f189..adebff8b556 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Block\Catalog\Product;
 
 use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
 use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
 
@@ -69,7 +69,6 @@ class View extends \Magento\Catalog\Test\Block\Product\View
         $selector = $this->newsletterFormSelector;
         $this->browser->waitUntil(
             function () use ($browser, $selector) {
-                $this->reinitRootElement();
                 $element = $browser->find($selector);
                 return $element->isVisible() ? true : null;
             }
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 9b885d9ccc0..3b116840e0f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -8,9 +8,10 @@ namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type;
 use Magento\Bundle\Test\Fixture\Bundle as BundleDataFixture;
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
 
@@ -110,7 +111,7 @@ class Bundle extends Block
                 throw new \Exception("Can't find option: \"{$title}\"");
             }
 
-            /** @var Element $optionElement */
+            /** @var SimpleElement $optionElement */
             $optionElement = $listFormOptions[$title];
             $getTypeData = 'get' . $this->optionNameConvert($option['type']) . 'Data';
 
@@ -151,10 +152,10 @@ class Bundle extends Block
     /**
      * Get data of "Drop-down" option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getDropdownData(Element $option)
+    protected function getDropdownData(SimpleElement $option)
     {
         $select = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'select');
         // Skip "Choose option ..."(option #1)
@@ -164,10 +165,10 @@ class Bundle extends Block
     /**
      * Get data of "Multiple select" option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getMultipleselectData(Element $option)
+    protected function getMultipleselectData(SimpleElement $option)
     {
         $multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
         $data = $this->getSelectOptionsData($multiselect, 1);
@@ -183,13 +184,13 @@ class Bundle extends Block
     /**
      * Get data of "Radio buttons" option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getRadiobuttonsData(Element $option)
+    protected function getRadiobuttonsData(SimpleElement $option)
     {
         $listOptions = [];
-        $optionLabels = $option->find($this->optionLabel, Locator::SELECTOR_XPATH)->getElements();
+        $optionLabels = $option->getElements($this->optionLabel, Locator::SELECTOR_XPATH);
 
         foreach ($optionLabels as $optionLabel) {
             if ($optionLabel->isVisible()) {
@@ -203,10 +204,10 @@ class Bundle extends Block
     /**
      * Get data of "Checkbox" option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getCheckboxData(Element $option)
+    protected function getCheckboxData(SimpleElement $option)
     {
         $data =  $this->getRadiobuttonsData($option);
 
@@ -221,11 +222,11 @@ class Bundle extends Block
     /**
      * Get data from option of select and multiselect
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @param int $firstOption
      * @return array
      */
-    protected function getSelectOptionsData(Element $element, $firstOption = 1)
+    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
     {
         $listOptions = [];
 
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index 2fd74a3e6e3..7a11a367432 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 
 /**
@@ -25,13 +25,13 @@ class AssertBundleItemsOnProductPage extends AbstractAssertForm
      *
      * @param CatalogProductView $catalogProductView
      * @param BundleProduct $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         BundleProduct $product,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
index a0452c4bcf5..d4ac0599686 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -36,7 +36,7 @@ class AssertBundlePriceType extends AbstractConstraint
      * @param CatalogProductView $catalogProductView
      * @param BundleProduct $product
      * @param CheckoutCart $checkoutCartView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param BundleProduct $originalProduct [optional]
      * @return void
      */
@@ -44,7 +44,7 @@ class AssertBundlePriceType extends AbstractConstraint
         CatalogProductView $catalogProductView,
         BundleProduct $product,
         CheckoutCart $checkoutCartView,
-        Browser $browser,
+        BrowserInterface $browser,
         BundleProduct $originalProduct = null
     ) {
         $checkoutCartView->open()->getCartBlock()->clearShoppingCart();
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
index 5dc36a9727a..079855b751b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -23,13 +23,13 @@ class AssertBundlePriceView extends AbstractConstraint
      * Assert that displayed price view for bundle product on product page equals passed from fixture.
      *
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param BundleProduct $product
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         BundleProduct $product
     ) {
         //Open product view page
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
index 459247667b2..29b978674c7 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Fixture\FixtureInterface;
 
 /**
@@ -36,13 +36,16 @@ class AssertTierPriceOnBundleProductPage extends AssertProductTierPriceOnProduct
     /**
      * Assertion that tier prices are displayed correctly
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
      * @return void
      */
-    public function processAssert(Browser $browser, CatalogProductView $catalogProductView, FixtureInterface $product)
-    {
+    public function processAssert(
+        BrowserInterface $browser,
+        CatalogProductView $catalogProductView,
+        FixtureInterface $product
+    ) {
         //Open product view page
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $viewBlock = $catalogProductView->getBundleViewBlock();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 54485d3e466..fc82ba6e256 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
 use Mtf\Client\Element;
 
@@ -33,10 +34,10 @@ class Product extends Tab
      * Fill category products
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return void
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (!isset($fields['category_products'])) {
             return;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 6402bd1873a..f50e26b2108 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -6,11 +6,12 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Category;
 
-use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\TreeElement;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
 
 /**
  * Class Tree
@@ -159,7 +160,9 @@ class Tree extends Block
     public function isCategoryVisible(CatalogCategory $category)
     {
         $categoryPath = $this->prepareFullCategoryPath($category);
-        $structure = $this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree')->getStructure();
+        /** @var TreeElement $treeElement */
+        $treeElement = $this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree');
+        $structure = $treeElement->getStructure();
         $result = false;
         $element = array_shift($categoryPath);
         foreach ($structure as $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
index a4208e0faff..ed2a2ade91a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Widget;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class CategoryChooser
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
index 333214bbc55..7e748cd66aa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
@@ -5,10 +5,11 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
 
-use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
@@ -34,10 +35,10 @@ class AttributeForm extends FormTabs
      * Fill the attribute form.
      *
      * @param FixtureInterface $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $fixture, Element $element = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         $this->browser->switchToFrame(new Locator($this->iFrame));
         $browser = $this->browser;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
index cad2b7fbdf8..3225bc8194c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
@@ -5,13 +5,13 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Catalog product custom attribute element.
  */
-class CustomAttribute extends Element
+class CustomAttribute extends SimpleElement
 {
     /**
      * Attribute input selector;
@@ -41,7 +41,7 @@ class CustomAttribute extends Element
      */
     public function setValue($data)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
         $element = $this->getElementByClass($this->getElementClass());
         $value = is_array($data) ? $data['value'] : $data;
         $this->find($this->inputSelector, Locator::SELECTOR_CSS, $element)->setValue($value);
@@ -54,7 +54,7 @@ class CustomAttribute extends Element
      */
     public function getValue()
     {
-        $this->_eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
         $inputType = $this->getElementByClass($this->getElementClass());
         return $this->find($this->inputSelector, Locator::SELECTOR_CSS, $inputType)->getValue();
     }
@@ -83,9 +83,6 @@ class CustomAttribute extends Element
      */
     protected function getElementClass()
     {
-        $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('css selector');
-        $criteria->value($this->inputSelector);
-        $input = $this->_getWrappedElement()->element($criteria);
-        return $input->attribute('class');
+        return $this->find($this->inputSelector, Locator::SELECTOR_CSS)->getAttribute('class');
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
index 1d70bd71d2f..cf3ee2310f3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
@@ -5,10 +5,11 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 
-use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
 
@@ -35,14 +36,14 @@ class AttributeForm extends FormTabs
      * Get data of the tabs.
      *
      * @param FixtureInterface $fixture
-     * @param Element $element
+     * @param SimpleElement $element
      * @return array
      * @throws \Exception
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(FixtureInterface $fixture = null, Element $element = null)
+    public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
     {
         $this->waitForElementVisible($this->propertiesTab);
         $data = [];
@@ -78,7 +79,7 @@ class AttributeForm extends FormTabs
      */
     protected function expandAllToggles()
     {
-        $closedToggles = $this->_rootElement->find($this->closedToggle, Locator::SELECTOR_XPATH)->getElements();
+        $closedToggles = $this->_rootElement->getElements($this->closedToggle, Locator::SELECTOR_XPATH);
         foreach ($closedToggles as $toggle) {
             $toggle->click();
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
index 01ff562d6fd..4b904370103 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
@@ -5,14 +5,14 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 
-use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
-use Mtf\Client\Driver\Selenium\Element;
 use Mtf\ObjectManager;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
 
 /**
  * Options element.
  */
-class Options extends Element
+class Options extends SimpleElement
 {
     /**
      * 'Add Option' button.
@@ -51,7 +51,7 @@ class Options extends Element
     public function getValue()
     {
         $data = [];
-        $options = $this->find($this->option)->getElements();
+        $options = $this->getElements($this->option);
         foreach ($options as $option) {
             $data[] = $this->getFormInstance($option)->getData();
         }
@@ -61,10 +61,10 @@ class Options extends Element
     /**
      * Get options form.
      *
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return Option
      */
-    protected function getFormInstance(Element $element = null)
+    protected function getFormInstance(SimpleElement $element = null)
     {
         return ObjectManager::getInstance()->create(
             'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option',
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index b3eb3df2f92..29140a26425 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
 
 /**
@@ -32,10 +33,10 @@ class Advanced extends Tab
      * Fill 'Advanced Attribute Properties' tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (!$this->_rootElement->find($this->propertiesTabActive)->isVisible()) {
             $this->_rootElement->find($this->propertiesTab)->click();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index 149908ae0f0..67265bad3e3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
 
 /**
@@ -25,10 +26,10 @@ class Options extends Tab
      * Fill 'Options' tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         foreach ($fields['options']['value'] as $field) {
             $this->_rootElement->find($this->addOption)->click();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
index 8d54abfe9a0..3645df6cc67 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Main
@@ -122,7 +122,7 @@ class Main extends Block
     public function addAttributeSetGroup($groupName)
     {
         $this->_rootElement->find($this->addGroupButton)->click();
-        $this->_rootElement->setAlertText($groupName);
-        $this->_rootElement->acceptAlert();
+        $this->browser->setAlertText($groupName);
+        $this->browser->acceptAlert();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
index ce754a0f67e..2d038c74d59 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -6,12 +6,11 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Composite;
 
-use Magento\Backend\Test\Block\Template;
-use Magento\Catalog\Test\Block\AbstractConfigureBlock;
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Block\AbstractConfigureBlock;
 
 /**
  * Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
index 4abeb778750..47a11a74831 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
 
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element;
+use Mtf\Client\Locator;
 
 /**
  * Product attribute massaction edit page.
@@ -36,7 +36,7 @@ class Attribute extends Form
     {
         $this->_rootElement->find(
             $this->priceFieldEnablerSelector,
-            Element\Locator::SELECTOR_XPATH,
+            Locator::SELECTOR_XPATH,
             'checkbox'
         )->setValue('Yes');
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
index 7e1b73423dd..5c25fc2e526 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
@@ -5,8 +5,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
 
-use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class AdvancedPricingTab
@@ -28,10 +27,10 @@ class AdvancedPricingTab extends ProductTab
      * Fill 'Advanced price' product form on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $context = $element ? $element : $this->_rootElement;
         foreach ($fields as $fieldName => $field) {
@@ -65,10 +64,10 @@ class AdvancedPricingTab extends ProductTab
      * Get data of tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $formData = [];
         foreach ($fields as $fieldName => $field) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
index 37b86601d6d..f9b645cceef 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class OptionField
@@ -25,10 +25,10 @@ class OptionGroup extends AbstractOptions
      * Fill the form 'Extended price'
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this
      */
-    public function fillOptions(array $fields, Element $element = null)
+    public function fillOptions(array $fields, SimpleElement $element = null)
     {
         $this->_rootElement->find($this->buttonFormLocator)->click();
         return parent::fillOptions($fields, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
index 8ee0d73f5fa..cf3c4ac2e12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class OptionTier
@@ -25,10 +25,10 @@ class OptionTier extends AbstractOptions
      * Fill product form 'Tier price'
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this
      */
-    public function fillOptions(array $fields, Element $element = null)
+    public function fillOptions(array $fields, SimpleElement $element = null)
     {
         $this->_rootElement->find($this->buttonFormLocator)->click();
         return parent::fillOptions($fields, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
index ef5d3093b92..cbe632cd267 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
index 7e18f842487..ccc4b80443d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
@@ -5,9 +5,9 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
-use Magento\Backend\Test\Block\Widget\Grid;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Grid;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class AbstractRelated
@@ -26,10 +26,10 @@ abstract class AbstractRelated extends Tab
      * Select related products
      *
      * @param array $data
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $data, Element $element = null)
+    public function fillFormTab(array $data, SimpleElement $element = null)
     {
         if (isset($data[$this->relatedType]['value'])) {
             $context = $element ? $element : $this->_rootElement;
@@ -47,10 +47,10 @@ abstract class AbstractRelated extends Tab
      * Get data of tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $relatedBlock = $this->getRelatedGrid($element);
         $columns = [
@@ -66,8 +66,8 @@ abstract class AbstractRelated extends Tab
     /**
      * Return related products grid
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @return Grid
      */
-    abstract protected function getRelatedGrid(Element $element = null);
+    abstract protected function getRelatedGrid(SimpleElement $element = null);
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index 6dcff1c3113..b950640df46 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes;
 
+use Mtf\Client\Element\SuggestElement;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
 
 /**
  * Class FormAttributeSearch
@@ -71,6 +71,7 @@ class Search extends SuggestElement
         if ($this->find($this->searchResult)->getText() == $productAttribute->getFrontendLabel()) {
             return true;
         }
+
         return false;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index fdad5f4feb5..8a31aed3faf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid as CrosssellGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Crosssell
@@ -32,10 +32,10 @@ class Crosssell extends AbstractRelated
     /**
      * Return cross sell products grid
      *
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @return CrosssellGrid
      */
-    protected function getRelatedGrid(Element $element = null)
+    protected function getRelatedGrid(SimpleElement $element = null)
     {
         $element = $element ? $element : $this->_rootElement;
         return $this->blockFactory->create(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
index 7608ad8fe79..70df5b26c7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -6,9 +6,10 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Search\Grid;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\ObjectManager;
+use Mtf\Client\Locator;
 
 /**
  * Class Options
@@ -55,10 +56,10 @@ class Options extends Tab
      * Fill custom options form on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $fields = reset($fields);
         if (empty($fields['value']) || !is_array($fields['value'])) {
@@ -135,10 +136,10 @@ class Options extends Tab
      * Get data of tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $fields = reset($fields);
         $formData = [];
@@ -195,6 +196,7 @@ class Options extends Tab
         $importOptions = $options['import']['options'];
         $options = array_merge($options, $importOptions);
         unset($options['import']);
+
         return $options;
     }
 
@@ -210,6 +212,7 @@ class Options extends Tab
         if ($end = strpos($str, '-')) {
             $str = substr($str, 0, $end) . ucfirst(substr($str, ($end + 1)));
         }
+
         return $str;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
index c96187a43aa..42e74a91ca9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options;
 
+use Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
 
 /**
  * Abstract class AbstractOptions
@@ -18,14 +18,15 @@ abstract class AbstractOptions extends Tab
      * Fills in the form of an array of input data
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this
      */
-    public function fillOptions(array $fields, Element $element = null)
+    public function fillOptions(array $fields, SimpleElement $element = null)
     {
         $element = $element === null ? $this->_rootElement : $element;
         $mapping = $this->dataMapping($fields);
         $this->_fill($mapping, $element);
+
         return $this;
     }
 
@@ -33,13 +34,14 @@ abstract class AbstractOptions extends Tab
      * Getting options data form on the product form
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this
      */
-    public function getDataOptions(array $fields = null, Element $element = null)
+    public function getDataOptions(array $fields = null, SimpleElement $element = null)
     {
         $element = $element === null ? $this->_rootElement : $element;
         $mapping = $this->dataMapping($fields);
+
         return $this->_getData($mapping, $element);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
index c7cb8cbc125..3f3281c4e1b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Type;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Form "Option dropdown" on tab product "Custom options".
@@ -31,13 +31,14 @@ class DropDown extends AbstractOptions
      * Fill the form.
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this
      */
-    public function fillOptions(array $fields, Element $element = null)
+    public function fillOptions(array $fields, SimpleElement $element = null)
     {
         $this->_rootElement->find($this->optionTitle)->click();
         $this->_rootElement->find($this->buttonAddLocator)->click();
+
         return parent::fillOptions($fields, $element);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
index 1d8f0518248..af37196727a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
+use Mtf\Client\Element\SuggestElement;
 
 /**
  * Class AttributeSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
index 50939e39db4..17aa4fbea6f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Driver\Selenium\Element\MultisuggestElement;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\MultisuggestElement;
 
 /**
  * Typified element class for category element.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
index 92f90f9e7b1..c5ee20db389 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
@@ -5,14 +5,14 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ProductOnlineSwitcher
  * Typified element class for product status element
  */
-class ProductOnlineSwitcher extends Element
+class ProductOnlineSwitcher extends SimpleElement
 {
     /**
      * CSS locator button status of the product
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
index a35229e7b51..e7b2f21c812 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid as RelatedGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Related
@@ -32,12 +32,13 @@ class Related extends AbstractRelated
     /**
      * Return related products grid
      *
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @return RelatedGrid
      */
-    protected function getRelatedGrid(Element $element = null)
+    protected function getRelatedGrid(SimpleElement $element = null)
     {
         $element = $element ? $element : $this->_rootElement;
+
         return $this->blockFactory->create(
             '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid',
             ['element' => $element->find($this->relatedGrid)]
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index bb831dec3e5..d81f389fe17 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid as UpsellGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Upsell
@@ -32,12 +32,13 @@ class Upsell extends AbstractRelated
     /**
      * Return related products grid
      *
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @return UpsellGrid
      */
-    protected function getRelatedGrid(Element $element = null)
+    protected function getRelatedGrid(SimpleElement $element = null)
     {
         $element = $element ? $element : $this->_rootElement;
+
         return $this->blockFactory->create(
             '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid',
             ['element' => $element->find($this->crossSellGrid)]
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
index 5b4d7fd23a5..c493015717c 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
@@ -5,14 +5,14 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Websites;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class StoreTree
  * Typified element class for store tree element
  */
-class StoreTree extends Element
+class StoreTree extends SimpleElement
 {
     /**
      * Selector for website checkbox
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
index af6cd68d4cb..aec8b15c2bd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product;
 
 use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
index a25ca762b75..005f1db13cd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product;
 
 use Magento\Backend\Test\Block\GridPageActions as ParentGridPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class GridPageAction
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 40e6a4d5d17..b9aabc785d3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -9,11 +9,12 @@ use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\AttributeForm;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\CustomAttribute;
-use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
 use Magento\Catalog\Test\Fixture\Product;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\DataFixture;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
@@ -125,13 +126,13 @@ class ProductForm extends FormTabs
      * Fill the product form.
      *
      * @param FixtureInterface $product
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @param FixtureInterface|null $category [optional]
      * @return FormTabs
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function fill(FixtureInterface $product, Element $element = null, FixtureInterface $category = null)
+    public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
     {
         $dataConfig = $product->getDataConfig();
         $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null;
@@ -183,7 +184,6 @@ class ProductForm extends FormTabs
             $tab = $this->openTab($tabName);
             $tab->addNewAttribute($tabName);
             $this->fillAttributeForm($attribute);
-            $this->reinitRootElement();
         }
     }
 
@@ -191,12 +191,13 @@ class ProductForm extends FormTabs
      * Get data of the tabs.
      *
      * @param FixtureInterface|null $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getData(FixtureInterface $fixture = null, Element $element = null)
+    public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
     {
         $this->showAdvancedSettings();
+
         return parent::getData($fixture, $element);
     }
 
@@ -329,6 +330,7 @@ class ProductForm extends FormTabs
         $tabName = strtolower($tabName);
         $selector = sprintf($this->customTab, $tabName);
         $this->waitForElementVisible($selector, Locator::SELECTOR_XPATH);
+
         return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
     }
 
@@ -364,6 +366,7 @@ class ProductForm extends FormTabs
                 $data[$tabName] = $errors;
             }
         }
+
         return $data;
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
index dc15b7c6332..dd542c4fb37 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Block\Category;
 
 use Magento\Widget\Test\Fixture\Widget;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class View
@@ -65,8 +65,7 @@ class View extends Block
     {
         $products = [];
         $this->waitForElementVisible($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
-        $productNames = $this->_rootElement->find($this->recentlyViewedProducts, Locator::SELECTOR_XPATH)
-            ->getElements();
+        $productNames = $this->_rootElement->getElements($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
         foreach ($productNames as $productName) {
             $products[] = $productName->getText();
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
index b1cf8ecbd86..cfd736f143f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
@@ -5,10 +5,11 @@
 
 namespace Magento\Catalog\Test\Block\Product;
 
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Mtf\Block\Block;
+use Mtf\Client\Locator;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
 
 /**
  * Product additional information block on the product page.
@@ -32,18 +33,19 @@ class Additional extends Block
     /**
      * Get product attributes.
      *
-     * @return Element[]
+     * @return SimpleElement[]
      */
     protected function getProductAttributes()
     {
         $data = [];
-        $elements = $this->_rootElement->find($this->attributeSelector, Locator::SELECTOR_XPATH)->getElements();
+        $elements = $this->_rootElement->getElements($this->attributeSelector, Locator::SELECTOR_XPATH);
         foreach ($elements as $element) {
             $data[$element->getText()] = $this->_rootElement->find(
                 $this->attributeSelector . $this->attributeValueSelector,
                 Locator::SELECTOR_XPATH
             );
         }
+
         return $data;
     }
 
@@ -66,11 +68,11 @@ class Additional extends Block
     /**
      * Find <tag1><tag2><tagN> ... </tagN></tag2></tag1> tag structure in element.
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @param string $selector
-     * @return Element
+     * @return SimpleElement
      */
-    protected function checkHtmlTagStructure(Element $element, $selector)
+    protected function checkHtmlTagStructure(SimpleElement $element, $selector)
     {
         return $element->find($selector);
     }
@@ -104,6 +106,7 @@ class Additional extends Block
         for ($index = 0; $index < $middleElement; $index++) {
             $selector .= $htmlData[$index]['tag'] . " ";
         }
+
         return trim($selector);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
index 8383790a3b0..c0b09ce946b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
@@ -6,8 +6,9 @@
 namespace Magento\Catalog\Test\Block\Product\Compare;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Compare list product block.
@@ -115,7 +116,7 @@ class ListCompare extends Block
      * Get item compare product info.
      *
      * @param int $index
-     * @return Element
+     * @return SimpleElement
      */
     protected function getCompareProductInfo($index)
     {
@@ -138,7 +139,7 @@ class ListCompare extends Block
         );
 
         $data = [];
-        $attributes = $this->_rootElement->find($this->attribute)->getElements();
+        $attributes = $this->_rootElement->getElements($this->attribute);
         foreach ($attributes as $attribute) {
             $data[] = $attribute->getText();
         }
@@ -149,7 +150,7 @@ class ListCompare extends Block
      * Get item compare product attribute.
      *
      * @param string $key
-     * @return Element
+     * @return SimpleElement
      */
     public function getCompareProductAttribute($key)
     {
@@ -206,7 +207,6 @@ class ListCompare extends Block
         while ($this->isProductVisible()) {
             $this->removeProduct();
             $messageBlock->waitSuccessMessage();
-            $this->reinitRootElement();
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
index 597ab1fa296..1e882296bf7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
@@ -5,8 +5,6 @@
 
 namespace Magento\Catalog\Test\Block\Product\Compare;
 
-use Mtf\Client\Element;
-
 /**
  * Compare product block on cms page.
  */
@@ -50,7 +48,7 @@ class Sidebar extends ListCompare
                     return $rootElement->find($selector)->isVisible() ? true : null;
                 }
             );
-            $elements = $this->_rootElement->find($this->productName)->getElements();
+            $elements = $this->_rootElement->getElements($this->productName);
             foreach ($elements as $element) {
                 $result[] = $element->getText();
             }
@@ -73,6 +71,6 @@ class Sidebar extends ListCompare
     public function clickClearAll()
     {
         $this->_rootElement->find($this->clearAll)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
index 58627610e68..66a0c6cd76c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
@@ -6,8 +6,9 @@
 namespace Magento\Catalog\Test\Block\Product\Grouped;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 
 /**
@@ -19,7 +20,7 @@ class AssociatedProducts extends Tab
     /**
      * 'Create New Option' button
      *
-     * @var Element
+     * @var SimpleElement
      */
     protected $addNewOption = '#grouped-product-container>button';
 
@@ -52,10 +53,10 @@ class AssociatedProducts extends Tab
     /**
      * Get associated products list block
      *
-     * @param Element $context
+     * @param SimpleElement $context
      * @return \Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts
      */
-    protected function getListAssociatedProductsBlock(Element $context = null)
+    protected function getListAssociatedProductsBlock(SimpleElement $context = null)
     {
         $element = $context ?: $this->_rootElement;
 
@@ -68,10 +69,10 @@ class AssociatedProducts extends Tab
      * Fill data to fields on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (isset($fields['grouped_products'])) {
             foreach ($fields['grouped_products']['value'] as $groupedProduct) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 47d0630b7ab..45026dd557b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Factory\Factory;
 
 /**
@@ -20,10 +20,10 @@ class ListAssociatedProducts extends Block
      * Getting block products
      *
      * @param string $productId
-     * @param Element $context
+     * @param SimpleElement $context
      * @return ListAssociatedProducts\Product
      */
-    private function getProductBlock($productId, Element $context = null)
+    private function getProductBlock($productId, SimpleElement $context = null)
     {
         $element = $context ?: $this->_rootElement;
         return Factory::getBlockFactory()
@@ -39,9 +39,9 @@ class ListAssociatedProducts extends Block
      * Filling options products
      *
      * @param array $data
-     * @param Element $element
+     * @param SimpleElement $element
      */
-    public function fillProductOptions(array $data, Element $element = null)
+    public function fillProductOptions(array $data, SimpleElement $element = null)
     {
         $productBlock = $this->getProductBlock($data['product_id']['value'], $element);
         $productBlock->fillQty($data['selection_qty']['value']);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 55f1ca0604a..24410cd98cc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -7,6 +7,9 @@ namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAsso
 
 use Mtf\Block\Block;
 
+/**
+ * Class Product
+ */
 class Product extends Block
 {
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
index 67001399d28..53c3b4a9310 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -9,7 +9,6 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
 
 /**
  * Class Grid
- *
  */
 class Grid extends GridInterface
 {
@@ -36,6 +35,8 @@ class Grid extends GridInterface
 
     /**
      * Initialize block elements
+     * 
+     * @return void
      */
     protected function _init()
     {
@@ -45,6 +46,8 @@ class Grid extends GridInterface
 
     /**
      * Press 'Add Selected Products' button
+     * 
+     * @return void
      */
     public function addProducts()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
index 14205924663..3e48232ef20 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Block\Product;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Factory\Factory;
 
 /**
@@ -134,7 +134,7 @@ class ListProduct extends Block
      * This method returns the element representing the product details for the named product.
      *
      * @param string $productName String containing the name of the product
-     * @return Element
+     * @return SimpleElement
      */
     protected function getProductDetailsElement($productName)
     {
@@ -148,7 +148,7 @@ class ListProduct extends Block
      * This method returns the element on the page associated with the product name.
      *
      * @param string $productName String containing the name of the product
-     * @return Element
+     * @return SimpleElement
      */
     protected function getProductNameElement($productName)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 10a1c191bd1..840f7f50707 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -5,8 +5,8 @@
 namespace Magento\Catalog\Test\Block\Product;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Price
@@ -266,7 +266,7 @@ class Price extends Block
      * Get specify type price element
      *
      * @param string $type
-     * @return Element
+     * @return SimpleElement
      */
     protected function getTypePriceElement($type)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
index 746d75e836d..d29a20da455 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
@@ -5,11 +5,11 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Magento\Catalog\Test\Fixture\Product;
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Fixture\Product;
 
 /**
  * Class Crosssell
@@ -40,7 +40,7 @@ class Crosssell extends Block
      * Click on cross-sell product link
      *
      * @param Product $product
-     * @return Element
+     * @return SimpleElement
      */
     public function clickLink($product)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
index e9b3bb40e2e..4b606cbd7bd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Related
@@ -72,7 +72,7 @@ class Related extends Block
      * Get related product element
      *
      * @param string $productName
-     * @return Element
+     * @return SimpleElement
      */
     private function getProductElement($productName)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
index 343786e57ed..743bdae561c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Upsell
@@ -47,7 +47,7 @@ class Upsell extends Block
      * Get a the product
      *
      * @param string $productName
-     * @return Element
+     * @return SimpleElement
      */
     private function getProductElement($productName)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 7d0a4dba77b..16575c35456 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Block\Product;
 
 use Magento\Catalog\Test\Block\AbstractConfigureBlock;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 8c391709217..8e26c0dc760 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -6,10 +6,10 @@
 namespace Magento\Catalog\Test\Block\Product\View;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class CustomOptions
@@ -135,7 +135,7 @@ class CustomOptions extends Form
                 throw new \Exception("Can't find option: \"{$title}\"");
             }
 
-            /** @var Element $optionElement */
+            /** @var SimpleElement $optionElement */
             $optionElement = $listCustomOptions[$title];
             $typeMethod = preg_replace('/[^a-zA-Z]/', '', $option['type']);
             $getTypeData = 'get' . ucfirst(strtolower($typeMethod)) . 'Data';
@@ -177,10 +177,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Field" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getFieldData(Element $option)
+    protected function getFieldData(SimpleElement $option)
     {
         $price = $this->getOptionPriceNotice($option);
         $maxCharacters = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
@@ -198,10 +198,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Area" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getAreaData(Element $option)
+    protected function getAreaData(SimpleElement $option)
     {
         return $this->getFieldData($option);
     }
@@ -209,10 +209,10 @@ class CustomOptions extends Form
     /**
      * Get data of "File" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getFileData(Element $option)
+    protected function getFileData(SimpleElement $option)
     {
         $price = $this->getOptionPriceNotice($option);
 
@@ -231,10 +231,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Drop-down" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getDropdownData(Element $option)
+    protected function getDropdownData(SimpleElement $option)
     {
         $select = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'select');
         // Skip "Choose option ..."(option #1)
@@ -244,10 +244,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Multiple Select" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getMultipleSelectData(Element $option)
+    protected function getMultipleSelectData(SimpleElement $option)
     {
         $multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
         return $this->getSelectOptionsData($multiselect, 1);
@@ -256,14 +256,15 @@ class CustomOptions extends Form
     /**
      * Get data of "Radio Buttons" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getRadioButtonsData(Element $option)
+    protected function getRadioButtonsData(SimpleElement $option)
     {
         $listOptions = [];
 
         $count = 1;
+        /** @var SimpleElement $option */
         $option = $option->find(sprintf($this->optionLabel, $count), Locator::SELECTOR_XPATH);
         while ($option->isVisible()) {
             $listOptions[] = $this->parseOptionText($option->getText());
@@ -279,10 +280,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Checkbox" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getCheckboxData(Element $option)
+    protected function getCheckboxData(SimpleElement $option)
     {
         return $this->getRadioButtonsData($option);
     }
@@ -290,10 +291,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Date" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getDateData(Element $option)
+    protected function getDateData(SimpleElement $option)
     {
         $price = $this->getOptionPriceNotice($option);
 
@@ -309,10 +310,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Date & Time" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getDateTimeData(Element $option)
+    protected function getDateTimeData(SimpleElement $option)
     {
         return $this->getDateData($option);
     }
@@ -320,10 +321,10 @@ class CustomOptions extends Form
     /**
      * Get data of "Time" custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getTimeData(Element $option)
+    protected function getTimeData(SimpleElement $option)
     {
         return $this->getDateData($option);
     }
@@ -331,11 +332,11 @@ class CustomOptions extends Form
     /**
      * Get data from option of select and multiselect
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @param int $firstOption
      * @return array
      */
-    protected function getSelectOptionsData(Element $element, $firstOption = 1)
+    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
     {
         $listOptions = [];
 
@@ -355,10 +356,10 @@ class CustomOptions extends Form
     /**
      * Get price from price-notice of custom option
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @return array
      */
-    protected function getOptionPriceNotice(Element $option)
+    protected function getOptionPriceNotice(SimpleElement $option)
     {
         $priceNotice = $option->find($this->priceNotice, Locator::SELECTOR_XPATH);
         if (!$priceNotice->isVisible()) {
@@ -370,11 +371,11 @@ class CustomOptions extends Form
     /**
      * Get notice of option by number
      *
-     * @param Element $option
+     * @param SimpleElement $option
      * @param int $number
      * @return mixed
      */
-    protected function getOptionNotice(Element $option, $number)
+    protected function getOptionNotice(SimpleElement $option, $number)
     {
         $note = $option->find(sprintf($this->noteByNumber, $number), Locator::SELECTOR_XPATH);
         return $note->isVisible() ? $note->getText() : null;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 84b180745e9..3630d8fae75 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Search
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
index 46326d1ee30..b4cee4a16c4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -28,13 +28,16 @@ class AssertCategoryAbsenceOnFrontend extends AbstractConstraint
     /**
      * Assert that not displayed category in frontend main menu
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogCategoryView $categoryView
      * @param CatalogCategory $category
      * @return void
      */
-    public function processAssert(Browser $browser, CatalogCategoryView $categoryView, CatalogCategory $category)
-    {
+    public function processAssert(
+        BrowserInterface $browser,
+        CatalogCategoryView $categoryView,
+        CatalogCategory $category
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
         \PHPUnit_Framework_Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
index 166faa8e721..88070abc35a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,11 +25,14 @@ class AssertCategoryForAssignedProducts extends AbstractConstraint
      *
      * @param CatalogCategory $category
      * @param CatalogCategoryView $categoryView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CatalogCategory $category, CatalogCategoryView $categoryView, Browser $browser)
-    {
+    public function processAssert(
+        CatalogCategory $category,
+        CatalogCategoryView $categoryView,
+        BrowserInterface $browser
+    ) {
         $browser->open($_ENV['app_frontend_url'] . strtolower($category->getUrlKey()) . '.html');
         $products = $category->getDataFieldConfig('category_products')['source']->getProducts();
         foreach ($products as $productFixture) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index ea0f357e3c8..dfd6c54dec5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -27,10 +27,10 @@ class AssertCategoryIsNotActive extends AbstractConstraint
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogCategory $category
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, CatalogCategory $category, Browser $browser)
+    public function processAssert(CmsIndex $cmsIndex, CatalogCategory $category, BrowserInterface $browser)
     {
         $cmsIndex->open();
         \PHPUnit_Framework_Assert::assertFalse(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
index 1afb66d142f..a0a239fdefb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -26,14 +26,14 @@ class AssertCategoryIsNotIncludeInMenu extends AbstractConstraint
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogCategory $category
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogCategoryView $categoryView
      * @return void
      */
     public function processAssert(
         CmsIndex $cmsIndex,
         CatalogCategory $category,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogCategoryView $categoryView
     ) {
         $cmsIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index 92b3304b91c..de0766a538a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
 
@@ -28,7 +28,7 @@ class AssertCategoryPage extends AbstractConstraint
      * @param CatalogCategory $initialCategory
      * @param FixtureFactory $fixtureFactory
      * @param CatalogCategoryView $categoryView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
@@ -36,7 +36,7 @@ class AssertCategoryPage extends AbstractConstraint
         CatalogCategory $initialCategory,
         FixtureFactory $fixtureFactory,
         CatalogCategoryView $categoryView,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $product = $fixtureFactory->createByCode(
             'catalogProductSimple',
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
index 9d8f3987389..88f550b4fe1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -23,12 +23,15 @@ class AssertCategoryRedirect extends AbstractConstraint
      * Assert that old Category URL lead to appropriate Category in frontend
      *
      * @param CatalogCategory $category
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogCategory $initialCategory
      * @return void
      */
-    public function processAssert(CatalogCategory $category, Browser $browser, CatalogCategory $initialCategory)
-    {
+    public function processAssert(
+        CatalogCategory $category,
+        BrowserInterface $browser,
+        CatalogCategory $initialCategory
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html');
 
         \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
index 2ca88767f48..9c6966cb8df 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -25,7 +25,7 @@ class AssertCrossSellsProductsSection extends AbstractConstraint
     /**
      * Assert that product is displayed in cross-sell section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CheckoutCart $checkoutCart
      * @param CatalogProductSimple $product
      * @param CatalogProductView $catalogProductView
@@ -33,7 +33,7 @@ class AssertCrossSellsProductsSection extends AbstractConstraint
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CheckoutCart $checkoutCart,
         CatalogProductSimple $product,
         CatalogProductView $catalogProductView,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
index 765669ef91f..256806320ee 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -25,7 +25,7 @@ class AssertNoCrossSellsProductsSection extends AbstractConstraint
     /**
      * Assert that product is not displayed in cross-sell section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @param InjectableFixture[] $relatedProducts
      * @param CatalogProductView $catalogProductView
@@ -33,7 +33,7 @@ class AssertNoCrossSellsProductsSection extends AbstractConstraint
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product,
         array $relatedProducts,
         CatalogProductView $catalogProductView,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
index 76defe97417..0ac6d8640b8 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -24,14 +24,14 @@ class AssertNoRelatedProductsSection extends AbstractConstraint
     /**
      * Assert that product is not displayed in related products section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @param InjectableFixture[] $relatedProducts
      * @param CatalogProductView $catalogProductView
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product,
         array $relatedProducts,
         CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
index e787890abee..7c547019a3f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -24,14 +24,14 @@ class AssertNoUpSellsProductsSection extends AbstractConstraint
     /**
      * Assert that product is not displayed in up-sell section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @param InjectableFixture[] $relatedProducts
      * @param CatalogProductView $catalogProductView
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product,
         array $relatedProducts,
         CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
index 8213f53c9c1..db4d12f0b1e 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -26,14 +26,14 @@ class AssertProductAttributeDisplayingOnFrontend extends AbstractConstraint
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         InjectableFixture $product,
         CatalogProductAttribute $attribute,
         CatalogProductView $catalogProductView,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
index 5cdbac2478c..7ba142e6e21 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -26,14 +26,14 @@ class AssertProductAttributeIsComparable extends AbstractConstraint
      *
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param CatalogProductCompare $catalogProductCompare
      */
     public function processAssert(
         InjectableFixture $product,
         CatalogProductAttribute $attribute,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         CatalogProductCompare $catalogProductCompare
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
index b88bea3779a..c8335b667fd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -27,7 +27,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @throws \Exception
      * @return void
      */
@@ -35,7 +35,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
         InjectableFixture $product,
         CatalogProductAttribute $attribute,
         CatalogProductView $catalogProductView,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
index 0e05a29df61..2ad2845a1f6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
 
@@ -26,11 +26,15 @@ class AssertProductCompareBlockOnCmsPage extends AbstractConstraint
      * @param array $products
      * @param CmsIndex $cmsIndex
      * @param FixtureFactory $fixtureFactory
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(array $products, CmsIndex $cmsIndex, FixtureFactory $fixtureFactory, Browser $browser)
-    {
+    public function processAssert(
+        array $products,
+        CmsIndex $cmsIndex,
+        FixtureFactory $fixtureFactory,
+        BrowserInterface $browser
+    ) {
         $newCmsPage = $fixtureFactory->createByCode('cmsPage', ['dataSet' => '3_column_template']);
         $newCmsPage->persist();
         $browser->open($_ENV['app_frontend_url'] . $newCmsPage->getIdentifier());
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
index c619e0f81e9..810a27105ed 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 use Mtf\Fixture\FixtureInterface;
 
@@ -79,11 +79,14 @@ class AssertProductCustomOptionsOnProductPage extends AbstractAssertForm
      *
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product, Browser $browser)
-    {
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        FixtureInterface $product,
+        BrowserInterface $browser
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         $actualPrice = null;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
index 6733686de31..b3707daef89 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -39,11 +39,14 @@ class AssertProductGroupedPriceOnProductPage extends AbstractConstraint implemen
      *
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product, Browser $browser)
-    {
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        FixtureInterface $product,
+        BrowserInterface $browser
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         //Process assertions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
index b51e91662ee..b2a9685719e 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -27,14 +27,14 @@ class AssertProductInCart extends AbstractConstraint
      *
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CheckoutCart $checkoutCart
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         FixtureInterface $product,
-        Browser $browser,
+        BrowserInterface $browser,
         CheckoutCart $checkoutCart
     ) {
         // Add product to cart
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
index cf56a590381..fdb20617fed 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -28,12 +28,15 @@ class AssertProductInStock extends AbstractConstraint
      * Assert that In Stock status is displayed on product page
      *
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureInterface $product
      * @return void
      */
-    public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
-    {
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        BrowserInterface $browser,
+        FixtureInterface $product
+    ) {
         // TODO fix initialization url for frontend page
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
index 459715d46f9..ff6f264e66b 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -59,7 +59,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
     /**
      * Browser
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -78,7 +78,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
      * @param CatalogCategoryView $catalogCategoryView
      * @param CmsIndex $cmsIndex
      * @param FixtureInterface|FixtureInterface[] $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogCategory|null $category
      */
     public function processAssert(
@@ -87,7 +87,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
         CatalogCategoryView $catalogCategoryView,
         CmsIndex $cmsIndex,
         $product,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogCategory $category = null
     ) {
         $this->browser = $browser;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
index aa4b008f2ee..1e8f438a989 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -28,12 +28,15 @@ class AssertProductOutOfStock extends AbstractConstraint
      * Assert that Out of Stock status is displayed on product page
      *
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureInterface $product
      * @return void
      */
-    public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
-    {
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        BrowserInterface $browser,
+        FixtureInterface $product
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         \PHPUnit_Framework_Assert::assertEquals(
             self::STOCK_AVAILABILITY,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
index e46c706950f..7470919ae5a 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 use Mtf\Fixture\FixtureInterface;
 
@@ -44,13 +44,16 @@ class AssertProductPage extends AbstractAssertForm
      * 5. Description
      * 6. Short Description
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
      * @return void
      */
-    public function processAssert(Browser $browser, CatalogProductView $catalogProductView, FixtureInterface $product)
-    {
+    public function processAssert(
+        BrowserInterface $browser,
+        CatalogProductView $catalogProductView,
+        FixtureInterface $product
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         $this->product = $product;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
index 35e6507222d..3d997e10abc 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -31,12 +31,15 @@ class AssertProductSpecialPriceOnProductPage extends AbstractConstraint implemen
      * Assert that displayed special price on product page equals passed from fixture
      *
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureInterface $product
      * @return void
      */
-    public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
-    {
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        BrowserInterface $browser,
+        FixtureInterface $product
+    ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         //Process assertions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
index 252b0a6454c..3f770590c88 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -37,13 +37,13 @@ class AssertProductTierPriceOnProductPage extends AbstractConstraint implements
     /**
      * Assertion that tier prices are displayed correctly
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param FixtureInterface $product
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         FixtureInterface $product
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
index 806c7be578f..c20344a5c67 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -7,13 +7,11 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductView
- *
- * @package Magento\Catalog\Test\Constraint
  */
 class AssertProductView extends AbstractConstraint
 {
@@ -23,13 +21,13 @@ class AssertProductView extends AbstractConstraint
 
     /**
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product
     ) {
         //Open product view page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
index 91f38bcd8c3..fe18bbf244a 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -24,14 +24,14 @@ class AssertRelatedProductsSection extends AbstractConstraint
     /**
      * Assert that product is displayed in related products section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @param InjectableFixture[] $relatedProducts
      * @param CatalogProductView $catalogProductView
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product,
         array $relatedProducts,
         CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
index a9bc575d105..f0887a60c2b 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
@@ -24,14 +24,14 @@ class AssertUpSellsProductsSection extends AbstractConstraint
     /**
      * Assert that product is displayed in up-sell section
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureInterface $product
      * @param InjectableFixture[] $relatedProducts,
      * @param CatalogProductView $catalogProductView
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         FixtureInterface $product,
         array $relatedProducts,
         CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
index 87402b3870c..110f4df6a33 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Fixture\DataFixture;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
index 94958ec16fa..50dfcc42995 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\Page\Category;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
index 79f79d8bf78..9f675641ee8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Page\Category;
 
 use Magento\Backend\Test\Block\FormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
index 89f6ec20585..ba94f472976 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\Page\Product;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
index 96916f5d25f..a6e69a5c091 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\Fixture\InjectableFixture;
@@ -40,7 +40,7 @@ abstract class AbstractCompareProductsTest extends Injectable
     /**
      * Browser.
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -98,14 +98,14 @@ abstract class AbstractCompareProductsTest extends Injectable
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CustomerAccountLogin $customerAccountLogin
      * @return void
      */
     public function __inject(
         CmsIndex $cmsIndex,
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         CustomerAccountLogin $customerAccountLogin
     ) {
         $this->cmsIndex = $cmsIndex;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
index f418c0e7486..77faebc6daa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Catalog\Test\TestStep;
 
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestStep\TestStepInterface;
 
 /**
@@ -23,7 +23,7 @@ class OpenProductsOnFrontendStep implements TestStepInterface
     /**
      * Browser.
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -32,9 +32,9 @@ class OpenProductsOnFrontendStep implements TestStepInterface
      *
      * @constructor
      * @param array $products
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      */
-    public function __construct(array $products, Browser $browser)
+    public function __construct(array $products, BrowserInterface $browser)
     {
         $this->products = $products;
         $this->browser = $browser;
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
index 3390387e585..439e4603cbc 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
@@ -5,9 +5,9 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo;
 
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
 
 /**
  * Backend catalog price rule grid.
@@ -60,7 +60,7 @@ class Catalog extends Grid
      * Return row with given catalog price rule name.
      *
      * @param string $ruleName
-     * @return Element
+     * @return SimpleElement
      */
     public function getGridRow($ruleName)
     {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
index bfa8d3a4e13..6fdd9646959 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
@@ -6,6 +6,7 @@
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
 use Mtf\Fixture\FixtureInterface;
 
@@ -19,11 +20,11 @@ class PromoForm extends FormTabs
      * Fill form with tabs
      *
      * @param FixtureInterface $fixture
-     * @param Element $element
+     * @param SimpleElement $element
      * @param array $replace
      * @return $this|FormTabs
      */
-    public function fill(FixtureInterface $fixture, Element $element = null, array $replace = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
         $tabs = $this->getFieldsByTabs($fixture);
         if ($replace) {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index d31b30b1a68..4857d519312 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -5,9 +5,9 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\Tab;
 
-use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
 use Mtf\Factory\Factory;
+use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Conditions
@@ -27,10 +27,10 @@ class Conditions extends Tab
      * Fill condition options
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return void
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $data = $this->dataMapping($fields);
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
index e4717f9ff45..9cccfa934ef 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
@@ -5,7 +5,7 @@
 namespace Magento\CatalogRule\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
index d59d0487c33..813671d632f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
@@ -7,8 +7,9 @@ namespace Magento\CatalogSearch\Test\Block\Advanced;
 
 use Mtf\Block\Form as ParentForm;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Advanced search form.
@@ -57,10 +58,10 @@ class Form extends ParentForm
      * Fill the root form.
      *
      * @param FixtureInterface $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $fixture, Element $element = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         // Prepare price data
         $data = $fixture->getData();
@@ -82,9 +83,9 @@ class Form extends ParentForm
      *
      * @param FixtureInterface $fixture
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      */
-    public function fillCustom(FixtureInterface $fixture, array $fields, Element $element = null)
+    public function fillCustom(FixtureInterface $fixture, array $fields, SimpleElement $element = null)
     {
         $data = $fixture->getData('fields');
         $dataForMapping = array_intersect_key($data, array_flip($fields));
@@ -100,7 +101,7 @@ class Form extends ParentForm
     public function getFormLabels()
     {
         $labels = [];
-        $elements = $this->_rootElement->find($this->fieldSelector, Locator::SELECTOR_XPATH)->getElements();
+        $elements = $this->_rootElement->getElements($this->fieldSelector, Locator::SELECTOR_XPATH);
         foreach ($elements as $element) {
             $labels[] = $element->find($this->labelSelector)->getText();
         }
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
index b093cc2ca22..9ff82fa6eeb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
@@ -6,7 +6,7 @@
 namespace Magento\CatalogSearch\Test\Block\Advanced;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Result
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
index 1078c8628cc..54a80844ecb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
@@ -6,7 +6,7 @@
 namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -24,14 +24,14 @@ class AssertSearchSynonymMassActionNotOnFrontend extends AbstractConstraint
      *
      * @param array $searchTerms
      * @param CmsIndex $cmsIndex
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param AssertSearchSynonymNotOnFrontend $assertSearchSynonymNotOnFrontend
      * @return void
      */
     public function processAssert(
         array $searchTerms,
         CmsIndex $cmsIndex,
-        Browser $browser,
+        BrowserInterface $browser,
         AssertSearchSynonymNotOnFrontend $assertSearchSynonymNotOnFrontend
     ) {
         foreach ($searchTerms as $term) {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
index 66a345529c2..4b71d74ea30 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,10 +25,10 @@ class AssertSearchSynonymNotOnFrontend extends AbstractConstraint
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogSearchQuery $searchTerm
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+    public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
     {
         $cmsIndex->open()->getSearchBlock()->search($searchTerm->getSynonymFor());
         \PHPUnit_Framework_Assert::assertNotEquals(
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
index 5571ccc2f8f..0be6dc36494 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,14 +25,14 @@ class AssertSearchTermMassActionNotOnFrontend extends AbstractConstraint
      *
      * @param array $searchTerms
      * @param CmsIndex $cmsIndex
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param AssertSearchTermNotOnFrontend $assertSearchTermNotOnFrontend
      * @return void
      */
     public function processAssert(
         array $searchTerms,
         CmsIndex $cmsIndex,
-        Browser $browser,
+        BrowserInterface $browser,
         AssertSearchTermNotOnFrontend $assertSearchTermNotOnFrontend
     ) {
         foreach ($searchTerms as $term) {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
index 581cd1488e9..67a1ac719ef 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,10 +25,10 @@ class AssertSearchTermNotOnFrontend extends AbstractConstraint
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogSearchQuery $searchTerm
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+    public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
     {
         $queryText = $searchTerm->getQueryText();
         $cmsIndex->open()->getSearchBlock()->search($queryText);
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
index 49f557382be..99bf74dd791 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 use Magento\Catalog\Test\Block\Search;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -37,10 +37,10 @@ class AssertSearchTermOnFrontend extends AbstractConstraint
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogSearchQuery $searchTerm
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $searchTerm, Browser $browser)
+    public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $searchTerm, BrowserInterface $browser)
     {
         $errors = [];
         $this->searchBlock = $cmsIndex->open()->getSearchBlock();
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
index d8684a2ec58..3c40c98beeb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -24,11 +24,11 @@ class AssertSearchTermSynonymOnFrontend extends AbstractConstraint
      * Assert that you will be redirected to url from dataset
      *
      * @param CmsIndex $cmsIndex
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogSearchQuery $searchTerm
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+    public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
     {
         $cmsIndex->open()->getSearchBlock()->search($searchTerm->getSynonymFor());
         $windowUrl = $browser->getUrl();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 30faffaeb64..058349c2f15 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -9,7 +9,7 @@ use Exception;
 use Magento\Checkout\Test\Block\Cart\CartItem;
 use Magento\Checkout\Test\Block\Onepage\Link;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Fixture\FixtureInterface;
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
index 646575bc8ac..b0e54a740d0 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
@@ -6,7 +6,7 @@
 namespace Magento\Checkout\Test\Block\Cart;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class CartEmpty
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
index c16fd46bb96..1e78edd0780 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class CartItem
@@ -141,8 +141,8 @@ class CartItem extends AbstractCartItem
         $options = [];
 
         if ($optionsBlock->isVisible()) {
-            $titles = $optionsBlock->find('./dt', Locator::SELECTOR_XPATH)->getElements();
-            $values = $optionsBlock->find('./dd', Locator::SELECTOR_XPATH)->getElements();
+            $titles = $optionsBlock->getElements('./dt', Locator::SELECTOR_XPATH);
+            $values = $optionsBlock->getElements('./dd', Locator::SELECTOR_XPATH);
 
             foreach ($titles as $key => $title) {
                 $value = $values[$key]->getText();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
index 8a7e99cdf1f..189344602a8 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
@@ -6,7 +6,7 @@
 namespace Magento\Checkout\Test\Block\Cart;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class DiscountCodes
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index f5f589cfcfb..fe5dcd6d268 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\Block\Cart;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Shipping
@@ -124,6 +124,7 @@ class Shipping extends Form
             }
         );
         $selector = sprintf($this->shippingMethod, $carrier, $method);
+
         return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
     }
 }
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 1faf993de18..40355e4c663 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
@@ -6,7 +6,7 @@ namespace Magento\Checkout\Test\Block\Cart;
 
 use Magento\Checkout\Test\Block\Cart\Sidebar\Item;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
index 52ddfc86a04..320955b1141 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
@@ -35,7 +35,7 @@ class Item extends Sidebar
     public function removeItemFromMiniCart()
     {
         $this->_rootElement->find($this->removeItem)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
index a9db2d56823..70a31fd6d4e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -6,7 +6,7 @@
 namespace Magento\Checkout\Test\Block\Cart;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
index c3bf38ed68b..da3a27e72b3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -30,10 +30,10 @@ class AssertCartIsEmpty extends AbstractConstraint
      * Click here to continue shopping." where 'here' is link that leads to index page
      *
      * @param CheckoutCart $checkoutCart
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CheckoutCart $checkoutCart, Browser $browser)
+    public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $browser)
     {
         $checkoutCart->open();
         $cartEmptyBlock = $checkoutCart->getCartEmptyBlock();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 9d46030727d..f010fa5f8a6 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\ObjectManager;
 use Mtf\TestCase\Injectable;
@@ -34,7 +34,7 @@ class AddProductsToShoppingCartEntityTest extends Injectable
     /**
      * Browser interface
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -62,14 +62,14 @@ class AddProductsToShoppingCartEntityTest extends Injectable
     /**
      * Prepare test data
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $cartPage
      * @return void
      */
     public function __prepare(
-        Browser $browser,
+        BrowserInterface $browser,
         FixtureFactory $fixtureFactory,
         CatalogProductView $catalogProductView,
         CheckoutCart $cartPage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
index 6e2760eb681..f61c1ef1d3f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\Fixture\InjectableFixture;
 use Mtf\ObjectManager;
@@ -33,7 +33,7 @@ class DeleteProductsFromShoppingCartTest extends Injectable
     /**
      * Browser interface
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -61,14 +61,14 @@ class DeleteProductsFromShoppingCartTest extends Injectable
     /**
      * Prepare test data
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $cartPage
      * @return void
      */
     public function __prepare(
-        Browser $browser,
+        BrowserInterface $browser,
         FixtureFactory $fixtureFactory,
         CatalogProductView $catalogProductView,
         CheckoutCart $cartPage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 31aa86e5375..fefbde92170 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\TestCase\Injectable;
 
@@ -36,7 +36,7 @@ class UpdateShoppingCartTest extends Injectable
     /**
      * Browser interface
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -64,11 +64,11 @@ class UpdateShoppingCartTest extends Injectable
     /**
      * Prepare test data
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @return void
      */
-    public function __prepare(Browser $browser, FixtureFactory $fixtureFactory)
+    public function __prepare(BrowserInterface $browser, FixtureFactory $fixtureFactory)
     {
         $this->browser = $browser;
         $this->fixtureFactory = $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index db5bc04ced6..012404e0489 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\TestStep;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestStep\TestStepInterface;
 
 /**
@@ -48,7 +48,7 @@ class AddProductsToTheCartStep implements TestStepInterface
     /**
      * Interface Browser
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -57,14 +57,14 @@ class AddProductsToTheCartStep implements TestStepInterface
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $checkoutCart
      * @param CmsIndex $cmsIndex
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param array $products
      */
     public function __construct(
         CatalogProductView $catalogProductView,
         CheckoutCart $checkoutCart,
         CmsIndex $cmsIndex,
-        Browser $browser,
+        BrowserInterface $browser,
         array $products
     ) {
         $this->products = $products;
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
index a65799fc342..4bb9908e00a 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
@@ -5,10 +5,11 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Magento\Backend\Test\Block\Widget\Form as ParentForm;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Backend\Test\Block\Widget\Form as ParentForm;
 
 /**
  * Class AffectedAttributeSet
@@ -34,10 +35,10 @@ class AffectedAttributeSet extends ParentForm
      * Fill popup form
      *
      * @param FixtureInterface $product
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @return $this
      */
-    public function fill(FixtureInterface $product, Element $element = null)
+    public function fill(FixtureInterface $product, SimpleElement $element = null)
     {
         $affectedAttributeSet = $product->getData('affected_attribute_set');
 
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index 00c91537f98..606cebfdb81 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -7,8 +7,10 @@ namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Supe
 
 use Magento\Backend\Test\Block\Template;
 use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Config
@@ -83,10 +85,10 @@ class Config extends Tab
      * Fill variations fieldset
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $attributes = isset($fields['configurable_attributes_data']['value'])
             ? $fields['configurable_attributes_data']['value']
@@ -174,10 +176,10 @@ class Config extends Tab
      * Get data of tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $data = [];
 
@@ -195,7 +197,7 @@ class Config extends Tab
      */
     public function deleteAttributes()
     {
-        $attributeElements = $this->_rootElement->find($this->attributeElement)->getElements();
+        $attributeElements = $this->_rootElement->getElements($this->attributeElement);
         $this->_rootElement->find($this->variationsContent)->click();
         foreach ($attributeElements as $element) {
             $element->find($this->deleteVariationButton)->click();
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index 110deade25b..dd192900234 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -5,10 +5,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 
+use Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Form;
+use Mtf\Client\Element\SimpleElement;
 use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute\AttributeSelector;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
 
 /**
  * Attribute block in Variation section.
@@ -252,11 +252,11 @@ class Attribute extends Form
     /**
      * Check is visible option
      *
-     * @param Element $attributeBlock
+     * @param SimpleElement $attributeBlock
      * @param int $number
      * @return bool
      */
-    protected function isVisibleOption(Element $attributeBlock, $number)
+    protected function isVisibleOption(SimpleElement $attributeBlock, $number)
     {
         return $attributeBlock->find(
             sprintf($this->optionContainerByNumber, $number),
@@ -302,7 +302,7 @@ class Attribute extends Form
         $optionMapping = $this->dataMapping();
 
         $count = 1;
-        /** @var Element $attributeBlock */
+        /** @var SimpleElement $attributeBlock */
         $attributeBlock = $this->_rootElement->find(sprintf($this->attributeBlock, $count), Locator::SELECTOR_XPATH);
         while ($attributeBlock->isVisible()) {
             $this->showAttributeContent($attributeBlock);
@@ -311,9 +311,9 @@ class Attribute extends Form
                 'label' => $attributeBlock->find($this->attributeLabel)->getValue(),
                 'options' => [],
             ];
-            $options = $attributeBlock->find($this->optionContainer, Locator::SELECTOR_XPATH)->getElements();
+            $options = $attributeBlock->getElements($this->optionContainer, Locator::SELECTOR_XPATH);
             foreach ($options as $optionKey => $option) {
-                /** @var Element $option */
+                /** @var SimpleElement $option */
                 if ($option->isVisible()) {
                     $attribute['options'][$optionKey] = $this->_getData($optionMapping, $option);
                     $attribute['options'][$optionKey] += $this->getOptionalFields($option);
@@ -334,10 +334,10 @@ class Attribute extends Form
     /**
      * Show attribute content
      *
-     * @param Element $attribute
+     * @param SimpleElement $attribute
      * @return void
      */
-    protected function showAttributeContent(Element $attribute)
+    protected function showAttributeContent(SimpleElement $attribute)
     {
         if (!$attribute->find($this->attributeContent)->isVisible()) {
             $this->_rootElement->find($this->configContent)->click();
@@ -370,11 +370,11 @@ class Attribute extends Form
     /**
      * Get optional fields
      *
-     * @param Element $context
+     * @param SimpleElement $context
      * @param array $fields
      * @return array
      */
-    protected function getOptionalFields(Element $context, array $fields = [])
+    protected function getOptionalFields(SimpleElement $context, array $fields = [])
     {
         $data = [];
 
@@ -382,6 +382,7 @@ class Attribute extends Form
         foreach ($fields as $name => $params) {
             $data[$name] = $context->find($params['selector'], $params['strategy'])->getText();
         }
+
         return $data;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
index 3e63f4ab107..18b1892810c 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
@@ -5,8 +5,8 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
 
+use Mtf\Client\Element\SuggestElement;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
 
 /**
  * Class AttributeSelector
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
index 59222986416..64dd4eb2d1a 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
@@ -5,14 +5,14 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
 
 /**
  * Class ToggleDropdown
  * Class for toggle dropdown elements.
  */
-class ToggleDropdown extends Element
+class ToggleDropdown extends SimpleElement
 {
     /**
      * Selector for field value
@@ -43,7 +43,7 @@ class ToggleDropdown extends Element
      */
     public function setValue($value)
     {
-        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         if ($value != $this->getValue()) {
             $value = ('Yes' == $value) ? '%' : '$';
@@ -61,7 +61,7 @@ class ToggleDropdown extends Element
      */
     public function getValue()
     {
-        $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+        $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         $value = $this->find($this->field, Locator::SELECTOR_XPATH)->getText();
         return ('%' == $value) ? 'Yes' : 'No';
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
index b90a8272d74..6bffd1a9ef2 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
@@ -5,10 +5,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 
+use Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Template;
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Matrix
@@ -119,11 +119,11 @@ class Matrix extends Form
     /**
      * Assign product to variation matrix
      *
-     * @param Element $variationRow
+     * @param SimpleElement $variationRow
      * @param int $productId
      * @return void
      */
-    protected function assignProduct(Element $variationRow, $productId)
+    protected function assignProduct(SimpleElement $variationRow, $productId)
     {
         $variationRow->find($this->configurableAttribute)->click();
         $this->getTemplateBlock()->waitLoader();
@@ -141,10 +141,10 @@ class Matrix extends Form
     public function getVariationsData()
     {
         $data = [];
-        $variationRows = $this->_rootElement->find($this->variationRow, Locator::SELECTOR_XPATH)->getElements();
+        $variationRows = $this->_rootElement->getElements($this->variationRow, Locator::SELECTOR_XPATH);
 
         foreach ($variationRows as $key => $variationRow) {
-            /** @var Element $variationRow */
+            /** @var SimpleElement $variationRow */
             if ($variationRow->isVisible()) {
                 $data[$key] = $this->_getData($this->dataMapping(), $variationRow);
                 $data[$key] += $this->getOptionalFields($variationRow, $this->mappingGetFields);
@@ -157,11 +157,11 @@ class Matrix extends Form
     /**
      * Get optional fields
      *
-     * @param Element $context
+     * @param SimpleElement $context
      * @param array $fields
      * @return array
      */
-    protected function getOptionalFields(Element $context, array $fields)
+    protected function getOptionalFields(SimpleElement $context, array $fields)
     {
         $data = [];
 
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
index 37c61cc8936..b904c192714 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -5,7 +5,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
index 6b1ffba1b60..5c5aa4eae10 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
@@ -5,11 +5,12 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Magento\Backend\Test\Block\Widget\FormTabs;
 use Mtf\Client\Element;
 use Mtf\Fixture\DataFixture;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ProductForm
@@ -21,11 +22,11 @@ class ProductForm extends \Magento\Catalog\Test\Block\Adminhtml\Product\ProductF
      * Fill the product form
      *
      * @param FixtureInterface $product
-     * @param Element|null $element [optional]
+     * @param SimpleElement|null $element [optional]
      * @param FixtureInterface|null $category [optional]
      * @return FormTabs
      */
-    public function fill(FixtureInterface $product, Element $element = null, FixtureInterface $category = null)
+    public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
     {
         $tabs = $this->getFieldsByTabs($product);
         ksort($tabs);
@@ -100,6 +101,7 @@ class ProductForm extends \Magento\Catalog\Test\Block\Adminhtml\Product\ProductF
             ],
         ];
         unset($tabs['variations']['variations-matrix']);
+
         return $tabs;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
index 6c8ed2954f9..66ef86fdad9 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
@@ -9,9 +9,10 @@ use Magento\Catalog\Test\Block\Product\View\CustomOptions;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ConfigurableOptions
@@ -60,7 +61,7 @@ class ConfigurableOptions extends CustomOptions
                 throw new \Exception("Can't find option: \"{$title}\"");
             }
 
-            /** @var Element $optionElement */
+            /** @var SimpleElement $optionElement */
             $optionElement = $listOptions[$title];
             $typeMethod = preg_replace('/[^a-zA-Z]/', '', $option['frontend_input']);
             $getTypeData = 'get' . ucfirst(strtolower($typeMethod)) . 'Data';
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
index 59a23c1e9e1..1e5977e84a1 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -24,14 +24,14 @@ class AssertConfigurableAttributesAbsentOnProductPage extends AbstractConstraint
      * Assert that deleted configurable attributes are absent on product page on frontend.
      *
      * @param CatalogProductAttribute[] $deletedProductAttributes
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param ConfigurableProductInjectable $product
      * @return void
      */
     public function processAssert(
         array $deletedProductAttributes,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         ConfigurableProductInjectable $product
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
index 4c565a23255..b9fd634d122 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
@@ -7,7 +7,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -22,13 +22,13 @@ class AssertConfigurableAttributesBlockIsAbsentOnProductPage extends AbstractCon
     /**
      * Assert that all configurable attributes is absent on product page on frontend.
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param ConfigurableProductInjectable $product
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         ConfigurableProductInjectable $product
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
index 48db2e848a0..660e88d7ea1 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -20,14 +20,14 @@ class AssertConfigurableProductInCart extends AbstractConstraint
     /**
      * Assertion that the product is correctly displayed in cart
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $checkoutCart
      * @param ConfigurableProductInjectable $product
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         CheckoutCart $checkoutCart,
         ConfigurableProductInjectable $product
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
index 8b85b0a7ba9..0cca7671803 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
@@ -6,7 +6,7 @@
 namespace Magento\Core\Test\Block\Adminhtml\System\Variable;
 
 use Magento\Backend\Test\Block\FormPageActions as AbstractFormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class FormPageActions
@@ -40,7 +40,7 @@ class FormPageActions extends AbstractFormPageActions
      *
      * @param string $storeName
      * @throws \Exception
-     * @return void|bool
+     * @return null|bool
      */
     public function selectStoreView($storeName)
     {
@@ -56,6 +56,8 @@ class FormPageActions extends AbstractFormPageActions
         } else {
             throw new \Exception('Store View with name \'' . $storeName . '\' is not visible!');
         }
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
+
+        return null;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
index 03b780e9f57..ff29b806b02 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
@@ -6,7 +6,7 @@
 namespace Magento\Core\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Global messages block
@@ -67,7 +67,7 @@ class Messages extends Block
     public function getSuccessMessages()
     {
         $this->waitForElementVisible($this->successMessage);
-        $elements = $this->_rootElement->find($this->successMessage)->getElements();
+        $elements = $this->_rootElement->getElements($this->successMessage);
 
         $messages = [];
         foreach ($elements as $key => $element) {
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
index 62b2df94d02..0203036a83d 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Core\Test\Fixture\SystemVariable;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
 
@@ -29,7 +29,7 @@ class AssertCustomVariableInPage extends AbstractConstraint
      * @param CmsIndex $cmsIndex
      * @param SystemVariable $variable
      * @param FixtureFactory $fixtureFactory
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param Store $storeOrigin
      * @param SystemVariable $customVariableOrigin
      * @return void
@@ -39,7 +39,7 @@ class AssertCustomVariableInPage extends AbstractConstraint
         CmsIndex $cmsIndex,
         SystemVariable $variable,
         FixtureFactory $fixtureFactory,
-        Browser $browser,
+        BrowserInterface $browser,
         Store $storeOrigin = null,
         SystemVariable $customVariableOrigin = null
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
index a894d53abdd..2d3edd06fc4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Account;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class AddressesAdditional
@@ -46,7 +46,7 @@ class AddressesAdditional extends Block
     {
         $this->_rootElement->find(sprintf($this->addressSelector, $address->getStreet()), Locator::SELECTOR_XPATH)
             ->find($this->deleteAddressLink)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
index c591574604d..01d1b965c5f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Test\Block\Account;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Addresses default block
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
index 81e7271a849..8bdf701dab2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Test\Block\Account;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
index 7a597a4066d..3255347997e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Address;
 
 use Magento\Customer\Test\Fixture\Address;
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
index 3fa6c1f373f..e883760e668 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -7,8 +7,9 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Customer\Test\Fixture\AddressInjectable;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
@@ -145,12 +146,12 @@ class Addresses extends Tab
      * Get data to fields on tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         /* Skip get data for standard method. Use getDataAddresses. */
         return [];
@@ -195,6 +196,7 @@ class Addresses extends Tab
             sprintf($this->customerAddress, $addressNumber),
             Locator::SELECTOR_XPATH
         );
+
         return $addressTab->isVisible();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
index c9846e6c5bf..583437b2e07 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Form;
 
 use Magento\Customer\Test\Fixture\Customer;
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
index 722b8c39bcb..41b87f26fdf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Test\Block\Form;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
index 9bb5b47c3a3..4bdd2c45112 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Test\Block\Form;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
index 0491371ccb7..1964ff74ffa 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Page\Address;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
index fd8d343964c..9add30d974a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Customer\Test\Page;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
index 5086f2db15b..f435d901245 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Page;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index d268dd4d123..0d2edcd63f0 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -5,9 +5,10 @@
 
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
-use Magento\Backend\Test\Block\Widget\Tab;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Downloadable
@@ -34,11 +35,11 @@ class Downloadable extends Tab
      * Get Downloadable block
      *
      * @param string $type
-     * @param Element $element
+     * @param SimpleElement $element
      * @return \Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable\Samples |
      *         \Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable\Links
      */
-    public function getDownloadableBlock($type, Element $element = null)
+    public function getDownloadableBlock($type, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         return $this->blockFactory->create(
@@ -51,10 +52,10 @@ class Downloadable extends Tab
      * Get data to fields on downloadable tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $newFields = [];
         if (isset($fields['downloadable_sample']['value'])) {
@@ -75,10 +76,10 @@ class Downloadable extends Tab
      * Fill downloadable information
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (isset($fields['downloadable_sample']['value'])) {
             $this->getDownloadableBlock('Samples')->fillSamples($fields['downloadable_sample']['value']);
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 3900d11e868..67b891de896 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -5,8 +5,8 @@
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Links
@@ -54,10 +54,10 @@ class Links extends Form
      * Get Downloadable link item block
      *
      * @param int $index
-     * @param Element $element
+     * @param SimpleElement $element
      * @return LinkRow
      */
-    public function getRowBlock($index, Element $element = null)
+    public function getRowBlock($index, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         return $this->blockFactory->create(
@@ -70,10 +70,10 @@ class Links extends Form
      * Fill links block
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    public function fillLinks(array $fields, Element $element = null)
+    public function fillLinks(array $fields, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         if (!$element->find($this->title, Locator::SELECTOR_XPATH)->isVisible()) {
@@ -97,10 +97,10 @@ class Links extends Form
      * Get data links block
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataLinks(array $fields = null, Element $element = null)
+    public function getDataLinks(array $fields = null, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         if (!$element->find($this->title, Locator::SELECTOR_XPATH)->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 2c277cbaac4..29c7e7f2baa 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -5,8 +5,8 @@
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class SampleRow
@@ -47,10 +47,10 @@ class Samples extends Form
      * Get Downloadable sample item block
      *
      * @param int $index
-     * @param Element $element
+     * @param SimpleElement $element
      * @return SampleRow
      */
-    public function getRowBlock($index, Element $element = null)
+    public function getRowBlock($index, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         return $this->blockFactory->create(
@@ -63,10 +63,10 @@ class Samples extends Form
      * Fill samples block
      *
      * @param array|null $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    public function fillSamples(array $fields = null, Element $element = null)
+    public function fillSamples(array $fields = null, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         if (!$element->find($this->samplesTitle, Locator::SELECTOR_XPATH)->isVisible()) {
@@ -84,10 +84,10 @@ class Samples extends Form
      * Get data samples block
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataSamples(array $fields = null, Element $element = null)
+    public function getDataSamples(array $fields = null, SimpleElement $element = null)
     {
         $element = $element ?: $this->_rootElement;
         if (!$element->find($this->samplesTitle, Locator::SELECTOR_XPATH)->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
index 8824072b6ba..5e1fc5de16c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
@@ -6,7 +6,7 @@
 namespace Magento\Downloadable\Test\Block\Catalog\Product;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index fbe555145b6..b704710b07f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -6,7 +6,7 @@
 namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Links
@@ -109,7 +109,7 @@ class Links extends Block
     {
         $linksData = [];
 
-        $choiceLinks = $this->_rootElement->find($this->choiceLink, Locator::SELECTOR_XPATH)->getElements();
+        $choiceLinks = $this->_rootElement->getElements($this->choiceLink, Locator::SELECTOR_XPATH);
         foreach ($choiceLinks as $choiceLink) {
             $link = $choiceLink->find($this->linkForChoice);
             $sample = $choiceLink->find($this->sampleLinkForChoice);
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
index 8d7dd461b92..870f980500e 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
@@ -45,7 +45,7 @@ class Samples extends Block
      */
     public function getLinks()
     {
-        $links = $this->_rootElement->find($this->linkTitle)->getElements();
+        $links = $this->_rootElement->getElements($this->linkTitle);
         $linksData = [];
 
         foreach ($links as $link) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
index 7c984020243..7a8bb345d23 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
@@ -7,7 +7,7 @@
 namespace Magento\Downloadable\Test\Block\Customer\Products;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class ListProducts
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index e2fe6770baf..e997a236705 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -7,7 +7,7 @@ namespace Magento\Downloadable\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 
 /**
@@ -47,13 +47,13 @@ class AssertDownloadableLinksData extends AbstractAssertForm
      *
      * @param CatalogProductView $catalogProductView
      * @param DownloadableProductInjectable $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         DownloadableProductInjectable $product,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
index 1c216b23256..03238aee916 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
@@ -7,7 +7,7 @@ namespace Magento\Downloadable\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 
 /**
@@ -45,13 +45,13 @@ class AssertDownloadableSamplesData extends AbstractAssertForm
      *
      * @param CatalogProductView $productView
      * @param DownloadableProductInjectable $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $productView,
         DownloadableProductInjectable $product,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
index ba1b6510f68..21dc7fce14e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
@@ -5,8 +5,8 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
 
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Block\Form as ParentForm;
-use Mtf\Client\Element;
 use Mtf\Fixture\FixtureInterface;
 
 /**
@@ -26,10 +26,10 @@ class Form extends ParentForm
      * Fill backend GiftMessage item form.
      *
      * @param FixtureInterface $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $fixture, Element $element = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         parent::fill($fixture, $element);
         $this->_rootElement->find($this->okButton)->click();
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
index 381c2b2315d..d903121c10f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
@@ -6,7 +6,7 @@
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
 
 use Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items\ItemProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\InjectableFixture;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 93ffe7cfd8f..3c8f3bff0a2 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -5,9 +5,8 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items;
 
+use Mtf\Client\Locator;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
 
 /**
  * Item product block on backend create order page.
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
index 3d9ce754826..b08b7af6a27 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
@@ -6,7 +6,7 @@
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
 
 use Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items\ItemProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\InjectableFixture;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
index f69e3d2fcfe..7f1de882dce 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
@@ -5,9 +5,8 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items;
 
+use Mtf\Client\Locator;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
 
 /**
  * Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
index e6c487c43c2..7d9b7873825 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
@@ -7,7 +7,7 @@ namespace Magento\GiftMessage\Test\Block\Message;
 
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Inline
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 8eb82e24f8e..f37ac809d6b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -6,7 +6,7 @@
 namespace Magento\GiftMessage\Test\Block\Message\Order\Items;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Gift message block for order's items on order view page.
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
index 88a833c9bd4..707101b4bfd 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
@@ -6,8 +6,8 @@
 namespace Magento\GoogleShopping\Test\Block\Adminhtml\Types\Edit;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class GoogleShoppingForm
@@ -33,10 +33,10 @@ class GoogleShoppingForm extends Form
      * Fill specified form data
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    protected function _fill(array $fields, Element $element = null)
+    protected function _fill(array $fields, SimpleElement $element = null)
     {
         $context = ($element === null) ? $this->_rootElement : $element;
         foreach ($fields as $field) {
@@ -86,7 +86,7 @@ class GoogleShoppingForm extends Form
      */
     protected function getOptions()
     {
-        $elements = $this->_rootElement->find($this->attributeOptions, Locator::SELECTOR_XPATH)->getElements();
+        $elements = $this->_rootElement->getElements($this->attributeOptions, Locator::SELECTOR_XPATH);
 
         $options = [];
         foreach ($elements as $key => $element) {
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 1a81d130a35..27c46150bbf 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -6,8 +6,9 @@
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class AssociatedProducts
@@ -73,13 +74,13 @@ class AssociatedProducts extends Tab
      * Fill data to fields on tab
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         if (isset($fields['associated'])) {
-            $options = $this->_rootElement->find($this->deleteButton)->getElements();
+            $options = $this->_rootElement->getElements($this->deleteButton);
             if (count($options)) {
                 foreach ($options as $option) {
                     $option->click();
@@ -100,10 +101,10 @@ class AssociatedProducts extends Tab
      * Get data to fields on group tab
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $newFields = [];
         if (isset($fields['associated'])) {
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 7eda5b3319f..cc6eaef22f5 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,7 @@
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
index 5d08e9cdd71..03353fb0c1a 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -6,7 +6,6 @@
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts\Search;
 
 use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
index aa719f39917..4bc56774a07 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 use Mtf\Fixture\InjectableFixture;
 
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
index d4bd1a6dccf..4413298a1e0 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
@@ -115,7 +115,6 @@ class CartItem extends AbstractCartItem
     {
         foreach ($this->config['associated_cart_items'] as $cartItem) {
             /** @var CheckoutCartItem $cartItem */
-            $cartItem->reinitRootElement();
             $cartItem->removeItem();
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
index f5bc95fafb2..041777dba5d 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Constraint\AssertPriceOnProductPageInterface;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -37,7 +37,7 @@ abstract class AbstractAssertPriceOnGroupedProductPage extends AbstractConstrain
      * @param GroupedProductInjectable $product
      * @param CatalogProductView $catalogProductView
      * @param AssertPriceOnProductPageInterface $object
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param string $typePrice [optional]
      * @return bool|string
      */
@@ -45,7 +45,7 @@ abstract class AbstractAssertPriceOnGroupedProductPage extends AbstractConstrain
         GroupedProductInjectable $product,
         CatalogProductView $catalogProductView,
         AssertPriceOnProductPageInterface $object,
-        Browser $browser,
+        BrowserInterface $browser,
         $typePrice = ''
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
index 3b487c34e10..c6630befe7f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertGroupedPriceOnGroupedProductPage
@@ -40,14 +40,14 @@ class AssertGroupedPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupe
      * @param CatalogProductView $catalogProductView
      * @param GroupedProductInjectable $product
      * @param AssertProductGroupedPriceOnProductPage $groupedPrice
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         GroupedProductInjectable $product,
         AssertProductGroupedPriceOnProductPage $groupedPrice,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $this->processAssertPrice($product, $catalogProductView, $groupedPrice, $browser);
     }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
index a1002454955..d167d841cec 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
@@ -7,7 +7,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractAssertForm;
 
 /**
@@ -25,13 +25,13 @@ class AssertGroupedProductsDefaultQty extends AbstractAssertForm
      *
      * @param CatalogProductView $groupedProductView
      * @param GroupedProductInjectable $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $groupedProductView,
         GroupedProductInjectable $product,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $associatedProducts = $product->getAssociated();
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
index d0d23336d90..6ad65ce45c9 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertSpecialPriceOnGroupedProductPage
@@ -39,14 +39,14 @@ class AssertSpecialPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupe
      * @param CatalogProductView $catalogProductView
      * @param GroupedProductInjectable $product
      * @param AssertProductSpecialPriceOnProductPage $specialPrice
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         GroupedProductInjectable $product,
         AssertProductSpecialPriceOnProductPage $specialPrice,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $this->processAssertPrice($product, $catalogProductView, $specialPrice, $browser);
     }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
index 754ddefe062..34227d6bb34 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertTierPriceOnGroupedProductPage
@@ -40,14 +40,14 @@ class AssertTierPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedPr
      * @param CatalogProductView $catalogProductView
      * @param GroupedProductInjectable $product
      * @param AssertProductTierPriceOnProductPage $tierPrice
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         GroupedProductInjectable $product,
         AssertProductTierPriceOnProductPage $tierPrice,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $this->processAssertPrice($product, $catalogProductView, $tierPrice, $browser, 'Tier');
     }
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
index 7c1ef5d2132..08082461300 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Block\Adminhtml\Integration;
 use Magento\Backend\Test\Block\Widget\Grid;
 use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\ResourcesPopup;
 use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\TokensPopup;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class IntegrationGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
index 22f2c6759f7..b224fa7400a 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
@@ -6,7 +6,7 @@
 namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class DeleteDialog
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
index c9a12c6efa6..38b550424f7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
index b54f2bfdc8b..e16a924b27c 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
@@ -6,8 +6,7 @@
 namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Newsletter template preview.
@@ -44,6 +43,7 @@ class Preview extends Block
             }
         );
         $this->browser->switchToFrame(new Locator($this->iFrame));
+
         return $this->_rootElement->getText();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index 358d9577e58..672fd95eca5 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -7,7 +7,7 @@ namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplatePreview;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -23,12 +23,12 @@ class AssertNewsletterPreview extends AbstractConstraint
     /**
      * Assert that newsletter preview opened in new window and template content correct
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param TemplatePreview $templatePreview
      * @param Template $newsletter
      * @return void
      */
-    public function processAssert(Browser $browser, TemplatePreview $templatePreview, Template $newsletter)
+    public function processAssert(BrowserInterfaceInterface $browser, TemplatePreview $templatePreview, Template $newsletter)
     {
         $browser->selectWindow();
         $content = $templatePreview->getContent()->getPageContent();
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
index c5bd1a26c30..cb79956071e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml\Customer;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\ObjectManager;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
index 396c165cdeb..1c46add92e1 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml\Customer\Totals;
 
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Grid
@@ -61,7 +61,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      * @param array $filter
      * @param bool $isSearchable
      * @param bool $isStrict
-     * @return Element
+     * @return SimpleElement
      */
     protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
index 921d370a7d7..3b712dea80e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
@@ -6,7 +6,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Refresh\Statistics;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
index ffadaf4616c..1afe99ad70a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
@@ -7,7 +7,7 @@ namespace Magento\Reports\Test\Block\Adminhtml\Review\Customer;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
index 029ccae33c5..2387866ad4a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
@@ -6,7 +6,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Review\Products;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
index c73325a9094..aefdfd58de6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
@@ -6,7 +6,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class ProductGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
index 5bafdea1d0a..feb84e74997 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
@@ -6,7 +6,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class FilterGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
index 98cb448b404..330caecb1b0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -6,7 +6,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Shopcart\Product;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index a7acfcfb81d..b4c40b42d13 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -5,11 +5,11 @@
 
 namespace Magento\Reports\Test\TestCase;
 
-use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Browser;
-use Mtf\Fixture\FixtureFactory;
 use Mtf\TestCase\Injectable;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Client\BrowserInterface;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
 
 /**
  * Test Flow:
@@ -42,7 +42,7 @@ class AbandonedCartsReportEntityTest extends Injectable
     /**
      * Browser interface.
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -56,13 +56,13 @@ class AbandonedCartsReportEntityTest extends Injectable
     /**
      * Inject pages.
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @param CatalogProductView $catalogProductView
      * @return void
      */
     public function __inject(
-        Browser $browser,
+        BrowserInterface $browser,
         FixtureFactory $fixtureFactory,
         CatalogProductView $catalogProductView
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
index 435c74a48f3..49e2ac22f18 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
@@ -14,7 +14,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
 use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\TestCase\Injectable;
 
@@ -130,7 +130,7 @@ class CustomerReviewReportEntityTest extends Injectable
      * @param CustomerInjectable $customer
      * @param $customerLogin
      * @param CatalogProductSimple $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return array
      *
      * @SuppressWarnings(PHPMD.ConstructorWithNameAsEnclosingClass)
@@ -139,7 +139,7 @@ class CustomerReviewReportEntityTest extends Injectable
         ReviewInjectable $review,
         CustomerInjectable $customer,
         CatalogProductSimple $product,
-        Browser $browser,
+        BrowserInterface $browser,
         $customerLogin
     ) {
         // Preconditions
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
index e4f96cb9aec..582a6a56c8a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
@@ -11,7 +11,7 @@ use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestCase\Injectable;
 
 /**
@@ -103,14 +103,14 @@ class ProductsInCartReportEntity extends Injectable
      * @param CustomerInjectable $customer
      * @param CatalogProductSimple $product
      * @param string $isGuest
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function test(
         CustomerInjectable $customer,
         CatalogProductSimple $product,
         $isGuest,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         // Preconditions
         $product->persist();
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
index d9e2df96f8e..e8c0a729a0e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Reports\Test\TestCase;
 
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestCase\Injectable;
 use Mtf\Fixture\FixtureFactory;
 use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
@@ -49,7 +49,7 @@ class ViewedProductsReportEntityTest extends Injectable
     /**
      * Browser interface
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -70,13 +70,13 @@ class ViewedProductsReportEntityTest extends Injectable
      *
      * @param ProductReportView $productReportView
      * @param FixtureFactory $fixtureFactory
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function __inject(
         ProductReportView $productReportView,
         FixtureFactory $fixtureFactory,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $this->productReportView = $productReportView;
         $this->fixtureFactory = $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
index 6585317e10d..863ef47a040 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
@@ -5,14 +5,14 @@
 
 namespace Magento\Review\Test\Block\Adminhtml\Edit;
 
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class RatingElement
  * Rating typified element
  */
-class RatingElement extends Element
+class RatingElement extends SimpleElement
 {
     /**
      * Rating selector
@@ -52,10 +52,10 @@ class RatingElement extends Element
     /**
      * Get rating vote
      *
-     * @param Element $rating
+     * @param SimpleElement $rating
      * @return int
      */
-    protected function getRatingVote(Element $rating)
+    protected function getRatingVote(SimpleElement $rating)
     {
         $ratingVote = 5;
         $ratingVoteElement = $rating->find(sprintf($this->checkedRating, $ratingVote));
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
index 7250e443471..a23d0a881fd 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
@@ -6,7 +6,8 @@
 namespace Magento\Review\Test\Block\Adminhtml;
 
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\Locator;
+use Magento\Review\Test\Fixture\ReviewInjectable;
+use Mtf\Client\Locator;
 
 /**
  * Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
index b4b2377eb45..06418c860f0 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
@@ -5,12 +5,12 @@
 
 namespace Magento\Review\Test\Block;
 
+use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Fixture\ReviewInjectable;
 use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
-use Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Form
@@ -59,7 +59,7 @@ class Form extends AbstractForm
     /**
      * Get legend
      *
-     * @return Element
+     * @return SimpleElement
      */
     public function getLegend()
     {
@@ -81,7 +81,7 @@ class Form extends AbstractForm
      * Get single product rating
      *
      * @param Rating $rating
-     * @return Element
+     * @return SimpleElement
      */
     protected function getRating(Rating $rating)
     {
@@ -92,10 +92,10 @@ class Form extends AbstractForm
      * Fill the review form
      *
      * @param FixtureInterface $review
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $review, Element $element = null)
+    public function fill(FixtureInterface $review, SimpleElement $element = null)
     {
         if ($review instanceof ReviewInjectable) {
             $this->fillRatings($review);
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
index 8119fbc553e..1b9d8e9ea5e 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
@@ -31,7 +31,7 @@ class Summary extends Block
     /**
      * Get add review link
      *
-     * @return \Mtf\Client\Element
+     * @return \Mtf\Client\ElementInterface
      */
     public function getAddReviewLink()
     {
@@ -41,7 +41,7 @@ class Summary extends Block
     /**
      * Get view review link
      *
-     * @return \Mtf\Client\Element
+     * @return \Mtf\Client\ElementInterface
      */
     public function getViewReviewLink()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
index 66b26ef9c4d..83de8b98aec 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -26,7 +26,7 @@ class AssertProductRatingInProductPage extends AbstractConstraint
      * Assert that product rating is displayed on product review(frontend)
      *
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductSimple $product
      * @param ReviewInjectable|null $review [optional]
      * @param Rating|null $productRating [optional]
@@ -34,7 +34,7 @@ class AssertProductRatingInProductPage extends AbstractConstraint
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductSimple $product,
         ReviewInjectable $review = null,
         Rating $productRating = null
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
index 43c3cf191fc..40967102fd4 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Rating;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -26,14 +26,14 @@ class AssertProductRatingNotInProductPage extends AbstractConstraint
      * @param CatalogProductView $catalogProductView
      * @param CatalogProductSimple $product
      * @param Rating $productRating
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         CatalogProductSimple $product,
         Rating $productRating,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getReviewSummary()->getAddReviewLink()->click();
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
index e5a3ae3b556..142374c6035 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -26,13 +26,13 @@ class AssertProductReviewNotOnProductPage extends AbstractConstraint
      *
      * @param CatalogProductView $catalogProductView
      * @param ReviewInjectable $reviewInitial
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         CatalogProductView $catalogProductView,
         ReviewInjectable $reviewInitial,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         /** @var CatalogProductSimple $product */
         $product = $reviewInitial->getDataFieldConfig('entity_id')['source']->getEntity();
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
index 7ff7a616b38..32b18bfb0d3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\AdminCache;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureInterface;
 
@@ -28,7 +28,7 @@ class AssertProductReviewOnProductPage extends AbstractConstraint
      * @param CatalogProductView $catalogProductView
      * @param ReviewInjectable $review
      * @param FixtureInterface $product
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param AdminCache $cachePage
      * @return void
      */
@@ -36,7 +36,7 @@ class AssertProductReviewOnProductPage extends AbstractConstraint
         CatalogProductView $catalogProductView,
         ReviewInjectable $review,
         FixtureInterface $product,
-        Browser $browser,
+        BrowserInterface $browser,
         AdminCache $cachePage
     ) {
         $errors = [];
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
index 12ec277c3c2..a165ef3afb3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\ReviewInjectable;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestCase\Injectable;
 
 /**
@@ -84,10 +84,10 @@ class CreateProductReviewFrontendEntityTest extends Injectable
      * Run create frontend product rating test
      *
      * @param ReviewInjectable $review
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return array
      */
-    public function test(ReviewInjectable $review, Browser $browser)
+    public function test(ReviewInjectable $review, BrowserInterface $browser)
     {
         // Prepare for tear down
         $this->review = $review;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index a9d4b383b48..7e919271975 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -16,7 +16,7 @@ use Magento\Review\Test\Fixture\ReviewInjectable;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestCase\Injectable;
 
 /**
@@ -77,7 +77,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
     /**
      * Browser
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -136,7 +136,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
      * @param CmsIndex $cmsIndex
      * @param CustomerAccountLogin $customerAccountLogin
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param RatingIndex $ratingIndex
      * @param RatingEdit $ratingEdit
      * @param ReviewEdit $reviewEdit
@@ -148,7 +148,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
         CmsIndex $cmsIndex,
         CustomerAccountLogin $customerAccountLogin,
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         RatingIndex $ratingIndex,
         RatingEdit $ratingEdit,
         ReviewEdit $reviewEdit
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index 355bdef0c47..f8611a4aa54 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -80,7 +80,6 @@ abstract class AbstractForm extends Form
                 return $element->isVisible() == false ? true : null;
             }
         );
-        $this->reinitRootElement();
         $this->_rootElement->find($this->send)->click();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
index 01a9b4193dd..b5c9afd578f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
@@ -76,7 +76,7 @@ class AbstractItems extends Block
      */
     public function getData()
     {
-        $items = $this->_rootElement->find($this->rowItem)->getElements();
+        $items = $this->_rootElement->getElements($this->rowItem);
         $data = [];
 
         foreach ($items as $item) {
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 db1389a9782..974007ed963 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
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Actions
@@ -170,7 +170,7 @@ class Actions extends Block
     public function cancel()
     {
         $this->_rootElement->find($this->cancel)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->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 0c8c21a0b15..e8aa16e7999 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
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Fixture\FixtureInterface;
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
index 4dc59b14faa..d00ba7fb8e1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -28,7 +28,6 @@ class Address extends Form
      */
     public function getExistingAddresses()
     {
-        $this->reinitRootElement();
         return explode("\n", $this->_rootElement->find($this->existingAddressSelector)->getText());
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
index 058fde4a1e2..99889f11edb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
@@ -12,7 +12,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\R
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedProducts;
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\ShoppingCartItems;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class CustomerActivities
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
index d7d83760d20..14db7399d36 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Sidebar block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
index 83b59a91c1e..688bb3acc43 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class RecentlyViewedProducts
@@ -29,8 +29,7 @@ class RecentlyViewedProducts extends Sidebar
     public function getProducts()
     {
         $products = [];
-        $productNames = $this->_rootElement->find($this->recentlyViewedProducts, Locator::SELECTOR_XPATH)
-            ->getElements();
+        $productNames = $this->_rootElement->getElements($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
         foreach ($productNames as $productName) {
             $products[] = $productName->getText();
         }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index 2d889637127..a4b3464672e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,7 +7,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Backend\Test\Block\Template;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Items
@@ -85,7 +85,7 @@ class Items extends Block
     {
         $this->getTemplateBlock()->waitLoader();
         $this->_rootElement->click();
-        $products = $this->_rootElement->find($this->productNames, Locator::SELECTOR_XPATH)->getElements();
+        $products = $this->_rootElement->getElements($this->productNames, Locator::SELECTOR_XPATH);
         $pageData = [];
         foreach ($products as $product) {
             $pageData[] = $this->getItemProductByName($product->getText())->getCheckoutData($fields);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 744fb440f50..144cd59d008 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
index faae41bd8ea..3e20ee2c511 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class ShippingAddress
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index bed696e4896..efa4e1f6c40 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
index b071383601c..a5d852c5016 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Store\Test\Fixture\Store as StoreFixture;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index d3bd69d03a0..5a1c8b5224a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Grid
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 ae9f6ab845d..4228e1293c1 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
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
index b15ef482eee..9cdceee8c28 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
@@ -7,7 +7,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\AbstractItemsNewBlock;
 use Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items\Product;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 32f2d54254c..8dfe350a401 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Totals
@@ -44,7 +44,6 @@ class Totals extends Block
                 return $element->isVisible() == false ? true : null;
             }
         );
-        $this->reinitRootElement();
         $this->_rootElement->find($this->submit)->click();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
index 60ccef39c5f..74e89c16561 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
@@ -20,7 +20,7 @@ class Items extends AbstractItems
      */
     public function getData()
     {
-        $items = $this->_rootElement->find($this->rowItem)->getElements();
+        $items = $this->_rootElement->getElements($this->rowItem);
         $data = [];
 
         foreach ($items as $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index cff130c94a3..4239579837f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
index e8725e61a85..3cff8925271 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Block for information about customer on order page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index d70210c7c11..0dc8b98c44b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
 use Magento\Catalog\Test\Fixture\Product;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
index e5d47c46f29..b4d1bd10f25 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
@@ -57,7 +57,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     public function getIds()
     {
         $result = [];
-        $creditMemoIds = $this->_rootElement->find($this->editLink)->getElements();
+        $creditMemoIds = $this->_rootElement->getElements($this->editLink);
         foreach ($creditMemoIds as $creditMemoId) {
             $result[] = trim($creditMemoId->getText());
         }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
index a5459ff0ce0..6e6e17c3d97 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
index 7ee52474297..388510706b2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
@@ -54,7 +54,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     public function getIds()
     {
         $result = [];
-        $invoiceIds = $this->_rootElement->find($this->invoiceId)->getElements();
+        $invoiceIds = $this->_rootElement->getElements($this->invoiceId);
         foreach ($invoiceIds as $invoiceId) {
             $result[] = trim($invoiceId->getText());
         }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
index 12bcde191e6..fc5a9c6366a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
@@ -50,7 +50,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     public function getIds()
     {
         $result = [];
-        $shipmentIds = $this->_rootElement->find($this->shipmentId)->getElements();
+        $shipmentIds = $this->_rootElement->getElements($this->shipmentId);
         foreach ($shipmentIds as $shipmentId) {
             $result[] = trim($shipmentId->getText());
         }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
index 76ffd9ad785..af39f2b64cc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
@@ -6,8 +6,8 @@
 namespace Magento\Sales\Test\Block\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class History
@@ -72,7 +72,7 @@ class History extends Block
      * Get item order block
      *
      * @param string $id
-     * @return Element
+     * @return SimpleElement
      */
     protected function searchOrderById($id)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
index 2f578aac400..900b2249590 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
index 691b21979b8..02a4e2425d1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Items block on order's view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index cb7a16398d8..45f13dacfcf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Order;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
index d1e49fb25fa..899dc507f6a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\Block\Order\View;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Order view block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
index d47c284c7fb..9136e846e5e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Sales\Test\Page;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Factory\Factory;
 use Mtf\Page\Page;
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
index bb676a6c7fd..b53d71f4edf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\SalesGuestView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestStep\TestStepInterface;
 
 /**
@@ -24,16 +24,16 @@ class PrintOrderOnFrontendStep implements TestStepInterface
     /**
      * Browser.
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
     /**
      * @constructor
      * @param SalesGuestView $salesGuestView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      */
-    public function __construct(SalesGuestView $salesGuestView, Browser $browser)
+    public function __construct(SalesGuestView $salesGuestView, BrowserInterface $browser)
     {
         $this->salesGuestView = $salesGuestView;
         $this->browser = $browser;
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
index 5aaa2682c37..6733e1699ee 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
@@ -7,7 +7,7 @@ namespace Magento\Shipping\Test\Block\Adminhtml\Order;
 
 use Magento\Shipping\Test\Block\Adminhtml\Order\Tracking\Item;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Tracking
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
index 049b96d3666..4f5bff3dae7 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Shipping\Test\Block\Order;
 
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
index ac87a3c3b66..2a63e5b2341 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
@@ -7,7 +7,7 @@ namespace Magento\Shipping\Test\Block\Order;
 
 use Magento\Shipping\Test\Block\Order\Shipment\Items;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Shipment
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
index 0cb9bd130ed..325074d5586 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
@@ -6,7 +6,7 @@
 namespace Magento\Sitemap\Test\Block\Adminhtml;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class SitemapGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
index 4f33449b391..64d64669cfa 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Block;
 
 use Magento\Store\Test\Fixture\Store;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Switcher
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
index 52611d0de6f..11b2c6b6d4f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -5,11 +5,11 @@
 
 namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
 
+use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
 use Magento\Tax\Test\Fixture\TaxRule;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Block\Form as FormInterface;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
-use Mtf\Fixture\FixtureInterface;
 
 /**
  * Form for tax rule creation.
@@ -111,12 +111,12 @@ class Form extends FormInterface
      * Fill the root form.
      *
      * @param FixtureInterface $fixture
-     * @param Element $element
+     * @param SimpleElement $element
      * @return $this|void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function fill(FixtureInterface $fixture, Element $element = null)
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         $this->openAdditionalSettings();
         $this->_rootElement->click();
@@ -161,14 +161,12 @@ class Form extends FormInterface
         $taxRateDefaultMultiSelect = $this->taxRateDefaultMultiSelect;
         $this->browser->waitUntil(
             function () use ($rootForm, $taxRateDefaultMultiSelect) {
-                $rootForm->reinitRootElement();
                 $element = $rootForm->browser->find($taxRateDefaultMultiSelect);
                 return $element->isVisible() ? null : true;
             }
         );
         $this->browser->waitUntil(
             function () use ($rootForm, $taxRateMultiSelectList) {
-                $rootForm->reinitRootElement();
                 $element = $rootForm->browser->find($taxRateMultiSelectList);
                 return $element->isVisible() ? true : null;
             }
@@ -205,10 +203,10 @@ class Form extends FormInterface
      * Method to add new tax classes.
      *
      * @param array $taxClasses
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    protected function addNewTaxClass(array $taxClasses, Element $element)
+    protected function addNewTaxClass(array $taxClasses, SimpleElement $element)
     {
         foreach ($taxClasses as $taxClass) {
             $option = $element->find(sprintf($this->optionMaskElement, $taxClass), Locator::SELECTOR_XPATH);
@@ -231,7 +229,7 @@ class Form extends FormInterface
     /**
      * Waiting until option in list is visible.
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @param string $value
      * @return void
      */
@@ -277,18 +275,19 @@ class Form extends FormInterface
                 return $element->isVisible() ? true : null;
             }
         );
-        /** @var \Mtf\Client\Driver\Selenium\Element\MultiselectlistElement $taxRates */
+        /** @var \Mtf\Client\Element\MultiselectlistElement $taxRates */
         $taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
+
         return $taxRates->getAllValues();
     }
 
     /**
      * Click 'Add New' button.
      *
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    protected function clickAddNewButton(Element $element)
+    protected function clickAddNewButton(SimpleElement $element)
     {
         $addNewButton = $this->addNewButton;
         $element->waitUntil(
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
index 3786d6dc57a..696adc3777b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
@@ -6,7 +6,6 @@
 namespace Magento\Tax\Test\Block\Adminhtml\Rule;
 
 use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
index 170a2c34669..a101ed634dc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
@@ -13,7 +13,7 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\FixtureFactory;
 
@@ -88,7 +88,7 @@ abstract class AssertTaxRuleApplying extends AbstractConstraint
      * @param CheckoutCart $checkoutCart
      * @param AddressInjectable $address
      * @param array $shipping
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param TaxRule $initialTaxRule
      * @return void
      *
@@ -104,7 +104,7 @@ abstract class AssertTaxRuleApplying extends AbstractConstraint
         CheckoutCart $checkoutCart,
         AddressInjectable $address,
         array $shipping,
-        Browser $browser,
+        BrowserInterface $browser,
         TaxRule $initialTaxRule = null
     ) {
         $this->initialTaxRule = $initialTaxRule;
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
index fc56ae562a3..30b790cc149 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Theme\Test\Block\Html;
 
-use Magento\Store\Test\Fixture\Store;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Store\Test\Fixture\Store;
 
 /**
  * Footer block
@@ -55,7 +55,7 @@ class Footer extends Block
      * Click on link by name
      *
      * @param string $linkName
-     * @return \Mtf\Client\Element
+     * @return void
      * @throws \Exception
      */
     public function clickLink($linkName)
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
index 0c15938cf24..10d3935eae4 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
@@ -7,7 +7,7 @@
 namespace Magento\Theme\Test\Block\Html;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Topmenu
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
index 94177d4a9d4..8c33704ac5c 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
@@ -7,7 +7,7 @@
 namespace Magento\Theme\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Page Top Links block.
@@ -78,7 +78,10 @@ class Links extends Block
      */
     public function getLinkUrl($linkTitle)
     {
-        return trim($this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)->getUrl());
+        $link = $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)
+            ->getAttribute('href');
+
+        return trim($link);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
index a5b6b384f4a..e92678021b6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Tree
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
index 324170dfc11..2a05d905b25 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
@@ -6,6 +6,7 @@
 namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Edit;
 
 use Magento\Backend\Test\Block\Widget\Form;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Element;
 use Mtf\Fixture\FixtureInterface;
 
@@ -19,13 +20,13 @@ class UrlRewriteForm extends Form
      * Fill the root form
      *
      * @param FixtureInterface $fixture
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @param array $replace [optional]
      * @return $this
      */
     public function fill(
         FixtureInterface $fixture,
-        Element $element = null,
+        SimpleElement $element = null,
         array $replace = []
     ) {
         $data = $fixture->getData();
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
index 37fc083a8ff..bd5f814a766 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
@@ -7,7 +7,7 @@
 namespace Magento\UrlRewrite\Test\Block\Adminhtml;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Selector
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
index 69b9f49957a..b186be3c9b1 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -28,13 +28,13 @@ class AssertPageByUrlRewriteIsNotFound extends AbstractConstraint
     /**
      * Checking the server response 404 page on frontend
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogProductView $catalogProductView
      * @param UrlRewrite $productRedirect
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         UrlRewrite $productRedirect
     ) {
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
index 6c728817a9e..a35b2663c74 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,13 +25,13 @@ class AssertUrlRewriteCategoryRedirect extends AbstractConstraint
      *
      * @param UrlRewrite $urlRewrite
      * @param CatalogCategory $category
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         UrlRewrite $urlRewrite,
         CatalogCategory $category,
-        Browser $browser
+        BrowserInterface $browser
     ) {
         $browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
         $url = $urlRewrite->getRedirectType() == 'No'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
index 77667006006..409996f29d4 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -24,11 +24,11 @@ class AssertUrlRewriteCustomRedirect extends AbstractConstraint
      * Assert check URL rewrite custom redirect
      *
      * @param UrlRewrite $urlRewrite
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CmsIndex $cmsIndex
      * @return void
      */
-    public function processAssert(UrlRewrite $urlRewrite, Browser $browser, CmsIndex $cmsIndex)
+    public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser, CmsIndex $cmsIndex)
     {
         $browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
         $entity = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
index 6f5fdaf774d..75933802c05 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -25,14 +25,14 @@ class AssertUrlRewriteCustomSearchRedirect extends AbstractConstraint
      *
      * @param UrlRewrite $initialRewrite
      * @param UrlRewrite $urlRewrite
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CatalogCategoryView $categoryView
      * @return void
      */
     public function processAssert(
         UrlRewrite $initialRewrite,
         UrlRewrite $urlRewrite,
-        Browser $browser,
+        BrowserInterface $browser,
         CatalogCategoryView $categoryView
     ) {
         $urlRequestPath = $urlRewrite->hasData('request_path')
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
index 51ca53f93fa..cceda044f18 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
 
@@ -26,14 +26,14 @@ class AssertUrlRewriteProductRedirect extends AbstractConstraint
      *
      * @param UrlRewrite $urlRewrite
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param InjectableFixture $product
      * @return void
      */
     public function processAssert(
         UrlRewrite $urlRewrite,
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         InjectableFixture $product = null
     ) {
         $browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
index a8189399e2a..14bf49ad4b9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
@@ -6,7 +6,7 @@
 namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -23,11 +23,11 @@ class AssertUrlRewriteSuccessOutsideRedirect extends AbstractConstraint
      * Assert that outside redirect was success
      *
      * @param UrlRewrite $urlRewrite
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param UrlRewrite|null $initialRewrite [optional]
      * @return void
      */
-    public function processAssert(UrlRewrite $urlRewrite, Browser $browser, UrlRewrite $initialRewrite = null)
+    public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser, UrlRewrite $initialRewrite = null)
     {
         $urlRequestPath = $urlRewrite->hasData('request_path')
             ? $urlRewrite->getRequestPath()
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
index 5cbfc9c6e8c..8bba90dad82 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
@@ -6,7 +6,7 @@
 namespace Magento\User\Test\Block\Adminhtml\Role\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Role
@@ -18,10 +18,10 @@ class Role extends Tab
      * Fills username in user grid
      *
      * @param array $fields
-     * @param Element $element
+     * @param SimpleElement $element
      * @return void
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $users = (is_array($fields['in_role_users']['value']))
             ? $fields['in_role_users']['value']
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
index 4cfc5687751..1ff00d65808 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Block\Adminhtml\User\Edit;
 use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\User\Test\Block\Adminhtml\User\Edit\Tab\Roles;
 use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
index 4fcbaa14b88..06a446a2363 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
@@ -28,6 +28,6 @@ class PageActions extends FormPageActions
     public function forceSignIn()
     {
         $this->_rootElement->find($this->forceSignIn)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
index 4ef09d1a951..f14a6c4d75a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
@@ -5,9 +5,8 @@
 
 namespace Magento\User\Test\Block\Adminhtml\User\Tab;
 
+use Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid;
-use Mtf\Client\Element;
 
 /**
  * Class Role
@@ -19,10 +18,10 @@ class Role extends Tab
      * Fill user options
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return void
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $this->getRoleGrid()->searchAndSelect(['rolename' => $fields['role_id']['value']]);
     }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
index d947cfed1e5..30f0a81ab62 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
@@ -5,9 +5,9 @@
 
 namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab;
 
+use Mtf\Client\Element;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
-use Mtf\Client\Element;
 
 /**
  * Class Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index c2374e20b52..a5e9feda999 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -5,8 +5,8 @@
 
 namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist;
 
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Grid
@@ -57,7 +57,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     protected function delete()
     {
         $this->_rootElement->find($this->rowItem . ' ' . $this->deleteLink)->click();
-        $this->_rootElement->acceptAlert();
+        $this->browser->acceptAlert();
     }
 
     /**
@@ -90,7 +90,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      * @param array $filter
      * @param bool $isSearchable [optional]
      * @param bool $isStrict [optional]
-     * @return Element
+     * @return SimpleElement
      */
     protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
     {
@@ -118,7 +118,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
                 );
             }
         }
-        $location = $location . implode(' and ', $rows) . ']';
-        return $this->_rootElement->find($location, Locator::SELECTOR_XPATH);
+
+        return $this->_rootElement->find($location . implode(' and ', $rows) . ']', Locator::SELECTOR_XPATH);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
index 3d5383c239e..98324f97b67 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
@@ -7,8 +7,7 @@ namespace Magento\Wishlist\Test\Block\Customer\Wishlist;
 
 use Magento\Wishlist\Test\Block\Customer\Wishlist\Items\Product;
 use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 use Mtf\Fixture\FixtureInterface;
 
 /**
@@ -55,7 +54,6 @@ class Items extends Block
     {
         while ($this->_rootElement->find($this->remove)->isVisible()) {
             $this->_rootElement->find($this->remove)->click();
-            $this->reinitRootElement();
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index 044b55a6aac..bdff557c864 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -6,7 +6,7 @@
 namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Class Product
@@ -113,8 +113,8 @@ class Product extends Form
         if ($viewDetails->isVisible()) {
             $this->_rootElement->find($this->footer, Locator::SELECTOR_XPATH)->click();
             $viewDetails->click();
-            $labels = $this->_rootElement->find($this->optionLabel)->getElements();
-            $values = $this->_rootElement->find($this->optionValue)->getElements();
+            $labels = $this->_rootElement->getElements($this->optionLabel);
+            $values = $this->_rootElement->getElements($this->optionValue);
             $data = [];
             foreach ($labels as $key => $label) {
                 if (!$label->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
index 8c83fe2fff1..ce6d1d7e8cb 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
@@ -14,7 +14,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Wishlist\Test\Page\WishlistIndex;
 use Magento\Wishlist\Test\Page\WishlistShare;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestCase\Injectable;
 
 /**
@@ -143,14 +143,14 @@ class ShareWishlistEntityTest extends Injectable
     /**
      * Share wish list
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param CustomerInjectable $customer
      * @param CatalogProductSimple $product
      * @param array $sharingInfo
      * @return void
      */
     public function test(
-        Browser $browser,
+        BrowserInterface $browser,
         CustomerInjectable $customer,
         CatalogProductSimple $product,
         array $sharingInfo
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
index ccbbe7581ef..6899edd352e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
@@ -6,7 +6,7 @@
 namespace Magento\Wishlist\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\TestStep\TestStepInterface;
 
 /**
@@ -32,7 +32,7 @@ class AddProductsToWishlistStep implements TestStepInterface
     /**
      * Interface Browser
      *
-     * @var Browser
+     * @var BrowserInterface
      */
     protected $browser;
 
@@ -46,13 +46,13 @@ class AddProductsToWishlistStep implements TestStepInterface
     /**
      * @constructor
      * @param CatalogProductView $catalogProductView
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param array $products
      * @param bool $configure [optional]
      */
     public function __construct(
         CatalogProductView $catalogProductView,
-        Browser $browser,
+        BrowserInterface $browser,
         array $products,
         $configure = false
     ) {
-- 
GitLab


From c40a50a74b1c6cfafd59db79da1c42e88589f0c7 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Fri, 2 Jan 2015 13:03:59 +0200
Subject: [PATCH 024/101] MAGETWO-32079: Alternative WebDriver support

---
 .../tests/app/Magento/Install/Test/Block/CreateAdmin.php        | 2 +-
 .../tests/app/Magento/Install/Test/Block/CustomizeStore.php     | 2 +-
 .../tests/app/Magento/Install/Test/Block/Database.php           | 2 +-
 .../functional/tests/app/Magento/Install/Test/Block/Install.php | 2 +-
 .../functional/tests/app/Magento/Install/Test/Block/Landing.php | 2 +-
 .../functional/tests/app/Magento/Install/Test/Block/License.php | 2 +-
 .../tests/app/Magento/Install/Test/Block/Readiness.php          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
index cd025b734f7..2b18c9ca7a1 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Create Admin Account block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
index af5707450b5..5cb44776e60 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Customize Your Store block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
index 8d5919a7ec9..9dc1134f166 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Database form.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index 8df7ca8d6c0..39b6d49f624 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Install block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
index 75085d53c75..26c35a82efd 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Landing block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
index 83f59f7159d..da693a2f49d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * License block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
index 72fcfcb1aa2..3c493234b64 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
@@ -6,7 +6,7 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
 
 /**
  * Readiness block.
-- 
GitLab


From d1ab21fc7956073d4e86eb6db970d8c0d0835b6b Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Fri, 2 Jan 2015 15:48:54 +0200
Subject: [PATCH 025/101] MAGETWO-32079: Alternative WebDriver support

---
 .../tests/app/Magento/Install/Test/Block/Install.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index 39b6d49f624..26167d2d058 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -60,9 +60,9 @@ class Install extends Block
     public function getAdminInfo()
     {
         $adminData = [];
-        $rows = $this->_rootElement->find('#admin-info .row')->getElements();
+        $rows = $this->_rootElement->getElements('#admin-info .row');
         foreach ($rows as $row) {
-            $dataRow = $row->find('div')->getElements();
+            $dataRow = $row->getElements('div');
             $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
             $adminData[$key] = $dataRow[1]->getText();
         }
@@ -78,9 +78,9 @@ class Install extends Block
     public function getDbInfo()
     {
         $dbData = [];
-        $rows = $this->_rootElement->find('#db-info .row')->getElements();
+        $rows = $this->_rootElement->getElements('#db-info .row');
         foreach ($rows as $row) {
-            $dataRow = $row->find('div')->getElements();
+            $dataRow = $row->getElements('div');
             $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
             $dbData[$key] = $dataRow[1]->getText();
         }
-- 
GitLab


From 74ab06e72c0c58cca0a5fdb15fe087fa57cb0dfc Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Mon, 5 Jan 2015 14:34:15 -0600
Subject: [PATCH 026/101] MAGETWO-28380: Totals taxes sorting is different on
 order/invoice/refund create and view pages

 - updated per code review
---
 app/code/Magento/Tax/Helper/Data.php           | 18 +++++-------------
 .../testsuite/Magento/Tax/Helper/DataTest.php  |  6 ++----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index a30fc64cc96..f6660d68d44 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -682,23 +682,17 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *      'tax_amount'        => $taxAmount,
      *      'base_tax_amount'   => $baseTaxAmount,
      *      'title'             => $title,
-     *      'percent'           => $percent,
-     *      'type'              => $type
+     *      'percent'           => $percent
      *  )
      * )
      *
      * @param  array                        $taxClassAmount
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
      * @param  float                        $ratio
-     * @param  string                       $type
      * @return array
      */
-    private function _aggregateTaxes(
-        $taxClassAmount,
-        OrderTaxDetailsItemInterface $itemTaxDetail,
-        $ratio,
-        $type = 'product'
-    ) {
+    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
             $taxAmount = $itemAppliedTax->getAmount() * $ratio;
@@ -711,7 +705,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
             if (!isset($taxClassAmount[$taxCode])) {
                 $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
                 $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
-                $taxClassAmount[$taxCode]['type'] = $type;
                 $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
                 $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
             } else {
@@ -835,7 +828,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
         }
 
         // Apply any taxes for shipping
-        $shippingType = \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING;
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
         if ($shippingTaxAmount && $originalShippingTaxAmount &&
@@ -846,9 +838,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
             $itemTaxDetails = $orderTaxDetails->getItems();
             foreach ($itemTaxDetails as $itemTaxDetail) {
                 //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == $shippingType) {
+                if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
                     $taxClassAmount =
-                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio, $shippingType);
+                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
                 }
             }
         }
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 6b01c6385e2..aabfe565bb7 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -301,7 +301,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
                         'percent' => 20.0,
                         'tax_amount' => 2.5,
                         'base_tax_amount' => 2.5,
-                        'type' => 'product',
                     ],
                 ],
             ],
@@ -363,11 +362,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
                         'percent' => 20.0,
                         'tax_amount' => 6.5,
                         'base_tax_amount' => 6.5,
-                        'type' => 'product',
                     ],
                 ],
             ],
             //Scenario 3: one item, with both shipping and product taxes
+            // note that 'shipping tax' is listed before 'product tax'
             'one_item_with_both_shipping_and_product_taxes' => [
                 'order' => [
                     'order_id' => 1,
@@ -418,20 +417,19 @@ class DataTest extends \PHPUnit_Framework_TestCase
                         ),
                     ],
                 ],
+                // note that 'shipping tax' is now listed after 'product tax'
                 'expected_results' => [
                     [
                         'title' => 'US-CA-Sales-Tax',
                         'percent' => 20.0,
                         'tax_amount' => 5.00,
                         'base_tax_amount' => 5.00,
-                        'type' => 'product',
                     ],
                     [
                         'title' => 'US-CA-Sales-Tax-Ship',
                         'percent' => 10.0,
                         'tax_amount' => 2.00,
                         'base_tax_amount' => 2.00,
-                        'type' => 'shipping',
                     ],
                 ],
             ],
-- 
GitLab


From efdfa434c1cc01fb412924fdddee63d861a14dca Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 6 Jan 2015 11:43:03 +0200
Subject: [PATCH 027/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- CR fixes
---
 ...axCalculationAfterCheckoutDownloadable.php |   2 +-
 ...axRuleIsAppliedToAllPricesDownloadable.php |   2 +-
 ...iedToAllPricesDownloadableExcludingTax.php |   2 +-
 ...iedToAllPricesDownloadableIncludingTax.php |   2 +-
 .../GroupPriceOptions.php                     |  11 +-
 .../DownloadableTaxCalculationTest.php        |   2 +-
 .../DownloadableTaxCalculationTest/test.csv   |  16 +-
 .../Adminhtml/Order/AbstractForm/Totals.php   | 210 ------------------
 .../Block/Adminhtml/Order/Invoice/Totals.php  |   2 +-
 .../Test/Block/Adminhtml/Order/Totals.php     | 204 ++++++++++++++++-
 .../AbstractAssertOrderTaxOnBackend.php       |  54 +++--
 ...tractAssertTaxCalculationAfterCheckout.php |  16 ++
 ...tractAssertTaxRuleIsAppliedToAllPrices.php |  25 +++
 ...OrderTaxOnBackendExcludingIncludingTax.php |   6 +-
 14 files changed, 294 insertions(+), 260 deletions(-)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index 7bc83be16a6..290600821df 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -16,7 +16,7 @@ use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
 /**
  * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
  */
-class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
+abstract class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
 {
     /**
      * Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index 6075d98c4c5..35da65f95f2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -16,7 +16,7 @@ use Mtf\Fixture\InjectableFixture;
 /**
  * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
  */
-class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
+abstract class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index d22ef997023..8845f254596 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -53,7 +53,7 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
     /**
      * Get totals.
      *
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getTotals($actualPrices)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 3c824099019..2ce8b695acb 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -21,7 +21,7 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
     /**
      * Get prices on category page.
      *
-     * @param $productName
+     * @param string $productName
      * @param array $actualPrices
      * @return array
      */
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index 14a1482d939..ef1024f4013 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -1,19 +1,12 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
 
 /**
- * Class GroupPriceOptions
- *
- * Data keys:
- *  - preset (Price options preset name)
- *  - products (comma separated sku identifiers)
+ * Group price options fixture for downloadable product
  */
 class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions
 {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index bc7d8f9327e..e9316abf81d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -8,7 +8,7 @@ namespace Magento\Downloadable\Test\TestCase;
 use Magento\Tax\Test\TestCase\TaxCalculationTest;
 
 /**
- * Test DownloadableTaxCalculationTest
+ * Test tax calculation with downloadable product.
  *
  * Test Flow:
  * Steps:
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
index b173ea5f5a2..c8778e2a9f0 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
@@ -1,17 +1,7 @@
 "description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"prices/category_price_excl_tax";"prices/category_price_incl_tax";"prices/product_view_price_excl_tax";"prices/product_view_price_incl_tax";"prices/cart_item_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_incl_tax";"prices/subtotal_excl_tax";"prices/subtotal_incl_tax";"prices/discount";"prices/shipping_excl_tax";"prices/shipping_incl_tax";"prices/tax";"prices/grand_total_excl_tax";"prices/grand_total_incl_tax";"constraint";"issue"
-"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_exin";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
 "Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
 "Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_exin";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
 "Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
-																						
-																						
-																						
-																						
-																						
-																						
-																						
-																						
-																						
-																						
+"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
deleted file mode 100644
index e1e57b8961f..00000000000
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
-
-use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
-
-/**
- * Invoice totals block
- */
-class Totals extends Block
-{
-    /**
-     * Grand total search mask
-     *
-     * @var string
-     */
-    protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
-
-    /**
-     * Grand total excluding tax search mask
-     *
-     * @var string
-     */
-    protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
-
-    /**
-     * Grand total including tax search mask
-     *
-     * @var string
-     */
-    protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
-
-    /**
-     * Subtotal search mask
-     *
-     * @var string
-     */
-    protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
-
-    /**
-     * Subtotal excluding tax search mask
-     *
-     * @var string
-     */
-    protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
-
-    /**
-     * Subtotal including tax search mask
-     *
-     * @var string
-     */
-    protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
-
-    /**
-     * Tax search mask
-     *
-     * @var string
-     */
-    protected $tax = '//tr[normalize-space(td)="Tax"]//span';
-
-    /**
-     * Discount search mask
-     *
-     * @var string
-     */
-    protected $discount = '//tr[normalize-space(td)="Discount"]//span';
-
-    /**
-     * Shipping excluding tax search mask
-     *
-     * @var string
-     */
-    protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
-
-    /**
-     * Shipping including tax search mask
-     *
-     * @var string
-     */
-    protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
-
-    /**
-     * Get Grand Total Text
-     *
-     * @return string
-     */
-    public function getGrandTotal()
-    {
-        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($grandTotal);
-    }
-
-    /**
-     * Get Grand Total Excluding Tax Text
-     *
-     * @return string
-     */
-    public function getGrandTotalExclTax()
-    {
-        $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($grandTotal);
-    }
-
-    /**
-     * Get Grand Total Including Tax Text
-     *
-     * @return string
-     */
-    public function getGrandTotalInclTax()
-    {
-        $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($grandTotal);
-    }
-
-    /**
-     * Get Tax text from Order Totals
-     *
-     * @return string
-     */
-    public function getTax()
-    {
-        $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($tax);
-    }
-
-    /**
-     * Get Tax text from Order Totals
-     *
-     * @return string|null
-     */
-    public function getDiscount()
-    {
-        $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
-        return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
-    }
-
-    /**
-     * Get Subtotal text
-     *
-     * @return string
-     */
-    public function getSubtotal()
-    {
-        $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($subTotal);
-    }
-
-    /**
-     * Get Subtotal text
-     *
-     * @return string
-     */
-    public function getSubtotalExclTax()
-    {
-        $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($subTotal);
-    }
-
-    /**
-     * Get Subtotal text
-     *
-     * @return string
-     */
-    public function getSubtotalInclTax()
-    {
-        $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
-        return $this->escapeCurrency($subTotal);
-    }
-
-    /**
-     * Get Shipping Excluding tax price text
-     *
-     * @return string|null
-     */
-    public function getShippingInclTax()
-    {
-        $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
-        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
-    }
-
-    /**
-     * Get Shipping Including tax price text
-     *
-     * @return string|null
-     */
-    public function getShippingExclTax()
-    {
-        $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
-        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
-    }
-
-    /**
-     * Method that escapes currency symbols
-     *
-     * @param string $price
-     * @return string|null
-     */
-    protected function escapeCurrency($price)
-    {
-        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
-        return (isset($matches[1])) ? $matches[1] : null;
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 819c75229fa..158a0f9abc0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -11,7 +11,7 @@ use Mtf\Client\Element\Locator;
  * Class Totals
  * Invoice totals block
  */
-class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\Totals
 {
     /**
      * Submit invoice button selector
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 88b5b445d3f..98d5718ae0f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -1,14 +1,210 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
 /**
- * Order totals block
+ * Invoice totals block
  */
-class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
+class Totals extends Block
 {
-    //
+    /**
+     * Grand total search mask.
+     *
+     * @var string
+     */
+    protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
+
+    /**
+     * Grand total excluding tax search mask.
+     *
+     * @var string
+     */
+    protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
+
+    /**
+     * Grand total including tax search mask.
+     *
+     * @var string
+     */
+    protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
+
+    /**
+     * Subtotal search mask.
+     *
+     * @var string
+     */
+    protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
+
+    /**
+     * Subtotal excluding tax search mask.
+     *
+     * @var string
+     */
+    protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
+
+    /**
+     * Subtotal including tax search mask.
+     *
+     * @var string
+     */
+    protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
+
+    /**
+     * Tax search mask.
+     *
+     * @var string
+     */
+    protected $tax = '//tr[normalize-space(td)="Tax"]//span';
+
+    /**
+     * Discount search mask.
+     *
+     * @var string
+     */
+    protected $discount = '//tr[normalize-space(td)="Discount"]//span';
+
+    /**
+     * Shipping excluding tax search mask.
+     *
+     * @var string
+     */
+    protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
+
+    /**
+     * Shipping including tax search mask.
+     *
+     * @var string
+     */
+    protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
+
+    /**
+     * Get Grand Total Text.
+     *
+     * @return string
+     */
+    public function getGrandTotal()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Grand Total Excluding Tax Text.
+     *
+     * @return string
+     */
+    public function getGrandTotalExclTax()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Grand Total Including Tax Text.
+     *
+     * @return string
+     */
+    public function getGrandTotalInclTax()
+    {
+        $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($grandTotal);
+    }
+
+    /**
+     * Get Tax text from Order Totals.
+     *
+     * @return string
+     */
+    public function getTax()
+    {
+        $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($tax);
+    }
+
+    /**
+     * Get Tax text from Order Totals.
+     *
+     * @return string|null
+     */
+    public function getDiscount()
+    {
+        $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
+        return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+    }
+
+    /**
+     * Get Subtotal text.
+     *
+     * @return string
+     */
+    public function getSubtotal()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text.
+     *
+     * @return string
+     */
+    public function getSubtotalExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Subtotal text.
+     *
+     * @return string
+     */
+    public function getSubtotalInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
+        return $this->escapeCurrency($subTotal);
+    }
+
+    /**
+     * Get Shipping Excluding tax price text.
+     *
+     * @return string|null
+     */
+    public function getShippingInclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Get Shipping Including tax price text.
+     *
+     * @return string|null
+     */
+    public function getShippingExclTax()
+    {
+        $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
+        return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+    }
+
+    /**
+     * Method that escapes currency symbols.
+     *
+     * @param string $price
+     * @return string|null
+     */
+    protected function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index aa48b9bf01c..b7c81790948 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -45,12 +45,36 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
      */
     protected $severeness = 'high';
 
+    /**
+     * Implementation assert
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getOrderTotals($actualPrices);
+
+    /**
+     * Implementation assert
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getInvoiceNewTotals($actualPrices);
+
+    /**
+     * Implementation getCreditMemoNewTotals
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getCreditMemoNewTotals($actualPrices);
+
     /**
      * Assert that specified prices are actual on order, invoice and refund pages.
      *
      * @param array $prices
      * @param InjectableFixture $product
-     * @param OrderIndex $orderIndex ,
+     * @param OrderIndex $orderIndex
      * @param OrderView $orderView
      * @param OrderInvoiceNew $orderInvoiceNew
      * @param OrderCreditMemoNew $orderCreditMemoNew
@@ -115,18 +139,18 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
      */
     protected function preparePrices($prices)
     {
-        if (isset($prices['category_price_excl_tax'])) {
-            unset($prices['category_price_excl_tax']);
-        }
-        if (isset($prices['category_price_incl_tax'])) {
-            unset($prices['category_price_incl_tax']);
-        }
-        if (isset($prices['product_view_price_excl_tax'])) {
-            unset($prices['product_view_price_excl_tax']);
-        }
-        if (isset($prices['product_view_price_incl_tax'])) {
-            unset($prices['product_view_price_incl_tax']);
+        $deletePrices = [
+            'category_price_excl_tax',
+            'category_price_incl_tax',
+            'product_view_price_excl_tax',
+            'product_view_price_incl_tax'
+        ];
+        foreach ($deletePrices as $key) {
+            if (array_key_exists($key, $prices)) {
+                unset($prices[$key]);
+            }
         }
+
         return $prices;
     }
 
@@ -147,7 +171,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
      * Get order product prices.
      *
      * @param InjectableFixture $product
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getOrderPrices($actualPrices, InjectableFixture $product)
@@ -164,7 +188,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
      * Get invoice new product prices.
      *
      * @param InjectableFixture $product
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getInvoiceNewPrices($actualPrices, InjectableFixture $product)
@@ -181,7 +205,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
      * Get Credit Memo new product prices.
      *
      * @param InjectableFixture $product
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getCreditMemoNewPrices($actualPrices, InjectableFixture $product)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index e83ccc15583..51c7b44bf0b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -39,6 +39,22 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
      */
     protected $severeness = 'high';
 
+    /**
+     * Implementation getReviewTotals
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getReviewTotals($actualPrices);
+
+    /**
+     * Implementation getOrderTotals
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getOrderTotals($actualPrices);
+
     /**
      * Assert that prices on order review and customer order pages are equal to specified in dataset.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index 6eb167d44c4..52cb287f119 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -54,6 +54,31 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
      */
     protected $severeness = 'high';
 
+    /**
+     * Implementation getCategoryPrices
+     *
+     * @param string $productName
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getCategoryPrices($productName, $actualPrices);
+
+    /**
+     * Implementation getProductPagePrices
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getProductPagePrices($actualPrices);
+
+    /**
+     * Implementation getTotals
+     *
+     * @param array $actualPrices
+     * @return array
+     */
+    abstract protected function getTotals($actualPrices);
+
     /**
      * Assert that specified prices are actual on category, product and cart pages.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
index 35c2ef23572..66ecdadac13 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -20,7 +20,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
     /**
      * Get order totals.
      *
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getOrderTotals($actualPrices)
@@ -43,7 +43,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
     /**
      * Get invoice new totals.
      *
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getInvoiceNewTotals($actualPrices)
@@ -67,7 +67,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
     /**
      * Get Credit Memo new totals.
      *
-     * @param $actualPrices
+     * @param array $actualPrices
      * @return array
      */
     public function getCreditMemoNewTotals($actualPrices)
-- 
GitLab


From 7be10014adecd88f6d1da8418c4a2e559edf2748 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Tue, 6 Jan 2015 12:23:36 -0600
Subject: [PATCH 028/101] MAGETWO-31732: Blacklisted ComposerTest

- updated composer.lock after merge
---
 composer.lock | 80 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 16 deletions(-)

diff --git a/composer.lock b/composer.lock
index d2fc6da7fe7..c21f6ae9496 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d3a510fb8a6b17c084148509d02478d4",
+    "hash": "18b11d313f169ab82027772ba8d02278",
     "packages": [
         {
             "name": "composer/composer",
@@ -290,16 +290,16 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
+                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
+                "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
                 "shasum": ""
             },
             "require": {
@@ -332,7 +332,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2014-09-05 15:36:20"
+            "time": "2015-01-04 21:18:15"
         },
         {
             "name": "symfony/console",
@@ -2001,16 +2001,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.13",
+            "version": "2.0.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
+                "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
-                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca158276c1200cc27f5409a5e338486bc0b4fc94",
+                "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94",
                 "shasum": ""
             },
             "require": {
@@ -2062,7 +2062,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-12-03 06:41:44"
+            "time": "2014-12-26 13:28:33"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2608,16 +2608,16 @@
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
+                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
                 "shasum": ""
             },
             "type": "library",
@@ -2639,7 +2639,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-03-07 15:35:33"
+            "time": "2014-12-15 14:25:24"
         },
         {
             "name": "sjparkinson/static-review",
@@ -3025,6 +3025,53 @@
             "description": "Symfony Stopwatch Component",
             "homepage": "http://symfony.com",
             "time": "2014-12-02 20:19:20"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.6.1",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-12-02 20:19:20"
         }
     ],
     "aliases": [],
@@ -3034,6 +3081,7 @@
         "phpmd/phpmd": 0
     },
     "prefer-stable": false,
+    "prefer-lowest": false,
     "platform": {
         "php": "~5.4.11|~5.5.0"
     },
-- 
GitLab


From b1ceba97200d97a94d21e43e7c479136cd623019 Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Tue, 6 Jan 2015 15:51:44 -0600
Subject: [PATCH 029/101] MAGETWO-32364: Improve performance in pricing
 framework

---
 app/code/Magento/Catalog/Model/Product.php    |  6 ++++--
 .../Magento/Catalog/Model/ProductTest.php     |  8 ++++++-
 .../Pricing/Price/CollectionTest.php          |  2 ++
 .../Framework/Pricing/Price/Collection.php    | 21 ++++++++++++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index b26ffe5bdcf..f23e7167cb5 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -776,8 +776,10 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     public function setQty($qty)
     {
-        $this->setData('qty', $qty);
-        $this->reloadPriceInfo();
+        if ($this->getData('qty') != $qty) {
+            $this->setData('qty', $qty);
+            $this->reloadPriceInfo();
+        }
         return $this;
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index c94f539159a..82d7278fc0e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -423,10 +423,16 @@ class ProductTest extends \PHPUnit_Framework_TestCase
      */
     public function testSetQty()
     {
-        $this->productTypeInstanceMock->expects($this->once())
+        $this->productTypeInstanceMock->expects($this->exactly(2))
             ->method('getPriceInfo')
             ->with($this->equalTo($this->model))
             ->will($this->returnValue($this->_priceInfoMock));
+
+        //initialize the priceInfo field
+        $this->model->getPriceInfo();
+        //Calling setQty will reset the priceInfo field
+        $this->assertEquals($this->model, $this->model->setQty(1));
+        //Call the setQty method with the same qty, getPriceInfo should not be called this time
         $this->assertEquals($this->model, $this->model->setQty(1));
         $this->assertEquals($this->model->getPriceInfo(), $this->_priceInfoMock);
     }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
index 518d0e8be36..eaf3fb43e90 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
@@ -79,6 +79,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
             )
             ->will($this->returnValue($this->priceMock));
         $this->assertEquals($this->priceMock, $this->collection->get('regular_price'));
+        //Calling the get method again with the same code, cached copy should be used
+        $this->assertEquals($this->priceMock, $this->collection->get('regular_price'));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Collection.php b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
index ed5fc69fac3..b18fc76bb9e 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
@@ -42,6 +42,13 @@ class Collection implements \Iterator
      */
     protected $excludes;
 
+    /**
+     * Cached price models
+     *
+     * @var array
+     */
+    protected $priceModels;
+
     /**
      * Constructor
      *
@@ -60,6 +67,7 @@ class Collection implements \Iterator
         $this->priceFactory = $priceFactory;
         $this->pool = $pool;
         $this->quantity = $quantity;
+        $this->priceModels = [];
     }
 
     /**
@@ -120,10 +128,13 @@ class Collection implements \Iterator
      */
     public function get($code)
     {
-        return $this->priceFactory->create(
-            $this->saleableItem,
-            $this->pool[$code],
-            $this->quantity
-        );
+        if (!isset($this->priceModels[$code])) {
+            $this->priceModels[$code] = $this->priceFactory->create(
+                $this->saleableItem,
+                $this->pool[$code],
+                $this->quantity
+            );
+        }
+        return $this->priceModels[$code];
     }
 }
-- 
GitLab


From 86897064e397ad29b730185379c386bbafd441b9 Mon Sep 17 00:00:00 2001
From: Vinai Kopp <vinai@netzarbeiter.com>
Date: Wed, 7 Jan 2015 18:18:31 +0100
Subject: [PATCH 030/101] Add tests for View\Layout\Reader\Block and slight
 refactoring

The refactoring only matches the return type of the interpret() method
to the return type of the Layout\ReaderInterface interface declaration.
---
 .../View/Layout/Reader/BlockTest.php          | 91 +++++++++++++++++++
 .../Reader/_files/_layout_update_block.xml    | 16 ++++
 .../_files/_layout_update_reference.xml       | 12 +++
 .../Framework/View/Layout/Reader/Block.php    |  5 +-
 4 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
new file mode 100644
index 00000000000..f6cd7b1b6af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Magento\Framework\View\Layout\Reader;
+
+class BlockTest extends \PHPUnit_Framework_TestCase
+{
+    const IDX_TYPE = 0;
+    const IDX_PARENT = 2;
+
+    /**
+     * @var Block
+     */
+    private $block;
+
+    /**
+     * @var Context
+     */
+    private $readerContext;
+
+    private $blockName = 'test.block';
+    private $childBlockName = 'test.child.block';
+
+    public function setUp()
+    {
+        $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Framework\View\Layout\Reader\Block'
+        );
+        
+        $this->readerContext = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Framework\View\Layout\Reader\Context'
+        );
+    }
+
+    public function testInterpretBlockDirective()
+    {
+        $pageXml = new \Magento\Framework\View\Layout\Element(__DIR__ . '/_files/_layout_update_block.xml', 0, true);
+        $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
+
+        foreach ($pageXml->xpath('body/block') as $blockElement) {
+            $this->assertTrue(in_array($blockElement->getName(), $this->block->getSupportedNodes()));
+
+            $this->block->interpret($this->readerContext, $blockElement, $parentElement);
+        }
+
+        $structure = $this->readerContext->getScheduledStructure();
+        $this->assertArrayHasKey($this->blockName, $structure->getStructure());
+        $this->assertEquals('block', $structure->getStructure()[$this->blockName][self::IDX_TYPE]);
+
+        $resultElementData = $structure->getStructureElementData($this->blockName);
+
+        $this->assertEquals(
+            ['group' => 'test.group', 'class' => 'Dummy\Class', 'template' => 'test.phtml', 'ttl' => 3],
+            $resultElementData['attributes']
+        );
+        $this->assertEquals(
+            ['test_arg' => ['name' => 'test_arg', 'xsi:type' => 'string', 'value' => 'test-argument-value']],
+            $resultElementData['arguments']
+        );
+
+        $this->assertEquals('block', $structure->getStructure()[$this->childBlockName][self::IDX_TYPE]);
+        $this->assertEquals($this->blockName, $structure->getStructure()[$this->childBlockName][self::IDX_PARENT]);
+    }
+
+    /**
+     * @depends testInterpretBlockDirective
+     */
+    public function testInterpretReferenceBlockDirective()
+    {
+        $pageXml = new \Magento\Framework\View\Layout\Element(
+            __DIR__ . '/_files/_layout_update_reference.xml', 0, true
+        );
+        $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
+
+        foreach ($pageXml->xpath('body/*') as $element) {
+            $this->assertTrue(in_array($element->getName(), $this->block->getSupportedNodes()));
+
+            $this->block->interpret($this->readerContext, $element, $parentElement);
+        }
+
+        $structure = $this->readerContext->getScheduledStructure();
+        $this->assertArrayHasKey($this->blockName, $structure->getStructure());
+        $this->assertEquals('block', $structure->getStructure()[$this->blockName][self::IDX_TYPE]);
+
+        $resultElementData = $structure->getStructureElementData($this->blockName);
+
+        $this->assertEquals(
+            ['test_arg' => ['name' => 'test_arg', 'xsi:type' => 'string', 'value' => 'test-argument-value']],
+            $resultElementData['arguments']
+        );
+    }
+} 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
new file mode 100644
index 00000000000..0a3c9c962ca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <body>
+        <block class="Dummy\Class"
+               name="test.block"
+               group="test.group"
+               template="test.phtml"
+               ttl="3">
+            <arguments>
+                <argument name="test_arg" xsi:type="string">test-argument-value</argument>
+            </arguments>
+            <block class="Dummy\Class" name="test.child.block"/>
+        </block>
+    </body>
+</page>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
new file mode 100644
index 00000000000..36a01a41bff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <body>
+        <block class="Dummy\Class" name="test.block"/>
+        <referenceBlock name="test.block">
+            <arguments>
+                <argument name="test_arg" xsi:type="string">test-argument-value</argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index d63b4907945..213e47b9257 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
@@ -120,7 +120,8 @@ class Block implements Layout\ReaderInterface
             default:
                 break;
         }
-        return $this->readerPool->interpret($readerContext, $currentElement);
+        $this->readerPool->interpret($readerContext, $currentElement);
+        return $this;
     }
 
     /**
@@ -173,7 +174,7 @@ class Block implements Layout\ReaderInterface
      * Update data for scheduled element
      *
      * @param Layout\Element $currentElement
-     * @param array $data
+     * @param array &$data
      * @return array
      */
     protected function updateScheduledData($currentElement, array &$data)
-- 
GitLab


From cf88c253e1fbc800bc9cde0e804f9869f7cd7d39 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 15:04:55 +0200
Subject: [PATCH 031/101] MAGETWO-32079: Alternative WebDriver support

---
 .../Install/Test/Block/CreateAdmin.php        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
index 2b18c9ca7a1..089a6185df9 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -6,7 +6,9 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Form;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
 
 /**
  * Create Admin Account block.
@@ -20,6 +22,13 @@ class CreateAdmin extends Form
      */
     protected $next = "[ng-click*='next']";
 
+    /**
+     * First field selector
+     *
+     * @var string
+     */
+    protected $firstField = '[name="adminUsername"]';
+
     /**
      * Click on 'Next' button.
      *
@@ -29,4 +38,17 @@ class CreateAdmin extends Form
     {
         $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
+
+    /**
+     * Ensure the form is loaded and fill the root form
+     *
+     * @param FixtureInterface $fixture
+     * @param SimpleElement|null $element
+     * @return $this
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $this->waitForElementVisible($this->firstField);
+        return parent::fill($fixture, $element);
+    }
 }
-- 
GitLab


From 8b47e7afde8223bef2f3194bbdbdc41af7e05f17 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 16:56:49 +0200
Subject: [PATCH 032/101] MAGETWO-32079: Alternative WebDriver support

---
 .../Install/Test/Block/CustomizeStore.php     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
index 5cb44776e60..111e1b1192d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -6,7 +6,9 @@
 namespace Magento\Install\Test\Block;
 
 use Mtf\Block\Form;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
 
 /**
  * Customize Your Store block.
@@ -20,6 +22,13 @@ class CustomizeStore extends Form
      */
     protected $next = "[ng-click*='next']";
 
+    /**
+     * First field selector
+     *
+     * @var string
+     */
+    protected $firstField = '[ng-model*="language"]';
+
     /**
      * Click on 'Next' button.
      *
@@ -29,4 +38,17 @@ class CustomizeStore extends Form
     {
         $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
+
+    /**
+     * Ensure the form is loaded and fill the root form
+     *
+     * @param FixtureInterface $fixture
+     * @param SimpleElement|null $element
+     * @return $this
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $this->waitForElementVisible($this->firstField);
+        return parent::fill($fixture, $element);
+    }
 }
-- 
GitLab


From a9916e6fb3601b8fd2c6b985749f878893787693 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 18:41:34 +0200
Subject: [PATCH 033/101] MAGETWO-32079: Alternative WebDriver support

---
 .../Install/Test/Constraint/AssertRewritesEnabled.php       | 6 +++---
 .../Install/Test/Constraint/AssertSecureUrlEnabled.php      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index c9db0e7d4a2..69083b7cdb9 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -7,7 +7,7 @@ namespace Magento\Install\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Mtf\Constraint\AbstractConstraint;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
 use Magento\Catalog\Test\Fixture\CatalogCategory;
 
 /**
@@ -24,9 +24,9 @@ class AssertRewritesEnabled extends AbstractConstraint
      *
      * @param CatalogCategory $category
      * @param CmsIndex $homePage
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      */
-    public function processAssert(CatalogCategory $category, CmsIndex $homePage, Browser $browser)
+    public function processAssert(CatalogCategory $category, CmsIndex $homePage, BrowserInterface $browser)
     {
         $category->persist();
         $homePage->open();
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index 2397ad0103e..a2cd0aea65c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Install\Test\Constraint;
 
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
 use Mtf\Constraint\AbstractConstraint;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
@@ -22,13 +22,13 @@ class AssertSecureUrlEnabled extends AbstractConstraint
     /**
      * Assert that Secure Urls Enabled.
      *
-     * @param Browser $browser
+     * @param BrowserInterface $browser
      * @param Dashboard $dashboard
      * @param CustomerAccountLogin $customerAccountLogin
      * @return void
      */
     public function processAssert(
-        Browser $browser,
+        BrowserInterface $browser,
         Dashboard $dashboard,
         CustomerAccountLogin $customerAccountLogin
     ) {
-- 
GitLab


From cc5a21566d26ae4ceecfbf01a7cbc344bb44dc17 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Fri, 9 Jan 2015 16:30:08 +0200
Subject: [PATCH 034/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Downloadable goup price fix and tax bug skip MAGETWO-18521
---
 .../DownloadableProductInjectable/GroupPriceOptions.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index ef1024f4013..374f9be0460 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -19,6 +19,13 @@ class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimp
     protected function getPreset($name)
     {
         $presets = [
+            'default' => [
+                [
+                    'price' => 20,
+                    'website' => 'All Websites [USD]',
+                    'customer_group' => 'NOT LOGGED IN',
+                ],
+            ],
             'downloadable_with_tax' => [
                 [
                     'price' => 20.00,
-- 
GitLab


From 819015cc492b8e943cf05bb776d132a3b41e399b Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 9 Jan 2015 09:40:24 -0600
Subject: [PATCH 035/101] MAGETWO-30415: [GITHUB]
 \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento
 application code #682

---
 app/code/Magento/Directory/Model/PriceCurrency.php        | 8 +-------
 .../Magento/Framework/Pricing/PriceCurrencyInterface.php  | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 3cc16e54ca6..77e8410eb02 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -57,13 +57,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
     }
 
     /**
-     * Convert and round price value for specified store or passed currency
-     *
-     * @param float $amount
-     * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @param Currency|string|null $currency
-     * @param int $precision
-     * @return float
+     * {@inheritdoc}
      */
     public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
index a1ec1dde8cf..1347dd006c2 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
@@ -29,12 +29,12 @@ interface PriceCurrencyInterface
      * Convert and round price value
      *
      * @param float $amount
-     * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @param \Magento\Directory\Model\Currency|string|null $currency
+     * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
+     * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @param int $precision
      * @return float
      */
-    public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION);
+    public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION);
 
     /**
      * Format price value
-- 
GitLab


From b7cde0221cb8a7ccd49775c94433249e5f2d1d4d Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 9 Jan 2015 15:10:37 -0600
Subject: [PATCH 036/101] MAGETWO-30415: [GITHUB]
 \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento
 application code #682

    - Change parameter name in implementation class to be consistent with interface
---
 app/code/Magento/Directory/Model/PriceCurrency.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 77e8410eb02..e30e2059b39 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -59,10 +59,10 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
     /**
      * {@inheritdoc}
      */
-    public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
+    public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
-        $currentCurrency = $this->getCurrency($store, $currency);
-        $convertedValue = $this->getStore($store)->getBaseCurrency()->convert($amount, $currentCurrency);
+        $currentCurrency = $this->getCurrency($scope, $currency);
+        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
         return round($convertedValue, $precision);
     }
 
-- 
GitLab


From ddd3d6976cf3f018cd960db35e5ef659f265a1e9 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Mon, 12 Jan 2015 11:14:54 +0200
Subject: [PATCH 037/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- CR fixes
---
 .../app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php | 5 +----
 .../Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php | 6 +++---
 .../AbstractAssertTaxCalculationAfterCheckout.php           | 4 ++--
 .../AbstractAssertTaxRuleIsAppliedToAllPrices.php           | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 98d5718ae0f..a5ebf67d371 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index b7c81790948..982a52c8bff 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -46,7 +46,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
     protected $severeness = 'high';
 
     /**
-     * Implementation assert
+     * Implementation for get order total prices function
      *
      * @param array $actualPrices
      * @return array
@@ -54,7 +54,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
     abstract protected function getOrderTotals($actualPrices);
 
     /**
-     * Implementation assert
+     * Implementation for get invoice creation page total prices function
      *
      * @param array $actualPrices
      * @return array
@@ -62,7 +62,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
     abstract protected function getInvoiceNewTotals($actualPrices);
 
     /**
-     * Implementation getCreditMemoNewTotals
+     * Implementation for get credit memo creation page total prices function
      *
      * @param array $actualPrices
      * @return array
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index 51c7b44bf0b..097b0873f8d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -40,7 +40,7 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
     protected $severeness = 'high';
 
     /**
-     * Implementation getReviewTotals
+     * Implementation for get order review total prices function
      *
      * @param array $actualPrices
      * @return array
@@ -48,7 +48,7 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
     abstract protected function getReviewTotals($actualPrices);
 
     /**
-     * Implementation getOrderTotals
+     * Implementation for get order total prices from customer account function
      *
      * @param array $actualPrices
      * @return array
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index 52cb287f119..d1fc1751b3b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -55,7 +55,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
     protected $severeness = 'high';
 
     /**
-     * Implementation getCategoryPrices
+     * Implementation for get category prices function
      *
      * @param string $productName
      * @param array $actualPrices
@@ -64,7 +64,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
     abstract protected function getCategoryPrices($productName, $actualPrices);
 
     /**
-     * Implementation getProductPagePrices
+     * Implementation for get product page prices function
      *
      * @param array $actualPrices
      * @return array
@@ -72,7 +72,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
     abstract protected function getProductPagePrices($actualPrices);
 
     /**
-     * Implementation getTotals
+     * Implementation for get totals in cart function
      *
      * @param array $actualPrices
      * @return array
-- 
GitLab


From 3cbac1dc04dd35e6480077da1dbc951a94cff1c6 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 12 Jan 2015 19:51:18 +0200
Subject: [PATCH 038/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 .../Mtf/Client/Element/ConditionsElement.php  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 17fe72704a2..33acb079b79 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -83,7 +83,7 @@ class ConditionsElement extends SimpleElement
      *
      * @var string
      */
-    protected $created = './/preceding-sibling::li[1]';
+    protected $created = './ul/li[1]';
 
     /**
      * Children condition
@@ -97,7 +97,7 @@ class ConditionsElement extends SimpleElement
      *
      * @var string
      */
-    protected $param = './span[@class="rule-param"]/span/*[substring(@id,(string-length(@id)-%d+1))="%s"]/../..';
+    protected $param = './span[span[*[substring(@id,(string-length(@id)-%d+1))="%s"]]]';
 
     /**
      * Key of last find param
@@ -194,9 +194,9 @@ class ConditionsElement extends SimpleElement
         $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
         $typeNewCondition = $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
         $typeNewCondition->setValue($condition['type']);
-        $this->ruleParamWait();
 
-        $createdCondition = $newCondition->find($this->created, Locator::SELECTOR_XPATH);
+        $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
+        $this->waitForCondition($createdCondition);
         if (!empty($condition['rules'])) {
             $this->fillCondition($condition['rules'], $createdCondition);
         }
@@ -243,9 +243,8 @@ class ConditionsElement extends SimpleElement
             }
         );
         $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($condition['type']);
-        $this->ruleParamWait();
-
-        $createdCondition = $newCondition->find($this->created, Locator::SELECTOR_XPATH);
+        $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
+        $this->waitForCondition($createdCondition);
         $this->fillCondition($condition['rules'], $createdCondition);
     }
 
@@ -387,14 +386,11 @@ class ConditionsElement extends SimpleElement
      *
      * @return void
      */
-    protected function ruleParamWait()
+    protected function waitForCondition(SimpleElement $element)
     {
-        $browser = $this;
-        $ruleParamWait = $this->ruleParamWait;
-        $browser->waitUntil(
-            function () use ($browser, $ruleParamWait) {
-                $element = $browser->find($ruleParamWait, Locator::SELECTOR_XPATH);
-                return $element->isVisible() ? null : true;
+        $this->waitUntil(
+            function () use ($element) {
+                return $element->getAttribute('class') == 'rule-param-wait' ? null : true;
             }
         );
     }
-- 
GitLab


From 505b6e16902197d7c181f170a9141d29873c8dc4 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Mon, 12 Jan 2015 15:40:26 -0600
Subject: [PATCH 039/101] MAGETWO-32448:Move Emulation class to
 Magento/Store/Model/App/Emulation

---
 app/code/Magento/Email/Model/AbstractTemplate.php         | 6 +++---
 app/code/Magento/Email/Model/BackendTemplate.php          | 4 ++--
 app/code/Magento/Email/Model/Template.php                 | 4 ++--
 app/code/Magento/Newsletter/Model/Queue.php               | 4 ++--
 app/code/Magento/Newsletter/Model/Template.php            | 4 ++--
 app/code/Magento/Payment/Helper/Data.php                  | 6 +++---
 app/code/Magento/ProductAlert/Model/Email.php             | 6 +++---
 app/code/Magento/{Core => Store}/Model/App/Emulation.php  | 5 +++--
 .../testsuite/Magento/Core/Model/App/EmulationTest.php    | 8 ++++----
 .../testsuite/Magento/Email/Model/TemplateTest.php        | 2 +-
 .../Magento/Test/Legacy/_files/obsolete_classes.php       | 1 +
 .../testsuite/Magento/Core/Model/App/EmulationTest.php    | 6 +++---
 .../unit/testsuite/Magento/Email/Model/TemplateTest.php   | 2 +-
 .../testsuite/Magento/Newsletter/Model/TemplateTest.php   | 2 +-
 .../unit/testsuite/Magento/Payment/Helper/DataTest.php    | 2 +-
 15 files changed, 32 insertions(+), 30 deletions(-)
 rename app/code/Magento/{Core => Store}/Model/App/Emulation.php (98%)

diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index ca38c73e7c6..dbc58086db9 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -56,7 +56,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
     protected $_design = null;
 
     /**
-     * @var \Magento\Core\Model\App\Emulation
+     * @var \Magento\Store\Model\App\Emulation
      */
     protected $_appEmulation;
 
@@ -69,7 +69,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
@@ -77,7 +77,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index abc963099c9..27c6084b438 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -21,7 +21,7 @@ class BackendTemplate extends Template
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -38,7 +38,7 @@ class BackendTemplate extends Template
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Asset\Repository $assetRepo,
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index a397317ff4c..e3b52978ca6 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -157,7 +157,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -173,7 +173,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         StoreManagerInterface $storeManager,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Asset\Repository $assetRepo,
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index cb84858cfff..85b50fa153d 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -114,7 +114,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Newsletter\Model\Template\Filter $templateFilter
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -129,7 +129,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Newsletter\Model\Template\Filter $templateFilter,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index ddb12607ece..46f0270e193 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -93,7 +93,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Newsletter\Model\Template\Filter $filter
@@ -106,7 +106,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Newsletter\Model\Template\Filter $filter,
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 057619e94bb..e27a93a3a5c 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -52,7 +52,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * App emulation model
      *
-     * @var \Magento\Core\Model\App\Emulation
+     * @var \Magento\Store\Model\App\Emulation
      */
     protected $_appEmulation;
 
@@ -68,7 +68,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param LayoutFactory $layoutFactory
      * @param \Magento\Payment\Model\Method\Factory $paymentMethodFactory
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Magento\Framework\App\Config\Initial $initialConfig
      */
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         LayoutFactory $layoutFactory,
         \Magento\Payment\Model\Method\Factory $paymentMethodFactory,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Payment\Model\Config $paymentConfig,
         \Magento\Framework\App\Config\Initial $initialConfig
     ) {
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index a7ef2815887..a1e3bb59e3a 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -92,7 +92,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
     protected $customerRepository;
 
     /**
-     * @var \Magento\Core\Model\App\Emulation
+     * @var \Magento\Store\Model\App\Emulation
      */
     protected $_appEmulation;
 
@@ -114,7 +114,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Helper\View $customerHelper
-     * @param \Magento\Core\Model\App\Emulation $appEmulation
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -128,7 +128,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Customer\Helper\View $customerHelper,
-        \Magento\Core\Model\App\Emulation $appEmulation,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Core/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
similarity index 98%
rename from app/code/Magento/Core/Model/App/Emulation.php
rename to app/code/Magento/Store/Model/App/Emulation.php
index 85f57ad6170..5b64511218a 100644
--- a/app/code/Magento/Core/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -9,8 +9,9 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
 
+use Magento\Framework\Object;
 use Magento\Framework\Translate\Inline\ConfigInterface;
 
 class Emulation extends \Magento\Framework\Object
@@ -145,7 +146,7 @@ class Emulation extends \Magento\Framework\Object
      *
      * Function restores initial store environment
      *
-     * @return \Magento\Core\Model\App\Emulation
+     * @return \Magento\Store\Model\App\Emulation
      */
     public function stopEnvironmentEmulation()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
index 6bd0071e940..17e06017fc7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
@@ -8,18 +8,18 @@ namespace Magento\Core\Model\App;
 class EmulationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\Model\App\Emulation
+     * @var \Magento\Store\Model\App\Emulation
      */
     protected $_model;
 
     /**
-     * @covers \Magento\Core\Model\App\Emulation::startEnvironmentEmulation
-     * @covers \Magento\Core\Model\App\Emulation::stopEnvironmentEmulation
+     * @covers \Magento\Store\Model\App\Emulation::startEnvironmentEmulation
+     * @covers \Magento\Store\Model\App\Emulation::stopEnvironmentEmulation
      */
     public function testEnvironmentEmulation()
     {
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Core\Model\App\Emulation');
+            ->create('Magento\Store\Model\App\Emulation');
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index 3344852fa45..a1f054261ad 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -34,7 +34,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
                 $objectManager->get('Magento\Framework\Model\Context'),
                 $objectManager->get('Magento\Framework\View\DesignInterface'),
                 $objectManager->get('Magento\Framework\Registry'),
-                $objectManager->get('Magento\Core\Model\App\Emulation'),
+                $objectManager->get('Magento\Store\Model\App\Emulation'),
                 $objectManager->get('Magento\Store\Model\StoreManager'),
                 $objectManager->create('Magento\Framework\Filesystem'),
                 $objectManager->create('Magento\Framework\View\Asset\Repository'),
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 553c41e4a1d..0e5649cf5d6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -1302,6 +1302,7 @@ return [
     ['Magento\Core\Controller\Varien\DispatchableInterface'],
     ['Magento\Core\Controller\Varien\Front', 'Magento\Framework\App\FrontController'],
     ['Magento\Core\Controller\FrontInterface', 'Magento\Framework\App\FrontControllerInterface'],
+    ['Magento\Core\Model\App\Emulation', 'Magento\Store\Model\App\Emulation'],
     ['Magento\Core\Model\App\Handler'],
     ['Magento\Core\Model\App\Proxy'],
     ['Magento\Core\Model\Event\Config\SchemaLocator', 'Magento\Framework\Event\Config\SchemaLocator'],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
index b7e79200421..fd6cb10592a 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests Magento\Core\Model\App\Emulation
+ * Tests Magento\Store\Model\App\Emulation
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
@@ -65,7 +65,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
     const NEW_STORE_ID = 9;
 
     /**
-     * @var \Magento\Core\Model\App\Emulation
+     * @var \Magento\Store\Model\App\Emulation
      */
     private $model;
 
@@ -105,7 +105,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
         $this->designMock->expects($this->any())->method('getData')->willReturn(false);
 
         // Prepare SUT
-        $this->model = $this->objectManager->getObject('Magento\Core\Model\App\Emulation',
+        $this->model = $this->objectManager->getObject('Magento\Store\Model\App\Emulation',
             [
                 'storeManager' => $this->storeManagerMock,
                 'viewDesign' => $this->viewDesignMock,
diff --git a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
index 7ff2358c4f2..f63b91e5ea6 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
@@ -30,7 +30,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
                 $this->getMock('Magento\Framework\Model\Context', [], [], '', false),
                 $this->getMock('Magento\Core\Model\View\Design', [], [], '', false),
                 $this->getMock('Magento\Framework\Registry', [], [], '', false),
-                $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false),
+                $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false),
                 $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false),
                 $this->getMock('Magento\Framework\Filesystem', [], [], '', false),
                 $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 34ae088e892..853ddae4c01 100644
--- a/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -40,7 +40,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
         }
 
         $filter = $this->getMock('Magento\Newsletter\Model\Template\Filter', [], [], '', false);
-        $appEmulation = $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false);
+        $appEmulation = $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false);
         $filter->expects($this->once())->method('setStoreId')->with('test_id');
         $filter->expects($this->once())->method('setIncludeProcessor')->will($this->returnSelf());
         $filter->expects(
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
index f2ae8359ac8..0c3371787ec 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
@@ -42,7 +42,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
         $layoutFactoryMock->expects($this->once())->method('create')->willReturn($this->layoutMock);
 
         $this->methodFactory = $this->getMock('Magento\Payment\Model\Method\Factory', [], [], '', false);
-        $this->appEmulation = $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false);
+        $this->appEmulation = $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false);
         $paymentConfig = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
         $this->initialConfig = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
 
-- 
GitLab


From df06832afb5f011ba1c9e6e0c79376ab11856286 Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Mon, 12 Jan 2015 15:48:24 -0600
Subject: [PATCH 040/101] MAGETWO-32450: Move Factory to
 Magento/Framework/Validator

---
 app/code/Magento/Customer/Model/Resource/Address.php      | 6 +++---
 app/code/Magento/Customer/Model/Resource/Customer.php     | 6 +++---
 .../Magento/Core/Model/Validator/FactoryTest.php          | 6 +++---
 .../Magento/Test/Legacy/_files/obsolete_properties.php    | 2 +-
 .../Magento/Core/Model/Validator/FactoryTest.php          | 8 ++++----
 .../Magento/Customer/Model/Resource/AddressTest.php       | 4 ++--
 .../internal/Magento/Framework}/Validator/Factory.php     | 2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename {app/code/Magento/Core/Model => lib/internal/Magento/Framework}/Validator/Factory.php (98%)

diff --git a/app/code/Magento/Customer/Model/Resource/Address.php b/app/code/Magento/Customer/Model/Resource/Address.php
index bec7eec4634..c047a54d3ee 100644
--- a/app/code/Magento/Customer/Model/Resource/Address.php
+++ b/app/code/Magento/Customer/Model/Resource/Address.php
@@ -12,7 +12,7 @@ use Magento\Framework\Exception\InputException;
 class Address extends \Magento\Eav\Model\Entity\AbstractEntity
 {
     /**
-     * @var \Magento\Core\Model\Validator\Factory
+     * @var \Magento\Framework\Validator\Factory
      */
     protected $_validatorFactory;
 
@@ -28,7 +28,7 @@ class Address extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Core\Model\Validator\Factory $validatorFactory
+     * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
      * @param array $data
      */
@@ -39,7 +39,7 @@ class Address extends \Magento\Eav\Model\Entity\AbstractEntity
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Core\Model\Validator\Factory $validatorFactory,
+        \Magento\Framework\Validator\Factory $validatorFactory,
         \Magento\Customer\Model\CustomerFactory $customerFactory,
         $data = []
     ) {
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index f7874f48d97..323fe78a199 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -13,7 +13,7 @@ use Magento\Framework\Exception\InputException;
 class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
 {
     /**
-     * @var \Magento\Core\Model\Validator\Factory
+     * @var \Magento\Framework\Validator\Factory
      */
     protected $_validatorFactory;
 
@@ -37,7 +37,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Core\Model\Validator\Factory $validatorFactory
+     * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param array $data
      */
@@ -49,7 +49,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Core\Model\Validator\Factory $validatorFactory,
+        \Magento\Framework\Validator\Factory $validatorFactory,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         $data = []
     ) {
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
index eeaaba1172a..ada0959e9ca 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Integration test for \Magento\Core\Model\Validator\Factory
+ * Integration test for \Magento\Framework\Validator\Factory
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
@@ -17,8 +17,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
     public function testGetValidatorConfig()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Core\Model\Validator\Factory $factory */
-        $factory = $objectManager->get('Magento\Core\Model\Validator\Factory');
+        /** @var \Magento\Framework\Validator\Factory $factory */
+        $factory = $objectManager->get('Magento\Framework\Validator\Factory');
         $this->assertInstanceOf('Magento\Framework\Validator\Config', $factory->getValidatorConfig());
         // Check that default translator was set
         $translator = \Magento\Framework\Validator\AbstractValidator::getDefaultTranslator();
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index c16cc293b23..d145bd51182 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -290,7 +290,7 @@ return [
     ['_storeManager', 'Magento\Translation\Model\Resource\String'],
     ['_isVdeRequest', 'Magento\DesignEditor\Helper\Data'],
     ['_translator', 'Magento\Framework\Phrase\Renderer\Translate', 'translator'],
-    ['_translator', 'Magento\Core\Model\Validator\Factory'],
+    ['_translator', 'Magento\Framework\Validator\Factory'],
     ['_configFactory', 'Magento\Core\Model\App\Emulation', 'inlineConfig'],
     ['_scopeConfig', 'Magento\Translation\Model\Inline\Config', 'config'],
     ['_translate', 'Magento\Directory\Model\Observer'],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
index 2ad8b19d563..3fe0da1f3e4 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Unit test for \Magento\Core\Model\Validator\Factory
+ * Unit test for \Magento\Framework\Validator\Factory
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
@@ -104,7 +104,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetValidatorConfig()
     {
-        $factory = new \Magento\Core\Model\Validator\Factory(
+        $factory = new \Magento\Framework\Validator\Factory(
             $this->_objectManager,
             $this->_config,
             $this->_translateAdapter
@@ -144,7 +144,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
                 $objectManager->getObject('Magento\Framework\Validator\Builder', ['constraints' => []])
             )
         );
-        $factory = new \Magento\Core\Model\Validator\Factory(
+        $factory = new \Magento\Framework\Validator\Factory(
             $this->_objectManager,
             $this->_config,
             $this->_translateAdapter
@@ -171,7 +171,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
         )->will(
             $this->returnValue(new \Magento\Framework\Validator())
         );
-        $factory = new \Magento\Core\Model\Validator\Factory(
+        $factory = new \Magento\Framework\Validator\Factory(
             $this->_objectManager,
             $this->_config,
             $this->_translateAdapter
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
index f87981471b7..ef3eadbebd0 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
@@ -230,7 +230,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
     /**
      * Prepare validator mock object
      *
-     * @return \Magento\Core\Model\Validator\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\Validator\Factory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function prepareValidatorFactory()
     {
@@ -240,7 +240,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
             ->willReturn(true);
 
         $validatorFactory = $this->getMock(
-            'Magento\Core\Model\Validator\Factory',
+            'Magento\Framework\Validator\Factory',
             ['createValidator'],
             [],
             '',
diff --git a/app/code/Magento/Core/Model/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
similarity index 98%
rename from app/code/Magento/Core/Model/Validator/Factory.php
rename to lib/internal/Magento/Framework/Validator/Factory.php
index 87417f739e0..42a9960c9de 100644
--- a/app/code/Magento/Core/Model/Validator/Factory.php
+++ b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
 
 class Factory
 {
-- 
GitLab


From 520de217df0b3809cf973ab3e6b7b416389778fd Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Mon, 12 Jan 2015 15:59:43 -0600
Subject: [PATCH 041/101] MAGETWO-32452: Move Factory Integration and Unit test
 to corresponding directory

---
 .../Magento/{Core/Model => Framework}/Validator/FactoryTest.php | 2 +-
 .../Magento/{Core/Model => Framework}/Validator/FactoryTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{Core/Model => Framework}/Validator/FactoryTest.php (96%)
 rename dev/tests/unit/testsuite/Magento/{Core/Model => Framework}/Validator/FactoryTest.php (99%)

diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
rename to dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
index ada0959e9ca..2a25d44f2b6 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
 
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
index 3fe0da1f3e4..649ad967473 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
 
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
-- 
GitLab


From 7a4bb3dd79cb2815bff0514f39e1043a665d0859 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 13 Jan 2015 12:37:50 +0200
Subject: [PATCH 042/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 dev/tests/functional/composer.json    | 4 +++-
 dev/tests/functional/phpunit.xml.dist | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index a3d361ec3ff..eb54174666d 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -4,7 +4,9 @@
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
-        "netwing/selenium-server-standalone": ">=2.35",
+        "netwing/selenium-server-standalone": ">=2.35"
+    },
+    "suggest": {
         "facebook/webdriver": "dev-master"
     },
     "autoload": {
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index 8ee0c67c184..fddc9236ff7 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -36,6 +36,7 @@
         <env name="server_config_path" value="config/server.yml.dist" />
         <env name="isolation_config_path" value="config/isolation.yml.dist" />
         <env name="handlers_config_path" value="config/handler.yml.dist" />
+        <env name="install_config_path" value="config/install_data.yml.dist" />
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic" />
         <env name="log_directory" value="var/log" />
         <env name="events_preset" value="base" />
-- 
GitLab


From 0b38c851e0af7c9c237dcd7ed1fa44f872399803 Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 13 Jan 2015 17:12:09 +0200
Subject: [PATCH 043/101] MAGETWO-30795: Optimization of
 CollectTotalsFailedItems

---
 app/code/Magento/Checkout/Controller/Cart/Index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 32d273a31fa..fd43f5df96b 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -14,6 +14,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      */
     public function execute()
     {
+        $this->_eventManager->dispatch('collect_totals_failed_items');
         if ($this->cart->getQuote()->getItemsCount()) {
             $this->cart->init();
             $this->cart->save();
-- 
GitLab


From aafcad78a48f37c5433193b4045c43e45307ea6b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 13 Jan 2015 09:21:34 -0600
Subject: [PATCH 044/101] MAGETWO-32449: Move Emulation Tests class to
 Magento/Store/Model/App/

---
 .../Magento/{Core => Store}/Model/App/EmulationTest.php         | 2 +-
 .../Magento/{Core => Store}/Model/App/EmulationTest.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/App/EmulationTest.php (96%)
 rename dev/tests/unit/testsuite/Magento/{Core => Store}/Model/App/EmulationTest.php (99%)

diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
rename to dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
index 17e06017fc7..d374b8cea90 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
 
 class EmulationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
rename to dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
index fd6cb10592a..d09271bdfd3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
 
 class EmulationTest extends \PHPUnit_Framework_TestCase
 {
-- 
GitLab


From fc9a6967b437a8e71530833fb347b76b4a13818e Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Tue, 13 Jan 2015 13:30:06 -0600
Subject: [PATCH 045/101] MAGETWO-32450: Move Factory to
 Magento/Framework/Validator

---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_classes.php   | 1 +
 .../Magento/Test/Legacy/_files/obsolete_properties.php          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 553c41e4a1d..91a8d3fecb3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2845,4 +2845,5 @@ return [
     ['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
     ['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],
     ['Magento\Framework\Logger', 'Psr\Log\LoggerInterface'],
+    ['Magento\Core\Model\Validator\Factory', 'Magento\Framework\Validator\Factory'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index d145bd51182..c16cc293b23 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -290,7 +290,7 @@ return [
     ['_storeManager', 'Magento\Translation\Model\Resource\String'],
     ['_isVdeRequest', 'Magento\DesignEditor\Helper\Data'],
     ['_translator', 'Magento\Framework\Phrase\Renderer\Translate', 'translator'],
-    ['_translator', 'Magento\Framework\Validator\Factory'],
+    ['_translator', 'Magento\Core\Model\Validator\Factory'],
     ['_configFactory', 'Magento\Core\Model\App\Emulation', 'inlineConfig'],
     ['_scopeConfig', 'Magento\Translation\Model\Inline\Config', 'config'],
     ['_translate', 'Magento\Directory\Model\Observer'],
-- 
GitLab


From b9b410cc7f8f6e35a3995886e8aadd8f16a2241b Mon Sep 17 00:00:00 2001
From: jonathanvaughn <jvaughn@creatuity.com>
Date: Tue, 13 Jan 2015 14:19:38 -0600
Subject: [PATCH 046/101] Improving documentation for jMeter performance tests

---
 dev/tools/performance-toolkit/README.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt
index f4bf6427b5f..1316b3bff3e 100644
--- a/dev/tools/performance-toolkit/README.txt
+++ b/dev/tools/performance-toolkit/README.txt
@@ -4,16 +4,24 @@ Performance Toolkit
 Installation
 -----------
 jMeter:
--- go to http://jmeter.apache.org/download_jmeter.cgi and download jMeter in Source section (pay you attention that Java 6 or later is required)
+-- go to http://jmeter.apache.org/download_jmeter.cgi and download jMeter in Binary section (pay you attention that Java 6 or later is required)
 -- unzip archive
 
 Plugins (only if you want to use additional reports (like graphs)):
 -- go to http://jmeter-plugins.org/downloads/all/ and download JMeterPlugins-Standard and JMeterPlugins-Extras
 -- unzip them to appropriate ext directory of your jMeter instance.
+-- additional reports can now be enabled via GUI (right click them, then click Enable) or editing the jMeter JMX XML (set 'enabled="true"').
 
 
 Usage
 -----------
+Before running the jMeter tests for the first time, you will need to first use generate.php to generate the test data.
+
+If you do not wish to use performance metrics gathered from the server(s) (such as CPU / IO load), or do not wish to configure the jMeter metric gathering software on your server(s), you can disable that either via the GUI (right click on "Performance Metrics Collector" and click Disable) or by editing the jMeter JMX XML from:
+<kg.apc.jmeter.perfmon.PerfMonCollector guiclass="kg.apc.jmeter.vizualizers.PerfMonGui" testclass="kg.apc.jmeter.perfmon.PerfMonCollector" testname="Performance Metrics Collector" enabled="true">
+to:
+<kg.apc.jmeter.perfmon.PerfMonCollector guiclass="kg.apc.jmeter.vizualizers.PerfMonGui" testclass="kg.apc.jmeter.perfmon.PerfMonCollector" testname="Performance Metrics Collector" enabled="false">
+Attempting to run with Performance Metrics Collector enabled without appropriately configuring it will result in a timeout error connecting to the collector and the test not running.
 
 1. Run via console
 Scenario can accept 5 parameters that are described bellow in format <parameter_name:default_value>:
@@ -24,6 +32,9 @@ Scenario can accept 5 parameters that are described bellow in format <parameter_
 <ramp_period:300> Ramp period (seconds). Period the request will be distributed within.
 <orders:0> Number of orders in the period specified in the current allocation. If <orders> is specified, the <users> parameter will be recalculated.
 <report_save_path:./> Path where reports will be saved. Reports will be saved in current working directory by default.
+<admin_path:backend/> Admin backend path. Default is backend.
+<admin_user:admin/> Admin backend user. Default is admin.
+<admin_password:123123q/> Admin backend password. Default is 123123q.
 
 All parameters must be passed to command line with "J" prefix: "-J<parameter_name>=<parameter_value>"
 
-- 
GitLab


From d192d09899a94bc3533ad9527a57e2be942125f6 Mon Sep 17 00:00:00 2001
From: jonathanvaughn <jvaughn@creatuity.com>
Date: Tue, 13 Jan 2015 14:31:05 -0600
Subject: [PATCH 047/101] Improving documentation for jMeter performance tests

---
 dev/tools/performance-toolkit/README.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt
index 1316b3bff3e..0a94b4e4b38 100644
--- a/dev/tools/performance-toolkit/README.txt
+++ b/dev/tools/performance-toolkit/README.txt
@@ -24,7 +24,7 @@ to:
 Attempting to run with Performance Metrics Collector enabled without appropriately configuring it will result in a timeout error connecting to the collector and the test not running.
 
 1. Run via console
-Scenario can accept 5 parameters that are described bellow in format <parameter_name:default_value>:
+Scenario can accept parameters that are described bellow in format <parameter_name:default_value>:
 
 <host:''> URL component 'host' of application being tested (URL or IP).
 <base_path:'/'> Base path for tested site.
@@ -35,6 +35,15 @@ Scenario can accept 5 parameters that are described bellow in format <parameter_
 <admin_path:backend/> Admin backend path. Default is backend.
 <admin_user:admin/> Admin backend user. Default is admin.
 <admin_password:123123q/> Admin backend password. Default is 123123q.
+<view_product_add_to_cart_percent:62/> Percentage of users that will only reach the add to cart stage. Default is 62.
+<view_catalog_percent:30/> Percentage of users that will only reach the view catalog stage. Default is 30.
+<guest_checkout_percent:4/> Percentage of users that will reach the guest checkout stage. Default is 4.
+<customer_checkout_percent:4/> Percentage of users that will reach the (logged-in) customer checkout stage. Default is 4.
+<loops:1/> Number of loops to run. Default is 1.
+<jmeter_agent_port:3450/> jMeter agent port. Default is 3450.
+<db_server_ip:10.62.51.150/> DB Server IP (for jMeter Performance Metrics). Default is 10.62.51.150.
+<web_server_1_ip:10.62.51.185/> Web Server 1 IP (for jMeter Performance Metrics). Default is 10.62.51.185.
+<web_server_2_ip:10.62.51.186/> Web Server 2 IP (for jMeter Performance Metrics). Default is 10.62.51.186.
 
 All parameters must be passed to command line with "J" prefix: "-J<parameter_name>=<parameter_value>"
 
-- 
GitLab


From 0c19e64863787ce8e279e6aefa27999498ce88a3 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Wed, 14 Jan 2015 18:27:57 +0200
Subject: [PATCH 048/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Fixed copyrights in merged files
---
 .../AbstractAssertTaxCalculationAfterCheckoutDownloadable.php | 3 ++-
 .../AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php | 3 ++-
 ...culationAfterCheckoutDownloadableExcludingIncludingTax.php | 3 ++-
 ...ertTaxCalculationAfterCheckoutDownloadableExcludingTax.php | 3 ++-
 ...ertTaxCalculationAfterCheckoutDownloadableIncludingTax.php | 3 ++-
 ...eIsAppliedToAllPricesDownloadableExcludingIncludingTax.php | 3 ++-
 ...ertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php | 3 ++-
 ...ertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php | 3 ++-
 .../DownloadableProductInjectable/GroupPriceOptions.php       | 3 ++-
 .../Test/TestCase/DownloadableTaxCalculationTest.php          | 3 ++-
 .../tests/app/Magento/Downloadable/Test/etc/scenario.xml      | 3 ++-
 .../Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php   | 3 ++-
 .../Constraint/AbstractAssertTaxCalculationAfterCheckout.php  | 3 ++-
 .../AssertOrderTaxOnBackendExcludingIncludingTax.php          | 3 ++-
 .../Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php   | 3 ++-
 .../Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php   | 3 ++-
 ...AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php | 3 ++-
 .../AssertTaxCalculationAfterCheckoutExcludingTax.php         | 4 ++--
 .../AssertTaxCalculationAfterCheckoutIncludingTax.php         | 3 ++-
 ...AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php | 3 ++-
 .../AssertTaxRuleIsAppliedToAllPricesExcludingTax.php         | 3 ++-
 .../AssertTaxRuleIsAppliedToAllPricesIncludingTax.php         | 3 ++-
 22 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index 290600821df..f8bf3012cfa 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index 35da65f95f2..bd74cdb32ae 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
index a686bf97175..1132a5eba4d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
index 6244b27448f..f2674893728 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
index 65bef8f5c92..88ee73b5067 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
index 4882be04642..a19281b101d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index 8845f254596..a48b94174bc 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 2ce8b695acb..61a282eda03 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index 374f9be0460..2d0b2c8f339 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index e9316abf81d..82b90a1bbec 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Downloadable\Test\TestCase;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
index ce97ab96f36..d5d21016c52 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 -->
 <scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index 982a52c8bff..aa63949e9de 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index 097b0873f8d..debc24c79bb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
index 66ecdadac13..1851caffdb0 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
index 56a46a082f9..9b0c4846f27 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
index 71b228adcc3..8843f04669a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
index 29040ace551..e4219643ae8 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
index dba356b8e41..e925881d8ad 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
-
 namespace Magento\Tax\Test\Constraint;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
index 89611a8946d..e7079263b0e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
index a5badd6fd90..55ea81d13ce 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
index 165d6cd23ac..8088fe6e3da 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
index ce12c61fbf1..9e7fbe7ef37 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\Constraint;
-- 
GitLab


From e7e2426cfc697cd5f4f82fb8dae6a2136868eaf2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 14 Jan 2015 19:08:59 +0200
Subject: [PATCH 049/101] MAGETWO-25084: [GITHUB] About ByPercent.php under
 different currencies #581

---
 .../SalesRule/Model/Rule/Action/Discount/ByPercent.php        | 4 +++-
 .../SalesRule/Model/Rule/Action/Discount/ByPercentTest.php    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
index afab1eded3d..7940fc5df84 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
@@ -57,7 +57,9 @@ class ByPercent extends AbstractDiscount
         $discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
         $discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
         $discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
-        $discountData->setBaseOriginalAmount(($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
+        $discountData->setBaseOriginalAmount(
+            ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
+        );
 
         if (!$rule->getDiscountQty() || $rule->getDiscountQty() > $qty) {
             $discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
index 9f911786fed..e7c9747626f 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
@@ -209,7 +209,7 @@ class ByPercentTest extends \PHPUnit_Framework_TestCase
                     'amount' => 42,
                     'baseAmount' => 25.5,
                     'originalAmount' => 51,
-                    'baseOriginalAmount' => 46.5,
+                    'baseOriginalAmount' => 34.5,
                 ],
             ]
         ];
-- 
GitLab


From 268808daa72a7fa80ab764ab3e204a4f04d26c35 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Wed, 14 Jan 2015 13:54:58 -0600
Subject: [PATCH 050/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

 - updated copyright statements
---
 .../CatalogRule/Test/TestStep/CreateCatalogRuleStep.php     | 6 ++----
 .../app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php     | 6 ++----
 .../functional/tests/app/Magento/Tax/Test/etc/scenario.xml  | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
index f0c087db7ab..f17c6b39621 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\CatalogRule\Test\TestStep;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
index 94bc1cd3b81..e90c0be6bc4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Tax\Test\TestStep;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
index a1d4d406e4f..356993adf01 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 -->
 <scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
-- 
GitLab


From d6599759b00d95885585118e0810b4a290012756 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Thu, 15 Jan 2015 11:25:19 +0200
Subject: [PATCH 051/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Fixes for L3 fails
---
 ...ulationAfterCheckoutDownloadableExcludingIncludingTax.php | 4 ++--
 ...rtTaxCalculationAfterCheckoutDownloadableExcludingTax.php | 4 ++--
 ...rtTaxCalculationAfterCheckoutDownloadableIncludingTax.php | 4 ++--
 ...IsAppliedToAllPricesDownloadableExcludingIncludingTax.php | 4 ++--
 ...rtTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php | 4 ++--
 ...rtTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php | 4 ++--
 .../Test/Repository/DownloadableProductInjectable.php        | 1 +
 .../tests/app/Magento/Sales/Test/Block/Order/View.php        | 2 ++
 ...ssertTaxCalculationAfterCheckoutExcludingIncludingTax.php | 4 ++--
 .../AssertTaxCalculationAfterCheckoutExcludingTax.php        | 3 +--
 .../AssertTaxCalculationAfterCheckoutIncludingTax.php        | 3 +--
 ...ssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php | 5 +++--
 12 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
index 1132a5eba4d..64896843ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
 /**
  * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax
-    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
 {
     /**
      * Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
index f2674893728..60a4e36293d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -11,8 +11,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 /**
  * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax
-    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
 {
     /**
      * Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
index 88ee73b5067..653b30217db 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
 /**
  * Checks that prices incl tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax
-    extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
index a19281b101d..2ea9f0bc5bd 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
 /**
  * Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
  */
-class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax
-    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index a48b94174bc..eaa5d5e115f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
 /**
  * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
  */
-class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
-    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 61a282eda03..31fc3a1154b 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
 /**
  * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
  */
-class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
-    extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index 156d1c2348c..240e3b2b1b2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -21,6 +21,7 @@ class DownloadableProductInjectable extends AbstractRepository
      * @param array $defaultData [optional]
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function __construct(array $defaultConfig = [], array $defaultData = [])
     {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index f318d074c46..8e732491a44 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -12,6 +12,8 @@ use Mtf\Client\Element\Locator;
 /**
  * Class View
  * View block on order's view page
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class View extends Block
 {
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
index e4219643ae8..7d65c80e0ae 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Tax\Test\Constraint;
 /**
  * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutExcludingIncludingTax
-    extends AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutExcludingIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckout
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
index e925881d8ad..eecf9cc8c87 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -8,8 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 /**
  * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutExcludingTax extends
-    AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutExcludingTax extends AbstractAssertTaxCalculationAfterCheckout
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
index e7079263b0e..59869e99eaa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -9,8 +9,7 @@ namespace Magento\Tax\Test\Constraint;
 /**
  * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
  */
-class AssertTaxCalculationAfterCheckoutIncludingTax extends
-    AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutIncludingTax extends AbstractAssertTaxCalculationAfterCheckout
 {
     /**
      * Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
index 55ea81d13ce..b685b18e960 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -7,11 +7,12 @@
 namespace Magento\Tax\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
 /**
  * Checks that prices excl and incl tax on category, product and cart pages are equal to specified in dataset
  */
-class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax
-    extends AbstractAssertTaxRuleIsAppliedToAllPrices
+class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPrices
 {
     /**
      * Constraint severeness.
-- 
GitLab


From 845f627243a88035396623c51c56861dd73d9d90 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 15 Jan 2015 14:23:46 +0200
Subject: [PATCH 052/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 .../Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php  | 2 +-
 .../Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php      | 2 +-
 .../Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 08022e2638b..c7e342e81c5 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -93,7 +93,7 @@ class Option extends Form
         $this->_fill($mapping);
         $selections = $this->_rootElement->getElements($this->removeSelection);
         if (count($selections)) {
-            foreach ($selections as $itemSelection) {
+            foreach (array_reverse($selections) as $itemSelection) {
                 $itemSelection->click();
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index 27dacb30516..a449ffbd476 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -200,7 +200,7 @@ class Config extends Tab
     {
         $attributeElements = $this->_rootElement->getElements($this->attributeElement);
         $this->_rootElement->find($this->variationsContent)->click();
-        foreach ($attributeElements as $element) {
+        foreach (array_reverse($attributeElements) as $element) {
             $element->find($this->deleteVariationButton)->click();
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 597a596626d..275601b0631 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -83,7 +83,7 @@ class AssociatedProducts extends Tab
         if (isset($fields['associated'])) {
             $options = $this->_rootElement->getElements($this->deleteButton);
             if (count($options)) {
-                foreach ($options as $option) {
+                foreach (array_reverse($options) as $option) {
                     $option->click();
                 }
             }
-- 
GitLab


From 2b8ab4657466bff4b6e83eb8ca4bbef45b37e53b Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 15 Jan 2015 18:17:37 +0200
Subject: [PATCH 053/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/SalesRule/CalculatorTest.php        | 154 ++++++++++++++++--
 1 file changed, 141 insertions(+), 13 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
index b70631f2e42..b8e7b265792 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
@@ -5,35 +5,163 @@
  */
 namespace Magento\OfflineShipping\Model\SalesRule;
 
+class CalculatorForTest extends Calculator
+{
+    public function setValidatorUtility($validatorUtility)
+    {
+        $this->validatorUtility = $validatorUtility;
+    }
+}
+
 class CalculatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\OfflineShipping\Model\SalesRule\CalculatorForTest|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_model;
 
+    /**
+     * @var \Magento\Sales\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $itemMock;
+
+    /**
+     * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $utilityMock;
+
+    /**
+     * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $ruleMock;
+
+    /**
+     * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressMock;
+
     protected function setUp()
     {
-        $this->_model = $this->getMock(
-            'Magento\OfflineShipping\Model\SalesRule\Calculator',
-            ['_getRules', '__wakeup'],
-            [],
-            '',
-            false
-        );
-        $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
+        $this->utilityMock = $this->getMockBuilder('Magento\SalesRule\Model\Utility')
+            ->disableOriginalConstructor()
+            ->setMethods(['canProcessRule'])
+            ->getMock();
+
+        $this->_model = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\CalculatorForTest')
+            ->disableOriginalConstructor()
+            ->setMethods(['_getRules', '__wakeup'])
+            ->getMock();
+
+        $this->ruleMock = $this->getMockBuilder('Magento\SalesRule\Model\Rule')
+            ->disableOriginalConstructor()
+            ->setMethods(['getActions', 'getSimpleFreeShipping'])
+            ->getMock();
+
+        $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
+            ->disableOriginalConstructor()
+            ->setMethods(['setFreeShipping'])
+            ->getMock();
+
+        $this->_model->setValidatorUtility($this->utilityMock);
+
+        $this->itemMock = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress'], [], '', false);
+
+        $this->itemMock->expects($this->once())
+            ->method('getAddress')
+            ->willReturn($this->addressMock);
     }
 
     public function testProcessFreeShipping()
     {
-        $item = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress', '__wakeup'], [], '', false);
-        $item->expects($this->once())->method('getAddress')->will($this->returnValue(true));
+        $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
 
         $this->assertInstanceOf(
             'Magento\OfflineShipping\Model\SalesRule\Calculator',
-            $this->_model->processFreeShipping($item)
+            $this->_model->processFreeShipping($this->itemMock)
         );
+    }
+
+    public function testProcessFreeShippingContinueOnProcessRule()
+    {
+        $this->_model->expects($this->once())
+            ->method('_getRules')
+            ->willReturn(['rule1']);
+
+        $this->utilityMock->expects($this->once())
+            ->method('canProcessRule')
+            ->willReturn(false);
+
+        $this->_model->processFreeShipping($this->itemMock);
+    }
+
+    public function testProcessFreeShippingContinueOnValidateItem()
+    {
+        $this->utilityMock->expects($this->once())
+            ->method('canProcessRule')
+            ->willReturn(true);
+
+        $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
+            ->disableOriginalConstructor()
+            ->setMethods(['validate'])
+            ->getMock();
+
+        $actionsCollectionMock->expects($this->once())
+            ->method('validate')
+            ->willReturn(false);
+
+        $this->ruleMock->expects($this->once())
+            ->method('getActions')
+            ->willReturn($actionsCollectionMock);
+
+        $this->_model->expects($this->once())
+            ->method('_getRules')
+            ->willReturn([$this->ruleMock]);
+
+        $this->_model->processFreeShipping($this->itemMock);
+    }
 
-        return true;
+    /**
+     * @dataProvider rulesDataProvider
+     */
+    public function testProcessFreeShippingFreeShippingItem($rule)
+    {
+        $this->utilityMock->expects($this->once())
+            ->method('canProcessRule')
+            ->willReturn(true);
+
+        $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
+            ->disableOriginalConstructor()
+            ->setMethods(['validate'])
+            ->getMock();
+
+        $actionsCollectionMock->expects($this->once())
+            ->method('validate')
+            ->willReturn(true);
+
+        $this->ruleMock->expects($this->once())
+            ->method('getActions')
+            ->willReturn($actionsCollectionMock);
+
+        $this->_model->expects($this->once())
+            ->method('_getRules')
+            ->willReturn([$this->ruleMock]);
+
+        $this->ruleMock->expects($this->once())
+            ->method('getSimpleFreeShipping')
+            ->willReturn($rule);
+
+        $this->addressMock->expects(
+            $rule == \Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS ? $this->once() : $this->never()
+        )->method('setFreeShipping');
+
+        $this->_model->processFreeShipping($this->itemMock);
+    }
+
+    public function rulesDataProvider()
+    {
+        return [
+            [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ITEM],
+            [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS]
+        ];
     }
 }
-- 
GitLab


From ad849eb9601229aeaab1a409ba0c03de8e9f254f Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 15 Jan 2015 20:01:31 +0200
Subject: [PATCH 054/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/Quote/FreeshippingTest.php          | 133 ++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
new file mode 100644
index 00000000000..f422800d159
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Quote;
+
+class FreeshippingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Quote\Freeshipping|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressMock;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\SalesRule\Calculator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $calculatorMock;
+
+    protected function setUp()
+    {
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getQuote',
+                'getAllItems',
+                'getFreeShipping'
+            ])
+            ->getMock();
+
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
+            ->disableOriginalConstructor()
+            //->setMethods(['init'])
+            ->getMock();
+
+        $this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
+            'storeManager' => $this->storeManagerMock,
+            'calculator' => $this->calculatorMock
+        ]);
+    }
+
+
+    public function testCollectWithEmptyAddressItems()
+    {
+        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->addressMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($quoteMock);
+
+        $this->addressMock->expects($this->once())
+            ->method('getAllItems')
+            ->willReturn([]);
+
+        $this->assertSame($this->model->collect($this->addressMock), $this->model);
+    }
+
+    /**
+     * @dataProvider scenariosDataProvider
+     */
+    public function testCollectWithAddressItems(
+        $addressItemMockNoDiscountValue,
+        $addressMockGetFreeShippingExpects
+    ) {
+        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->addressMock->expects($this->any())
+            ->method('getQuote')
+            ->willReturn($quoteMock);
+
+        $addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
+            ->disableOriginalConstructor()
+            ->setMethods(['getNoDiscount', 'getFreeShipping'])
+            ->getMock();
+
+        $addressItemMock->expects($this->once())
+            ->method('getNoDiscount')
+            ->willReturn($addressItemMockNoDiscountValue);
+
+        $addressItemMock->expects($this->any())
+            ->method('getFreeShipping')
+            ->willReturn(true);
+
+        $this->addressMock->expects($addressMockGetFreeShippingExpects)
+            ->method('getFreeShipping')
+            ->willReturn(false);
+
+        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
+        $this->calculatorMock->expects($this->once())
+            ->method('init');
+
+        $this->addressMock->expects($this->once())
+            ->method('getAllItems')
+            ->willReturn([$addressItemMock]);
+
+        $this->model->collect($this->addressMock);
+    }
+
+    public function scenariosDataProvider()
+    {
+        return [
+            [true, $this->never()],
+            [false, $this->once()]
+        ];
+    }
+}
-- 
GitLab


From 42dfc8b4386f5a73424d3df9ce9f9395eccb1a7b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Thu, 15 Jan 2015 20:27:07 -0600
Subject: [PATCH 055/101] MAGETWO-29705: Fixed confusing Filesystem Read/Write
 Interfaces

---
 app/code/Magento/Backup/Model/Backup.php      |  6 +--
 .../Magento/Downloadable/Helper/Download.php  |  2 +-
 .../Downloadable/Helper/DownloadTest.php      |  2 +-
 .../App/View/Asset/PublisherTest.php          |  5 +-
 .../Filesystem/Directory/ReadTest.php         | 30 +----------
 .../Filesystem/File/ReadFactoryTest.php       | 46 +++++-----------
 .../Filesystem/File/WriteFactoryTest.php      | 54 ++++++-------------
 lib/internal/Magento/Framework/Filesystem.php | 10 ++--
 .../Framework/Filesystem/Directory/Read.php   | 17 ++----
 .../Filesystem/Directory/ReadFactory.php      |  6 +--
 .../Framework/Filesystem/Directory/Write.php  | 10 ++--
 .../Filesystem/Directory/WriteFactory.php     |  6 +--
 .../Filesystem/Directory/WriteInterface.php   |  3 +-
 .../Framework/Filesystem/File/ReadFactory.php | 23 ++++----
 .../Filesystem/File/WriteFactory.php          | 24 +++++----
 15 files changed, 88 insertions(+), 156 deletions(-)

diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
index e5ac0102187..52f720fea22 100644
--- a/app/code/Magento/Backup/Model/Backup.php
+++ b/app/code/Magento/Backup/Model/Backup.php
@@ -6,6 +6,7 @@
 namespace Magento\Backup\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 /**
  * Backup file item model
@@ -292,11 +293,10 @@ class Backup extends \Magento\Framework\Object implements \Magento\Framework\Bac
 
         try {
             /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $varDirectory */
-            $varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+            $varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR, DriverPool::ZLIB);
             $this->_stream = $varDirectory->openFile(
                 $this->_getFilePath(),
-                $mode,
-                \Magento\Framework\Filesystem\DriverPool::ZLIB
+                $mode
             );
         } catch (\Magento\Framework\Filesystem\FilesystemException $e) {
             throw new \Magento\Framework\Backup\Exception\NotEnoughPermissions(
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index d54c436b781..a83b739b5f5 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -168,7 +168,7 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
                     // Strip down protocol from path
                     $path = preg_replace('#.+://#', '', $path);
                 }
-                $this->_handle = $this->fileReadFactory->create($path, $protocol);
+                $this->_handle = $this->fileReadFactory->createWithDriverCode($path, $protocol);
             } elseif ($this->_linkType == self::LINK_TYPE_FILE) {
                 $this->_workingDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
                 $fileExists = $this->_downloadableFile->ensureFileInFilesystem($this->_resourceFile);
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
index a80e3f57e3a..0165294a2fd 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
@@ -226,7 +226,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase
         $this->fileReadFactory->expects(
             $this->once()
         )->method(
-            'create'
+            'createWithDriverCode'
         )->will(
             $this->returnValue($this->_handleMock)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
index 4b3658be219..6d5c40ea63d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Framework\App\View\Asset;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 class PublisherTest extends \PHPUnit_Framework_TestCase
 {
@@ -56,8 +57,8 @@ class PublisherTest extends \PHPUnit_Framework_TestCase
         $this->filesystem->expects($this->any())
             ->method('getDirectoryWrite')
             ->will($this->returnValueMap([
-                [DirectoryList::ROOT, $this->rootDirWrite],
-                [DirectoryList::STATIC_VIEW, $this->staticDirWrite],
+                [DirectoryList::ROOT, DriverPool::FILE, $this->rootDirWrite],
+                [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->staticDirWrite],
             ]));
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
index b84c08e9a72..640724c6bb5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
@@ -77,7 +77,7 @@ class ReadTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(['some-stat-data'], $this->read->stat('correct-path'));
     }
 
-    public function testReadFileNoProtocol()
+    public function testReadFile()
     {
         $path = 'filepath';
         $flag = 'flag';
@@ -95,32 +95,4 @@ class ReadTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($contents, $this->read->readFile($path, $flag, $context));
     }
-
-    public function testReadFileCustomProtocol()
-    {
-        $path = 'filepath';
-        $flag = 'flag';
-        $context = 'context';
-        $protocol = 'ftp';
-        $contents = 'contents';
-
-        $fileMock = $this->getMock('Magento\Framework\Filesystem\File\Read', [], [], '', false);
-        $fileMock->expects($this->once())
-            ->method('readAll')
-            ->with($flag, $context)
-            ->will($this->returnValue($contents));
-
-        $this->driver->expects($this->once())
-            ->method('getAbsolutePath')
-            ->with($this->path, $path, $protocol)
-            ->will($this->returnValue($path));
-        $this->driver->expects($this->never())
-            ->method('fileGetContents');
-        $this->fileFactory->expects($this->once())
-            ->method('create')
-            ->with($path, $protocol, $this->driver)
-            ->will($this->returnValue($fileMock));
-
-        $this->assertEquals($contents, $this->read->readFile($path, $flag, $context, $protocol));
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
index f41817b6cf3..ce7d66e4bac 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
@@ -12,45 +12,25 @@ use Magento\Framework\Filesystem\DriverPool;
  */
 class ReadFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @param string|null $protocol
-     * @param \PHPUnit_Framework_MockObject_MockObject|null $driver
-     * @dataProvider createProvider
-     */
-    public function testCreate($protocol, $driver)
+    public function testCreate()
     {
         $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
-        if ($protocol) {
-            $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
-            $driverMock->expects($this->any())->method('isExists')->willReturn(true);
-            $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
-        } else {
-            $driverPool->expects($this->never())->method('getDriver');
-        }
-        $factory = new ReadFactory($driverPool);
-        $result = $factory->create('path', $protocol, $driver);
-        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
-    }
-
-    /**
-     * @return array
-     */
-    public function createProvider()
-    {
+        $driverPool->expects($this->never())->method('getDriver');
         $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
         $driver->expects($this->any())->method('isExists')->willReturn(true);
-        return [
-            [null, $driver],
-            ['custom_protocol', null]
-        ];
+        $factory = new ReadFactory($driverPool);
+        $result = $factory->create('path', $driver);
+        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testCreateException()
+    public function testCreateWithDriverCode()
     {
-        $factory = new ReadFactory(new DriverPool());
-        $factory->create('path');
+        $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
+        $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+        $driverMock->expects($this->any())->method('isExists')->willReturn(true);
+        $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
+        $factory = new ReadFactory($driverPool);
+        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
index 256dbf1a7c3..579cc9766ae 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
@@ -5,63 +5,41 @@
  */
 namespace Magento\Framework\Filesystem\File;
 
-use Magento\Framework\Filesystem\DriverPool;
-
 /**
  * Class WriteFactoryTest
  */
 class WriteFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @param string|null $protocol
-     * @param \PHPUnit_Framework_MockObject_MockObject|null $driver
-     * @dataProvider createProvider
-     */
-    public function testCreate($protocol, $driver)
+    public function testCreate()
     {
         $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
-        if ($protocol) {
-            $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
-            $driverMock->expects($this->any())->method('isExists')->willReturn(true);
-            $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
-        } else {
-            $driverPool->expects($this->never())->method('getDriver');
-        }
+        $driverPool->expects($this->never())->method('getDriver');
         $factory = new WriteFactory($driverPool);
-        $result = $factory->create('path', $protocol, $driver);
-        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
-    }
-
-    /**
-     * @return array
-     */
-    public function createProvider()
-    {
         $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
         $driver->expects($this->any())->method('isExists')->willReturn(true);
-        return [
-            [null, $driver],
-            ['custom_protocol', null]
-        ];
+        $result = $factory->create('path', $driver);
+        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testCreateException()
+    public function testCreateWithDriverCode()
     {
-        $factory = new WriteFactory(new DriverPool());
-        $factory->create('path');
+        $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
+        $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+        $driverMock->expects($this->any())->method('isExists')->willReturn(true);
+        $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
+        $factory = new WriteFactory($driverPool);
+        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
     }
 
     public function testCreateWithMode()
     {
-        $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
-        $driver->expects($this->any())->method('isExists')->willReturn(false);
         $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
-        $driverPool->expects($this->once())->method('getDriver')->with('protocol')->willReturn($driver);
+        $driverPool->expects($this->never())->method('getDriver');
+        $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+        $driver->expects($this->any())->method('isExists')->willReturn(true);
         $factory = new WriteFactory($driverPool);
-        $result = $factory->create('path', 'protocol', null, 'a+');
+        $result = $factory->create('path', $driver, 'a+');
         $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index e55ea9d8b2d..9429da43b59 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework;
 
-use Magento\Framework\Filesystem\File\ReadInterface;
+use Magento\Framework\Filesystem\DriverPool;
 
 class Filesystem
 {
@@ -68,14 +68,16 @@ class Filesystem
     /**
      * Create an instance of directory with read permissions
      *
-     * @param string $code
+     * @param string $directoryCode
+     * @param string $driverCode
      * @return \Magento\Framework\Filesystem\Directory\WriteInterface
      * @throws \Magento\Framework\Filesystem\FilesystemException
      */
-    public function getDirectoryWrite($code)
+    public function getDirectoryWrite($directoryCode, $driverCode = DriverPool::FILE)
     {
+        $code = $directoryCode . '_' . $driverCode;
         if (!array_key_exists($code, $this->writeInstances)) {
-            $this->writeInstances[$code] = $this->writeFactory->create($this->getDirPath($code));
+            $this->writeInstances[$code] = $this->writeFactory->create($this->getDirPath($directoryCode), $driverCode);
         }
         return $this->writeInstances[$code];
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index 3d10c9741cd..33f09a43d32 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -181,15 +181,13 @@ class Read implements ReadInterface
      * Open file in read mode
      *
      * @param string $path
-     * @param string|null $protocol
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
      */
-    public function openFile($path, $protocol = null)
+    public function openFile($path)
     {
         return $this->fileFactory->create(
             $this->driver->getAbsolutePath($this->path, $path),
-            $protocol,
             $this->driver
         );
     }
@@ -200,21 +198,14 @@ class Read implements ReadInterface
      * @param string $path
      * @param string|null $flag
      * @param resource|null $context
-     * @param string|null $protocol
      * @return string
      * @throws FilesystemException
      */
-    public function readFile($path, $flag = null, $context = null, $protocol = null)
+    public function readFile($path, $flag = null, $context = null)
     {
-        $absolutePath = $this->driver->getAbsolutePath($this->path, $path, $protocol);
+        $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+        return $this->driver->fileGetContents($absolutePath, $flag, $context);
 
-        if (is_null($protocol)) {
-            return $this->driver->fileGetContents($absolutePath, $flag, $context);
-        }
-
-        /** @var \Magento\Framework\Filesystem\File\Read $fileReader */
-        $fileReader = $this->fileFactory->create($absolutePath, $protocol, $this->driver);
-        return $fileReader->readAll($flag, $context);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
index 423ed6166a3..e1a9b33ab7a 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
@@ -30,12 +30,12 @@ class ReadFactory
      * Create a readable directory
      *
      * @param string $path
-     * @param string $protocol
+     * @param string $driverCode
      * @return ReadInterface
      */
-    public function create($path, $protocol = DriverPool::FILE)
+    public function create($path, $driverCode = DriverPool::FILE)
     {
-        $driver = $this->driverPool->getDriver($protocol);
+        $driver = $this->driverPool->getDriver($driverCode);
         $factory = new \Magento\Framework\Filesystem\File\ReadFactory($this->driverPool);
         return new Read($factory, $driver, $path);
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index 6657360dc2a..18ff07a750e 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -197,16 +197,15 @@ class Write extends Read implements WriteInterface
      *
      * @param string $path
      * @param string $mode
-     * @param string|null $protocol
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      */
-    public function openFile($path, $mode = 'w', $protocol = null)
+    public function openFile($path, $mode = 'w')
     {
         $folder = dirname($path);
         $this->create($folder);
         $this->assertWritable($folder);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
-        return $this->fileFactory->create($absolutePath, $protocol, $this->driver, $mode);
+        return $this->fileFactory->create($absolutePath, $this->driver, $mode);
     }
 
     /**
@@ -215,13 +214,12 @@ class Write extends Read implements WriteInterface
      * @param string $path
      * @param string $content
      * @param string|null $mode
-     * @param string|null $protocol
      * @return int The number of bytes that were written.
      * @throws FilesystemException
      */
-    public function writeFile($path, $content, $mode = 'w+', $protocol = null)
+    public function writeFile($path, $content, $mode = 'w+')
     {
-        return $this->openFile($path, $mode, $protocol)->write($content);
+        return $this->openFile($path, $mode)->write($content);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
index 4585629cd98..809d86bb20b 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
@@ -30,13 +30,13 @@ class WriteFactory
      * Create a readable directory
      *
      * @param string $path
-     * @param string $protocol
+     * @param string $driverCode
      * @param int $createPermissions
      * @return \Magento\Framework\Filesystem\Directory\Write
      */
-    public function create($path, $protocol = DriverPool::FILE, $createPermissions = null)
+    public function create($path, $driverCode = DriverPool::FILE, $createPermissions = null)
     {
-        $driver = $this->driverPool->getDriver($protocol);
+        $driver = $this->driverPool->getDriver($driverCode);
         $factory = new \Magento\Framework\Filesystem\File\WriteFactory($this->driverPool);
         return new Write($factory, $driver, $path, $createPermissions);
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
index df05fb18b13..ba46d247d48 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
@@ -80,10 +80,9 @@ interface WriteInterface extends ReadInterface
      *
      * @param string $path
      * @param string $mode
-     * @param string|null $protocol
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      */
-    public function openFile($path, $mode = 'w', $protocol = null);
+    public function openFile($path, $mode = 'w');
 
     /**
      * Open file in given path
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index d142ee2a284..1dccce253ac 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -31,18 +31,23 @@ class ReadFactory
      * Create a readable file
      *
      * @param string $path
-     * @param string|null $protocol [optional]
-     * @param DriverInterface $driver [optional]
+     * @param DriverInterface $driver
      * @return \Magento\Framework\Filesystem\File\ReadInterface
-     * @throws \InvalidArgumentException
      */
-    public function create($path, $protocol = null, DriverInterface $driver = null)
+    public function create($path, DriverInterface $driver = null)
     {
-        if ($protocol) {
-            $driver = $this->driverPool->getDriver($protocol);
-        } elseif (!$driver) {
-            throw new \InvalidArgumentException('Either driver or protocol must be specified.');
-        }
         return new Read($path, $driver);
     }
+
+    /**
+     * Create a readable file
+     *
+     * @param string $path
+     * @param string|null $driverCode
+     * @return \Magento\Framework\Filesystem\File\ReadInterface
+     */
+    public function createWithDriverCode($path, $driverCode)
+    {
+        return new Read($path, $this->driverPool->getDriver($driverCode));
+    }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 95a764a0e41..1a309eb0274 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -31,19 +31,25 @@ class WriteFactory
      * Create a readable file.
      *
      * @param string $path
-     * @param string|null $protocol [optional]
-     * @param DriverInterface $driver [optional]
+     * @param DriverInterface $driver
      * @param string $mode [optional]
      * @return Write
-     * @throws \InvalidArgumentException
      */
-    public function create($path, $protocol = null, DriverInterface $driver = null, $mode = 'r')
+    public function create($path, DriverInterface $driver, $mode = 'r')
     {
-        if ($protocol) {
-            $driver = $this->driverPool->getDriver($protocol);
-        } elseif (!$driver) {
-            throw new \InvalidArgumentException('Either driver or protocol must be specified.');
-        }
         return new Write($path, $driver, $mode);
     }
+
+    /**
+     * Create a readable file.
+     *
+     * @param string $path
+     * @param string $driverCode
+     * @param string $mode [optional]
+     * @return Write
+     */
+    public function createWithDriverCode($path, $driverCode, $mode = 'r')
+    {
+        return new Write($path, $this->driverPool->getDriver($driverCode), $mode);
+    }
 }
-- 
GitLab


From 1de6a4227e5ddc8d248ef35e67978c7c595a7f40 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 14:30:42 +0200
Subject: [PATCH 056/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/Quote/FreeshippingTest.php          | 95 ++++++++++++++-----
 1 file changed, 70 insertions(+), 25 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
index f422800d159..2259ed7829d 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
@@ -36,7 +36,8 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
             ->setMethods([
                 'getQuote',
                 'getAllItems',
-                'getFreeShipping'
+                'getFreeShipping',
+                'setFreeShipping'
             ])
             ->getMock();
 
@@ -44,9 +45,17 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
+        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
         $this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
             ->disableOriginalConstructor()
-            //->setMethods(['init'])
+            ->setMethods(['init', 'processFreeShipping'])
             ->getMock();
 
         $this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
@@ -75,59 +84,95 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider scenariosDataProvider
+     * @param $isNoDiscount
      */
-    public function testCollectWithAddressItems(
-        $addressItemMockNoDiscountValue,
-        $addressMockGetFreeShippingExpects
-    ) {
+    public function testCollectWithAddressItems($isNoDiscount)
+    {
         $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->addressMock->expects($this->any())
+        $this->addressMock->expects($this->once())
             ->method('getQuote')
             ->willReturn($quoteMock);
 
         $addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
             ->disableOriginalConstructor()
-            ->setMethods(['getNoDiscount', 'getFreeShipping'])
+            ->setMethods([
+                'getNoDiscount',
+                'setFreeShipping',
+                'getParentItemId',
+                'getFreeShipping',
+                'getHasChildren',
+                'isChildrenCalculated',
+                'getChildren'
+            ])
             ->getMock();
 
+        $this->addressMock->expects($this->once())
+            ->method('getAllItems')
+            ->willReturn([$addressItemMock]);
+
+        $this->calculatorMock->expects($this->once())
+            ->method('init');
+
         $addressItemMock->expects($this->once())
             ->method('getNoDiscount')
-            ->willReturn($addressItemMockNoDiscountValue);
+            ->willReturn($isNoDiscount);
 
-        $addressItemMock->expects($this->any())
+        $addressItemMock->expects($isNoDiscount ? $this->once() : $this->never())
+            ->method('setFreeShipping');
+
+        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('getParentItemId')
+            ->willReturn(false);
+
+        $this->calculatorMock->expects($isNoDiscount ? $this->never() : $this->exactly(2))
+            ->method('processFreeShipping');
+
+        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
             ->method('getFreeShipping')
             ->willReturn(true);
 
-        $this->addressMock->expects($addressMockGetFreeShippingExpects)
-            ->method('getFreeShipping')
-            ->willReturn(false);
+        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('getHasChildren')
+            ->willReturn(true);
 
-        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('isChildrenCalculated')
+            ->willReturn(true);
+
+        $childMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item\AbstractItem')
             ->disableOriginalConstructor()
+            ->setMethods(['setFreeShipping', 'getQuote', 'getAddress', 'getOptionByCode'])
             ->getMock();
 
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
-            ->willReturn($storeMock);
+        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('getChildren')
+            ->willReturn([$childMock]);
 
-        $this->calculatorMock->expects($this->once())
-            ->method('init');
+        $childMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('setFreeShipping');
 
-        $this->addressMock->expects($this->once())
-            ->method('getAllItems')
-            ->willReturn([$addressItemMock]);
+        $this->addressMock->expects($isNoDiscount ? $this->never() : $this->once())
+            ->method('getFreeShipping')
+            ->willReturn(false);
 
-        $this->model->collect($this->addressMock);
+        $this->addressMock->expects($isNoDiscount ? $this->once() : $this->exactly(2))
+            ->method('setFreeShipping');
+
+        $this->assertSame($this->model->collect($this->addressMock), $this->model);
     }
 
     public function scenariosDataProvider()
     {
         return [
-            [true, $this->never()],
-            [false, $this->once()]
+            [
+                true,  // there is no a discount
+            ],
+            [
+                false, // there is a discount
+            ]
         ];
     }
 }
-- 
GitLab


From 73e34b8d3ce07123d4ffabfdbe5b254c38416159 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 16:01:22 +0200
Subject: [PATCH 057/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Checkout/Block/Cart/ShippingTest.php      | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
new file mode 100644
index 00000000000..21bdf26edee
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\SalesRule;
+
+class ShippingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart\Shipping
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeConfigMock;
+
+    protected function setUp()
+    {
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->scopeConfigMock = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getValue',
+                'isSetFlag'
+            ])
+            ->getMock();
+
+        $this->model = $helper->getObject('\Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart\Shipping', [
+            'scopeConfig' => $this->scopeConfigMock
+        ]);
+    }
+
+    /**
+     * @dataProvider afterGetStateActiveDataProvider
+     */
+    public function testAfterGetStateActive($scopeConfigMockReturnValue, $result, $assertResult)
+    {
+        /** @var \Magento\Checkout\Block\Cart\Shipping $subjectMock */
+        $subjectMock = $this->getMockBuilder('Magento\Checkout\Block\Cart\Shipping')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeConfigMock->expects($result ? $this->never() : $this->once())
+            ->method('getValue')
+            ->willReturn($scopeConfigMockReturnValue);
+
+        $this->assertEquals($this->model->afterGetStateActive($subjectMock, $result), $assertResult);
+    }
+
+    public function afterGetStateActiveDataProvider()
+    {
+        return [
+            [
+                true,
+                true,
+                true
+            ],
+            [
+                true,
+                false,
+                true
+            ],
+            [
+                false,
+                false,
+                false
+            ]
+        ];
+    }
+}
-- 
GitLab


From dc9ee3266afd510499f2705b206b610dad395e8d Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Fri, 16 Jan 2015 16:22:23 +0200
Subject: [PATCH 058/101] MAGETWO-31966: Empty title for success placed order
 page

---
 .../view/frontend/layout/multishipping_checkout_success.xml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
index 5ea53255269..e9bca9477d8 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
@@ -7,6 +7,9 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="multishipping_checkout"/>
+    <head>
+        <title>Success Page</title>
+    </head>
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-- 
GitLab


From 7609552e98d8725f104471655613bce55a1373c2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Fri, 16 Jan 2015 16:51:12 +0200
Subject: [PATCH 059/101] MAGETWO-31967: Exception page instead of 404 when
 edit url for product with required configuration

---
 .../Magento/Checkout/Controller/Cart/ConfigureTest.php      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 7548af64e81..4a49e870ac2 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Cart;
 
-- 
GitLab


From 1b9eb600a27f4f49c4f25982c0ef05516d7c7fe3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 16:21:18 +0200
Subject: [PATCH 060/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/Config/Backend/TablerateTest.php    | 50 +++++++++++++++++
 .../Model/Config/Source/FlatrateTest.php      | 30 +++++++++++
 .../Observer/SalesRule/ActionsTabTest.php     | 54 +++++++++++++++++++
 .../Checkout/Block/Cart/ShippingTest.php      |  2 +-
 4 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
new file mode 100644
index 00000000000..869c408052d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Backend;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Config\Backend\Tablerate
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableateFactoryMock;
+
+    protected function setUp()
+    {
+        $this->tableateFactoryMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->model = $helper->getObject('\Magento\OfflineShipping\Model\Config\Backend\Tablerate', [
+            'tablerateFactory' => $this->tableateFactoryMock
+        ]);
+    }
+
+    public function testAfterSave()
+    {
+        $tablerateMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\Tablerate')
+            ->disableOriginalConstructor()
+            ->setMethods(['uploadAndImport'])
+            ->getMock();
+
+        $this->tableateFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($tablerateMock);
+
+        $tablerateMock->expects($this->once())
+            ->method('uploadAndImport')
+            ->with($this->model);
+
+        $this->model->afterSave();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
new file mode 100644
index 00000000000..c133cd1e07d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class FlatrateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Config\Source\Flatrate
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->model = new Flatrate();
+    }
+
+    public function testToOptionArray()
+    {
+        $expected = [
+            ['value' => '', 'label' => __('None')],
+            ['value' => 'O', 'label' => __('Per Order')],
+            ['value' => 'I', 'label' => __('Per Item')]
+        ];
+
+        $this->assertEquals($expected, $this->model->toOptionArray());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
new file mode 100644
index 00000000000..f3ab5f5ca4f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Observer\SalesRule;
+
+class ActionsTabTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Observer\SalesRule\ActionsTab
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->model = new ActionsTab();
+    }
+
+    public function testPrepareForm()
+    {
+        $observerMock = $this->getMockBuilder('\Magento\Framework\Event\Observer')
+            ->disableOriginalConstructor()
+            ->setMethods(['getForm'])
+            ->getMock();
+
+        $formMock = $this->getMockBuilder('\Magento\Framework\Data\Form')
+            ->disableOriginalConstructor()
+            ->setMethods(['getElements'])
+            ->getMock();
+
+        $elementMock = $this->getMockBuilder('\Magento\Framework\Data\Form\Element\AbstractElement')
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'addField'])
+            ->getMock();
+
+        $elementMock->expects($this->once())
+            ->method('getId')
+            ->willReturn('action_fieldset');
+
+        $elementMock->expects($this->once())
+            ->method('addField');
+
+        $formMock->expects($this->once())
+            ->method('getElements')
+            ->willReturn([$elementMock]);
+
+        $observerMock->expects($this->once())
+            ->method('getForm')
+            ->willReturn($formMock);
+
+        $this->model->prepareForm($observerMock);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
index 21bdf26edee..3e82bce9295 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\OfflineShipping\Model\SalesRule;
+namespace Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart;
 
 class ShippingTest extends \PHPUnit_Framework_TestCase
 {
-- 
GitLab


From 83eb12a0bfdb6347456df02e6a83211ab07dec8f Mon Sep 17 00:00:00 2001
From: David Alger <david@classyllama.com>
Date: Fri, 16 Jan 2015 16:57:10 -0600
Subject: [PATCH 061/101] Added ignore rule for media assets in wysiwyg
 directory.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 39241df7fdd..657c315552e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,8 @@ atlassian*
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess
+/pub/media/wysiwyg/*
+!/pub/media/wysiwyg/.htaccess
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
 /pub/static/*
-- 
GitLab


From b328d83bfc10625ad568362e3478955bcc6260f2 Mon Sep 17 00:00:00 2001
From: Steve Robbins <steven.j.robbins@gmail.com>
Date: Fri, 16 Jan 2015 23:59:18 -0800
Subject: [PATCH 062/101] Adding OSL license file name

---
 COPYING.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/COPYING.txt b/COPYING.txt
index 7fafaa3e23d..d7d04f5b7ed 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -1,7 +1,7 @@
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 
 http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
+Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
 
-Subject to Licensee’s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
+Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
 Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
\ No newline at end of file
-- 
GitLab


From 14a47b68739e0292944ede8aff9ee14be29b8008 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 17:18:43 +0200
Subject: [PATCH 063/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Adminhtml/Carrier/Tablerate/GridTest.php  | 80 +++++++++++++++++++
 .../Model/Config/Source/TablerateTest.php     | 47 +++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
new file mode 100644
index 00000000000..4261fd95380
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate;
+
+class GridTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $context = $objectManager->getObject('Magento\Backend\Block\Template\Context', [
+            'storeManager' => $this->storeManagerMock
+        ]);
+
+        $this->model = $objectManager->getObject('Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid', [
+            'context' => $context,
+        ]);
+    }
+
+    public function testSetWebsiteId()
+    {
+        $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($websiteMock);
+
+        $this->model->setWebsiteId(1);
+    }
+
+    public function testGetWebsiteId()
+    {
+        $websiteId = 10;
+
+        $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($websiteId);
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($websiteMock);
+
+        $this->assertEquals($websiteId, $this->model->getWebsiteId());
+    }
+
+    public function testSetConditionName()
+    {
+        $this->assertEquals($this->model, $this->model->setConditionName('someName'));
+    }
+
+    public function testGetConditionName()
+    {
+        $conditionName = 'someName';
+        $this->assertEquals($conditionName, $this->model->setConditionName($conditionName)->getConditionName());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
new file mode 100644
index 00000000000..8eea5073c3f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Config\Source\Tablerate
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\Carrier\Tablerate|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $carrierTablerateMock;
+
+    protected function setUp()
+    {
+        $this->carrierTablerateMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Carrier\Tablerate')
+            ->disableOriginalConstructor()
+            ->setMethods(['getCode'])
+            ->getMock();
+
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->model = $helper->getObject('Magento\OfflineShipping\Model\Config\Source\Tablerate', [
+            'carrierTablerate' => $this->carrierTablerateMock
+        ]);
+    }
+
+    public function testToOptionArray()
+    {
+        $codes = [1, 2, 3, 4, 5];
+        $expected = [];
+        foreach ($codes as $k => $v) {
+            $expected[] = ['value' => $k, 'label' => $v];
+        }
+
+        $this->carrierTablerateMock->expects($this->once())
+            ->method('getCode')
+            ->willReturn($codes);
+
+        $this->assertEquals($expected, $this->model->toOptionArray());
+    }
+}
-- 
GitLab


From 6c311ce4406c8d1010694b85f7e8fabd96e8c71c Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 19 Jan 2015 13:59:47 +0200
Subject: [PATCH 064/101] MAGETWO-32782: [TD] Third party interfaces are not
 supported by single-tenant compiler

- implemented check for external interfaces mention in preferences configuration
- removed obsolete types from config
---
 app/code/Magento/Backend/etc/di.xml           |   1 -
 app/code/Magento/Core/etc/di.xml              |   2 -
 .../Tools/Di/Compiler/Config/ReaderTest.php   | 239 +++++++++++++-----
 .../Tools/Di/Code/Reader/ClassesScanner.php   |   2 +-
 .../Tools/Di/Compiler/Config/Reader.php       |  24 +-
 .../Tools/Di/Definition/Collection.php        |   8 +-
 .../ObjectManager/Config/Compiled.php         |  10 +
 .../Framework/ObjectManager/Config/Config.php |  10 +
 .../ObjectManager/ConfigInterface.php         |   7 +
 9 files changed, 233 insertions(+), 70 deletions(-)

diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 2871ef2508f..5445af580b2 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -12,7 +12,6 @@
     <preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
     <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
-    <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
     <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
     <preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
     <preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index cc73a8a5b38..3b6eb72b2b3 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -14,14 +14,12 @@
     <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
     <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
     <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
-    <preference for="Magento\Core\Model\DataService\ConfigInterface" type="Magento\Core\Model\DataService\Config" />
     <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
     <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
     <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
     <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
     <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Core\Model\Theme\File" />
     <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
-    <preference for="Magento\Core\Model\Url\SecurityInfoInterface" type="Magento\Core\Model\Url\SecurityInfo\Proxy" />
     <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
     <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
     <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index 7ccdb02d206..5bfc5e0cc70 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Tools\Di\Compiler\Config;
 
+use Magento\Framework\App\Area;
+use Magento\Tools\Di\Definition\Collection;
+
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -54,6 +57,9 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
             false
         );
         $this->argumentsResolver = $this->getMock('Magento\Tools\Di\Compiler\ArgumentsResolver', [], [], '', false);
+        $this->argumentsResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->argumentsResolver);
         $this->classReaderDecorator = $this->getMock(
             'Magento\Tools\Di\Code\Reader\ClassReaderDecorator',
             [],
@@ -72,71 +78,182 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function testGenerateCachePerScopeExtends()
+    public function testGenerateCachePerScopeGlobal()
     {
-        $definitionsCollection = $this->getMock('Magento\Tools\Di\Definition\Collection', [], [], '', false);
-        $this->diContainerConfig->expects($this->once())
-            ->method('extend')
-            ->with([]);
-        $this->configLoader->expects($this->once())
-            ->method('load')
-            ->with('areaCode')
-            ->willReturn([]);
-
-        $this->argumentsResolverFactory->expects($this->once())
-            ->method('create')
-            ->with($this->diContainerConfig)
-            ->willReturn($this->argumentsResolver);
-        $definitionsCollection->expects($this->exactly(2))
-            ->method('getInstancesNamesList')
-            ->willReturn(['instanceType1'], ['instanceType2']);
-        $definitionsCollection->expects($this->once())
-            ->method('getInstanceArguments')
-            ->willReturnMap([
-                ['instanceType1', null],
-                ['instanceType2', ['arg1', 'arg2']],
-            ]);
-        $this->typeReader->expects($this->exactly(3))
-            ->method('isConcrete')
-            ->willReturnMap([
-                ['instanceType1', true],
-                ['instanceType2', false],
-                ['originalType1', true],
-                ['originalType2', false],
-            ]);
-        $this->argumentsResolver->expects($this->exactly(2))
-            ->method('getResolvedConstructorArguments')
-            ->willReturnMap([
-                ['instanceType1', 'resolvedConstructor1'],
-                ['instanceVirtualType1', 'resolvedConstructor2'],
-            ]);
-        $this->diContainerConfig->expects($this->exactly(2))
+        $definitionCollection = $this->getDefinitionsCollection();
+        $this->diContainerConfig->expects($this->any())
             ->method('getVirtualTypes')
-            ->willReturn(['instanceVirtualType1' => 1, 'instanceVirtualType2' => 2]);
-        $this->diContainerConfig->expects($this->exactly(4))
+            ->willReturn($this->getVirtualTypes());
+        $this->diContainerConfig->expects($this->any())
+            ->method('getPreferences')
+            ->willReturn($this->getPreferences());
+
+        $getResolvedConstructorArgumentsMap = $this->getResolvedVirtualConstructorArgumentsMap(
+            $definitionCollection,
+            $this->getVirtualTypes()
+        );
+
+        $this->diContainerConfig->expects($this->any())
             ->method('getInstanceType')
-            ->willReturnMap([
-                ['instanceVirtualType1', 'originalType1'],
-                ['instanceVirtualType2', 'originalType2'],
-            ]);
-        $definitionsCollection->expects($this->exactly(2))
-            ->method('hasInstance')
-            ->willReturn('');
-        $this->classReaderDecorator->expects($this->once())
-            ->method('getConstructor')
-            ->willReturn('constructor');
-        $this->diContainerConfig->expects($this->once())
+            ->willReturnMap($this->getInstanceTypeMap($this->getVirtualTypes()));
+
+        $this->diContainerConfig->expects($this->any())
             ->method('isShared')
-            ->willReturnMap([
-                ['instanceType1', true],
-                ['instanceType2', false],
-            ]);
-        $this->diContainerConfig->expects($this->once())
+            ->willReturnMap($this->getExpectedNonShared());
+
+        $this->diContainerConfig->expects($this->any())
             ->method('getPreference')
-            ->willReturnMap([
-                ['instanceType1', 'instanceType1ss'],
-                ['instanceType2', 'instanceType2'],
-            ]);
-        $this->model->generateCachePerScope($definitionsCollection, 'areaCode');
+            ->willReturnMap($this->getPreferencesMap());
+
+        $isConcreteMap = [];
+        foreach($definitionCollection->getInstancesNamesList() as $instanceType) {
+            $isConcreteMap[] = [$instanceType, strpos($instanceType, 'Interface') === false];
+
+            $getResolvedConstructorArgumentsMap[] = [
+                $instanceType,
+                $definitionCollection->getInstanceArguments($instanceType),
+                $this->getResolvedArguments(
+                    $definitionCollection->getInstanceArguments($instanceType)
+                )
+            ];
+        }
+
+        $this->typeReader->expects($this->any())
+            ->method('isConcrete')
+            ->willReturnMap($isConcreteMap);
+        $this->argumentsResolver->expects($this->any())
+            ->method('getResolvedConstructorArguments')
+            ->willReturnMap($getResolvedConstructorArgumentsMap);
+
+        $this->assertEquals(
+            $this->getExpectedGlobalConfig(),
+            $this->model->generateCachePerScope($definitionCollection, Area::AREA_GLOBAL)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    private function getExpectedGlobalConfig()
+    {
+        return [
+            'arguments' => [
+                'ConcreteType1' => serialize(['resolved_argument1', 'resolved_argument2']),
+                'ConcreteType2' => serialize(['resolved_argument1', 'resolved_argument2']),
+                'virtualType1' => serialize(['resolved_argument1', 'resolved_argument2'])
+            ],
+            'nonShared' => [
+                'ConcreteType2' => true,
+                'ThirdPartyInterface' => true
+            ],
+            'preferences' => $this->getPreferences(),
+            'instanceTypes' => $this->getVirtualTypes(),
+        ];
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getDefinitionsCollection()
+    {
+        $definitionCollection = new Collection();
+        $definitionCollection->addDefinition('ConcreteType1', ['argument1', 'argument2']);
+        $definitionCollection->addDefinition('ConcreteType2', ['argument1', 'argument2']);
+        $definitionCollection->addDefinition('Interface1', [null]);
+
+        return $definitionCollection;
+    }
+
+    /**
+     * @return array
+     */
+    private function getVirtualTypes()
+    {
+        return ['virtualType1' => 'ConcreteType1'];
+    }
+
+    /**
+     * @return array
+     */
+    private function getExpectedNonShared()
+    {
+        return [
+            ['ConcreteType1', true],
+            ['ConcreteType2', false],
+            ['Interface1', true],
+            ['ThirdPartyInterface', false]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getPreferences()
+    {
+        return [
+            'Interface1' => 'ConcreteType1',
+            'ThirdPartyInterface' => 'ConcreteType2'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getPreferencesMap()
+    {
+        return [
+            ['ConcreteType1', 'ConcreteType1'],
+            ['ConcreteType2', 'ConcreteType2'],
+            ['Interface1', 'ConcreteType1'],
+            ['ThirdPartyInterface', 'ConcreteType2']
+        ];
+    }
+
+    /**
+     * @param array $arguments
+     * @return array|null
+     */
+    private function getResolvedArguments($arguments)
+    {
+        return empty($arguments) ? null : array_map(
+            function($argument) {
+                return 'resolved_' . $argument;
+            },
+            $arguments
+        );
+    }
+
+    /**
+     * @param array $virtualTypes
+     * @return array
+     */
+    private function getInstanceTypeMap($virtualTypes)
+    {
+        $getInstanceTypeMap = [];
+        foreach ($virtualTypes as $virtualType => $concreteType) {
+            $getInstanceTypeMap[] = [$virtualType, $concreteType];
+        }
+
+        return $getInstanceTypeMap;
+    }
+
+    /**
+     * @param Collection $definitionCollection
+     * @param array $virtualTypes
+     * @return array
+     */
+    private function getResolvedVirtualConstructorArgumentsMap(Collection $definitionCollection, array $virtualTypes)
+    {
+        $getResolvedConstructorArgumentsMap = [];
+        foreach ($virtualTypes as $virtualType => $concreteType) {
+            $getResolvedConstructorArgumentsMap[] = [
+                $virtualType,
+                $definitionCollection->getInstanceArguments($concreteType),
+                $this->getResolvedArguments(
+                    $definitionCollection->getInstanceArguments($concreteType)
+                )
+            ];
+        }
+        return $getResolvedConstructorArgumentsMap;
     }
 }
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
index 42076377419..97063a236a2 100644
--- a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
+++ b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
@@ -41,7 +41,7 @@ class ClassesScanner
         }
         $classes = [];
         $recursiveIterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($realPath),
+            new \RecursiveDirectoryIterator($realPath, \FilesystemIterator::FOLLOW_SYMLINKS),
             \RecursiveIteratorIterator::SELF_FIRST
         );
         /** @var $fileItem \SplFileInfo */
diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 8dca09ef4e2..126d1eaf554 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -49,7 +49,7 @@ class Reader
      * @param Type $typeReader
      */
     public function __construct(
-        \Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig,
+        ConfigInterface $diContainerConfig,
         App\ObjectManager\ConfigLoader $configLoader,
         ArgumentsResolverFactory $argumentsResolverFactory,
         ClassReaderDecorator $classReaderDecorator,
@@ -86,6 +86,8 @@ class Reader
                 $config['arguments'][$key] = serialize($value);
             }
         }
+
+        $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
         foreach ($definitionsCollection->getInstancesNamesList() as $instanceName) {
             if (!$areaConfig->isShared($instanceName)) {
                 $config['nonShared'][$instanceName] = true;
@@ -95,6 +97,7 @@ class Reader
                 $config['preferences'][$instanceName] = $preference;
             }
         }
+
         foreach (array_keys($areaConfig->getVirtualTypes()) as $virtualType) {
             $config['instanceTypes'][$virtualType] = $areaConfig->getInstanceType($virtualType);
         }
@@ -140,4 +143,23 @@ class Reader
         }
         return $constructors;
     }
+
+    /**
+     * Returns preferences for third party code
+     *
+     * @param ConfigInterface $config
+     * @param DefinitionsCollection $definitionsCollection
+     */
+    private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
+    {
+        $definedInstances = $definitionsCollection->getInstancesNamesList();
+
+        foreach ($config->getPreferences() as $interface => $preference) {
+            if (in_array($interface, $definedInstances)) {
+                continue;
+            }
+
+            $definitionsCollection->addDefinition($interface, []);
+        }
+    }
 }
diff --git a/dev/tools/Magento/Tools/Di/Definition/Collection.php b/dev/tools/Magento/Tools/Di/Definition/Collection.php
index 82638c7c557..2fbde66b294 100644
--- a/dev/tools/Magento/Tools/Di/Definition/Collection.php
+++ b/dev/tools/Magento/Tools/Di/Definition/Collection.php
@@ -33,7 +33,7 @@ class Collection
      *
      * @return void
      */
-    public function initialize($definitions)
+    public function initialize(array $definitions)
     {
         $this->definitions = $definitions;
     }
@@ -54,7 +54,7 @@ class Collection
      * Add new definition for instance
      *
      * @param string $instance
-     * @param array $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
@@ -63,11 +63,11 @@ class Collection
         $this->definitions[$instance] = $arguments;
     }
 
-    /**
+    /**+
      * Returns instance arguments
      *
      * @param string $instanceName
-     * @return null
+     * @return null|array
      */
     public function getInstanceArguments($instanceName)
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 131e4bfcbaa..a7484882066 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -145,4 +145,14 @@ class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
     {
         return $this->virtualTypes;
     }
+
+    /**
+     * Returns list on preferences
+     *
+     * @return array
+     */
+    public function getPreferences()
+    {
+        return $this->preferences;
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index 29c0432bdc5..6f05e61be53 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -313,4 +313,14 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
     {
         return $this->_virtualTypes;
     }
+
+    /**
+     * Returns list on preferences
+     *
+     * @return array
+     */
+    public function getPreferences()
+    {
+        return $this->_preferences;
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
index 9e023fcc5e3..8f8f91297dc 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
@@ -72,4 +72,11 @@ interface ConfigInterface
      * @return void
      */
     public function extend(array $configuration);
+
+    /**
+     * Returns list on preferences
+     *
+     * @return array
+     */
+    public function getPreferences();
 }
-- 
GitLab


From a59c1960866c5497db31b3e12247a682c0af042f Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 19 Jan 2015 16:32:26 +0200
Subject: [PATCH 065/101] MAGETWO-32782: [TD] Third party interfaces are not
 supported by single-tenant compiler

- fixed fill of third party interfaces
---
 dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 126d1eaf554..79ce889e6ff 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -80,6 +80,8 @@ class Reader
         }
 
         $config = [];
+        
+        $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
         $config['arguments'] = $this->getConfigForScope($definitionsCollection, $areaConfig);
         foreach ($config['arguments'] as $key => $value) {
             if ($value !== null) {
@@ -87,7 +89,6 @@ class Reader
             }
         }
 
-        $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
         foreach ($definitionsCollection->getInstancesNamesList() as $instanceName) {
             if (!$areaConfig->isShared($instanceName)) {
                 $config['nonShared'][$instanceName] = true;
-- 
GitLab


From 887afb4eda2fc78ad71e5a5d5ba8360f8b3e85d6 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 18:13:30 +0200
Subject: [PATCH 066/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 .../Test/Block/Adminhtml/Category/Edit/Tab/Product.php    | 5 ++---
 .../Block/Adminhtml/Product/Edit/Tab/ProductDetails.php   | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 1ae74d61908..5b5054cda3d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -9,7 +9,6 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
-use Mtf\Client\Element;
 
 /**
  * Products grid of Category Products tab.
@@ -51,10 +50,10 @@ class Product extends Tab
      * Get data of tab.
      *
      * @param array|null $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return array
      */
-    public function getDataFormTab($fields = null, Element $element = null)
+    public function getDataFormTab($fields = null, SimpleElement $element = null)
     {
         $data = $this->dataMapping($fields);
         $result = [];
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
index 6d4db31a1b2..a78b3fef4db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
 
 /**
  * Product details tab.
@@ -32,10 +32,10 @@ class ProductDetails extends \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\
      * Fill data to fields on tab.
      *
      * @param array $fields
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fillFormTab(array $fields, Element $element = null)
+    public function fillFormTab(array $fields, SimpleElement $element = null)
     {
         $data = $this->dataMapping($fields);
 
-- 
GitLab


From 421e77b375ccb3b82e9143eca4134b9dfc5dbf31 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 19:23:54 +0200
Subject: [PATCH 067/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 .../functional/lib/Mtf/Client/Element/SelectstoreElement.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
index b919dd2b79c..f2e914969f2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
@@ -63,7 +63,7 @@ class SelectstoreElement extends SelectElement
                 . $pieces[2] . '")]';
         }
 
-        $option = $this->_context->find($optionLocator, Locator::SELECTOR_XPATH);
+        $option = $this->context->find($optionLocator, Locator::SELECTOR_XPATH);
         if (!$option->isVisible()) {
             throw new \Exception('[' . implode('/', $pieces) . '] option is not visible in store switcher.');
         }
-- 
GitLab


From e2c43cacbf931c6e3e187c6e94498963bebb40f3 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 20:56:16 +0200
Subject: [PATCH 068/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 .../functional/lib/Mtf/Client/Element/ConditionsElement.php | 2 +-
 .../app/Magento/Customer/Test/Block/Form/CustomerForm.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 54a3f66d6c7..eeaed524ba2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -84,7 +84,7 @@ class ConditionsElement extends SimpleElement
      *
      * @var string
      */
-    protected $created = './ul/li[1]';
+    protected $created = './ul/li[span[contains(@class,"rule-param-new-child")]]/preceding-sibling::li[1]';
 
     /**
      * Children condition
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
index 4e550698337..259a8e0d8e0 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Block\Form;
 
 use Mtf\Block\Form;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
 use Mtf\Fixture\FixtureInterface;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 
@@ -51,10 +51,10 @@ class CustomerForm extends Form
      * Fill the customer data
      *
      * @param FixtureInterface $customer
-     * @param Element|null $element
+     * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $customer, Element $element = null)
+    public function fill(FixtureInterface $customer, SimpleElement $element = null)
     {
         /** @var CustomerInjectable $customer */
         if ($customer->hasData()) {
-- 
GitLab


From d9b71a2007b6e1a72717bbc83c6ca1911a185902 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 11:37:20 +0200
Subject: [PATCH 069/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 .../functional/lib/Mtf/Client/Element/SuggestElement.php   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
index 83a5c83b660..fc1d685204e 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
@@ -59,8 +59,9 @@ class SuggestElement extends SimpleElement
 
         $this->clear();
         foreach (str_split($value) as $symbol) {
-            $this->find($this->suggest)->click();
-            $this->keys([$symbol]);
+            $input = $this->find($this->suggest);
+            $input->click();
+            $input->keys([$symbol]);
             $this->waitResult();
             $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
             if ($searchedItem->isVisible()) {
@@ -90,7 +91,7 @@ class SuggestElement extends SimpleElement
      */
     public function waitResult()
     {
-        $browser = clone $this;
+        $browser = $this;
         $selector = $this->suggestStateLoader;
         $browser->waitUntil(
             function () use ($browser, $selector) {
-- 
GitLab


From 0cdc03bb3593559576b185b896951629fd1ca2ad Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 11:47:56 +0200
Subject: [PATCH 070/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 .../lib/Mtf/Client/Element/OptgroupselectElement.php           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
index fc0353553fd..ecb06a901ca 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Mtf\Client\Element;
-- 
GitLab


From fd63128fdb02a1b0993371e758fdc6e74bcae278 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 20 Jan 2015 11:51:59 +0200
Subject: [PATCH 071/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Fixes for L1 fails
---
 .../DownloadableTaxCalculationTest.php        | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index 82b90a1bbec..c810efd7795 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\TestCase;
 
-use Magento\Tax\Test\TestCase\TaxCalculationTest;
+use Mtf\TestCase\Scenario;
 
 /**
  * Test tax calculation with downloadable product.
@@ -30,7 +30,43 @@ use Magento\Tax\Test\TestCase\TaxCalculationTest;
  * @group Tax_(CS)
  * @ZephyrId MAGETWO-32076
  */
-class DownloadableTaxCalculationTest extends TaxCalculationTest
+class DownloadableTaxCalculationTest extends Scenario
 {
-    //
+    /**
+     * Skip failed tests.
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+        self::markTestIncomplete("Epic: MAGETWO-30073");
+    }
+
+    /**
+     * Runs tax calculation test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+
+    /**
+     * Tear down after each test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->objectManager->create('\Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
+        $this->objectManager->create('\Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
+        $this->objectManager->create('\Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
+
+        // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331
+        $this->objectManager->create(
+            'Magento\Core\Test\TestStep\SetupConfigurationStep',
+            ['configData' => 'default_tax_configuration']
+        )->run();
+    }
 }
-- 
GitLab


From 5d4ee1a40413a72ec3047b4c48865fab63da4acd Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 12:13:54 +0200
Subject: [PATCH 072/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 .../Mtf/Client/Element/ConditionsElement.php  | 29 ++++++++++---------
 .../Client/Element/GlobalsearchElement.php    |  2 +-
 .../Mtf/Client/Element/JquerytreeElement.php  |  6 ++--
 .../Element/MultiselectgrouplistElement.php   | 17 ++++++-----
 .../Client/Element/MultiselectlistElement.php |  6 ++--
 .../Client/Element/MultisuggestElement.php    |  2 +-
 .../lib/Mtf/Client/Element/Tree.php           | 10 +++----
 7 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index eeaed524ba2..96cf6112ad3 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -8,6 +8,7 @@ namespace Mtf\Client\Element;
 
 use Mtf\ObjectManager;
 use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
 
 /**
  * Class ConditionsElement
@@ -185,10 +186,10 @@ class ConditionsElement extends SimpleElement
      * Add condition combination
      *
      * @param string $condition
-     * @param SimpleElement $context
-     * @return SimpleElement
+     * @param ElementInterface $context
+     * @return ElementInterface
      */
-    protected function addConditionsCombination($condition, SimpleElement $context)
+    protected function addConditionsCombination($condition, ElementInterface $context)
     {
         $condition = $this->parseCondition($condition);
         $newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH);
@@ -208,10 +209,10 @@ class ConditionsElement extends SimpleElement
      * Add conditions
      *
      * @param array $conditions
-     * @param SimpleElement $context
+     * @param ElementInterface $context
      * @return void
      */
-    protected function addMultipleCondition(array $conditions, SimpleElement $context)
+    protected function addMultipleCondition(array $conditions, ElementInterface $context)
     {
         foreach ($conditions as $key => $condition) {
             $elementContext = is_numeric($key) ? $context : $this->addConditionsCombination($key, $context);
@@ -227,10 +228,10 @@ class ConditionsElement extends SimpleElement
      * Add single Condition
      *
      * @param string $condition
-     * @param SimpleElement $context
+     * @param ElementInterface $context
      * @return void
      */
-    protected function addSingleCondition($condition, SimpleElement $context)
+    protected function addSingleCondition($condition, ElementInterface $context)
     {
         $condition = $this->parseCondition($condition);
 
@@ -253,15 +254,15 @@ class ConditionsElement extends SimpleElement
      * Fill single condition
      *
      * @param array $rules
-     * @param SimpleElement $element
+     * @param ElementInterface $element
      * @return void
      * @throws \Exception
      */
-    protected function fillCondition(array $rules, SimpleElement $element)
+    protected function fillCondition(array $rules, ElementInterface $element)
     {
         $this->resetKeyParam();
         foreach ($rules as $rule) {
-            /** @var SimpleElement $param */
+            /** @var ElementInterface $param */
             $param = $this->findNextParam($element);
             $param->find('a')->click();
 
@@ -354,11 +355,11 @@ class ConditionsElement extends SimpleElement
     /**
      * Find next param of condition for fill
      *
-     * @param SimpleElement $context
-     * @return SimpleElement
+     * @param ElementInterface $context
+     * @return ElementInterface
      * @throws \Exception
      */
-    protected function findNextParam(SimpleElement $context)
+    protected function findNextParam(ElementInterface $context)
     {
         do {
             if (!isset($this->mapParams[$this->findKeyParam])) {
@@ -387,7 +388,7 @@ class ConditionsElement extends SimpleElement
      *
      * @return void
      */
-    protected function waitForCondition(SimpleElement $element)
+    protected function waitForCondition(ElementInterface $element)
     {
         $this->waitUntil(
             function () use ($element) {
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
index b84d290af21..1c8e0acc4c7 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
@@ -178,7 +178,7 @@ class GlobalsearchElement extends SimpleElement
         $resultItems = $searchResult->getElements($this->resultItem);
         $resultArray = [];
 
-        /** @var SimpleElement $resultItem */
+        /** @var ElementInterface $resultItem */
         foreach ($resultItems as $resultItem) {
             $resultItemLink = $resultItem->find('a');
             $resultText = $resultItemLink->isVisible()
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
index e08753499ea..c7d36387b3c 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
@@ -6,6 +6,8 @@
 
 namespace Mtf\Client\Element;
 
+use Mtf\Client\ElementInterface;
+
 /**
  * Class JquerytreeElement
  * Typified element class for JqueryTree elements
@@ -60,11 +62,11 @@ class JquerytreeElement extends Tree
     /**
      *  Recursive walks tree
      *
-     * @param SimpleElement $node
+     * @param ElementInterface $node
      * @param string $parentCssClass
      * @return array
      */
-    protected function _getNodeContent(SimpleElement $node, $parentCssClass)
+    protected function _getNodeContent(ElementInterface $node, $parentCssClass)
     {
         $counter = 1;
         $nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
index 24c767851f5..f2fe3958147 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -7,6 +7,7 @@
 namespace Mtf\Client\Element;
 
 use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
 
 /**
  * Class MultiselectgrouplistElement
@@ -151,11 +152,11 @@ class MultiselectgrouplistElement extends MultiselectElement
      * Get optgroup
      *
      * @param string $value
-     * @param SimpleElement $context
-     * @return SimpleElement
+     * @param ElementInterface $context
+     * @return ElementInterface
      * @throws \Exception
      */
-    protected function getOptgroup($value, SimpleElement $context)
+    protected function getOptgroup($value, ElementInterface $context)
     {
         $optgroup = $context->find(sprintf($this->optgroupByLabel, $value), Locator::SELECTOR_XPATH);
         if (!$optgroup->isVisible()) {
@@ -169,11 +170,11 @@ class MultiselectgrouplistElement extends MultiselectElement
      * Get child optgroup
      *
      * @param string $value
-     * @param SimpleElement $context
-     * @return SimpleElement
+     * @param ElementInterface $context
+     * @return ElementInterface
      * @throws \Exception
      */
-    protected function getChildOptgroup($value, SimpleElement $context)
+    protected function getChildOptgroup($value, ElementInterface $context)
     {
         $childOptgroup = null;
         $count = 1;
@@ -210,7 +211,7 @@ class MultiselectgrouplistElement extends MultiselectElement
         foreach ($this->getSelectedOptions() as $option) {
             $value = [];
 
-            /** @var SimpleElement $option */
+            /** @var ElementInterface $option */
             $optionText = $option->getText();
             $optionValue = trim($optionText, $this->trim);
             $value[] = $optionValue;
@@ -254,7 +255,7 @@ class MultiselectgrouplistElement extends MultiselectElement
     /**
      * Get options
      *
-     * @return SimpleElement[]
+     * @return ElementInterface[]
      */
     protected function getOptions()
     {
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
index acc0ea4befb..c7c01a8de68 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
@@ -39,7 +39,7 @@ class MultiselectlistElement extends MultiselectElement
         $values = is_array($values) ? $values : [$values];
 
         foreach ($options as $option) {
-            /** @var SimpleElement $option */
+            /** @var \Mtf\Client\ElementInterface $option */
             $optionText = $option->getText();
             $isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
             $inArray = in_array($optionText, $values);
@@ -60,7 +60,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var SimpleElement $option */
+            /** @var \Mtf\Client\ElementInterface $option */
             $checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
             if ($checkedOption->isVisible()) {
                 $checkedOptions[] = $checkedOption->getText();
@@ -101,7 +101,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var SimpleElement $option */
+            /** @var \Mtf\Client\ElementInterface $option */
             $optionsValue[] = $option->getText();
         }
 
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
index e53cc52a441..daffc52b3ae 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
@@ -73,7 +73,7 @@ class MultisuggestElement extends SuggestElement
         $values = [];
 
         foreach ($choices as $choice) {
-            /** @var SimpleElement $choice */
+            /** @var \Mtf\Client\ElementInterface $choice */
             $values[] = $choice->getText();
         }
         return $values;
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 40f6883d92d..77d9808e689 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -94,7 +94,7 @@ abstract class Tree extends SimpleElement
             ++$pathChunkCounter;
         }
         if ($structureChunk) {
-            /** @var SimpleElement $needleElement */
+            /** @var ElementInterface $needleElement */
             $needleElement = $structureChunk->find($this->nodeName);
             $needleElement->click();
         } else {
@@ -108,7 +108,7 @@ abstract class Tree extends SimpleElement
      *
      * @param string $pathChunk
      * @param array $structureChunk
-     * @return array|SimpleElement|false
+     * @return array|ElementInterface|false
      */
     protected function deep($pathChunk, $structureChunk)
     {
@@ -127,11 +127,11 @@ abstract class Tree extends SimpleElement
     /**
      *  Recursive walks tree
      *
-     * @param SimpleElement $node
+     * @param ElementInterface $node
      * @param string $parentCssClass
      * @return array
      */
-    protected function _getNodeContent(SimpleElement $node, $parentCssClass)
+    protected function _getNodeContent(ElementInterface $node, $parentCssClass)
     {
         $nodeArray = [];
         $nodeList = [];
@@ -145,7 +145,7 @@ abstract class Tree extends SimpleElement
         }
         //Write to array values of current node
         foreach ($nodeList as $currentNode) {
-            /** @var SimpleElement $currentNode */
+            /** @var ElementInterface $currentNode */
             $nodesNames = $currentNode->find($this->nodeName);
             $nodesContents = $currentNode->find($this->nodeCssClass);
             $text = ltrim($nodesNames->getText());
-- 
GitLab


From 567d9e16692aa2811f5740261995bf7d2f1b63dc Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 12:53:32 +0200
Subject: [PATCH 073/101] MAGETWO-31363: [MPI] Unit and Integration tests
 coverage

---
 .../Block/Form/BanktransferTest.php           | 37 ++++++++
 .../Block/Form/Cashondelivery.php             | 37 ++++++++
 .../Block/Info/CheckmoTest.php                | 91 +++++++++++++++++++
 .../Model/BanktransferTest.php                | 19 +++-
 .../Model/CashondeliveryTest.php              | 19 +++-
 .../OfflinePayments/Model/CheckmoTest.php     | 80 ++++++++++++++++
 .../OfflinePayments/Model/ObserverTest.php    | 59 ++++++++++++
 .../Model/PurchaseorderTest.php               | 52 +++++++++++
 8 files changed, 390 insertions(+), 4 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
new file mode 100644
index 00000000000..80eb7a7ac3e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+class BanktransferTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Block\Form\Banktransfer
+     */
+    protected $_object;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Banktransfer');
+    }
+
+    public function testGetInstructions()
+    {
+        $method = $this->getMock(
+            'Magento\Payment\Model\MethodInterface',
+            ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
+            [],
+            '',
+            false
+        );
+        $method->expects($this->once())
+            ->method('getInstructions')
+            ->willReturn('instructions');
+        $this->_object->setData('method', $method);
+
+        $this->assertEquals('instructions', $this->_object->getInstructions());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
new file mode 100644
index 00000000000..ba0a899bb48
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+class CashondeliveryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Block\Form\Cashondelivery
+     */
+    protected $_object;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Cashondelivery');
+    }
+
+    public function testGetInstructions()
+    {
+        $method = $this->getMock(
+            'Magento\Payment\Model\MethodInterface',
+            ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
+            [],
+            '',
+            false
+        );
+        $method->expects($this->once())
+            ->method('getInstructions')
+            ->willReturn('instructions');
+        $this->_object->setData('method', $method);
+
+        $this->assertEquals('instructions', $this->_object->getInstructions());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
new file mode 100644
index 00000000000..88314b0b1af
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Info;
+
+class CheckmoTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Block\Info\Checkmo
+     */
+    protected $_object;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfig;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+        $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->_scopeConfig = $this->getMock(
+            'Magento\Framework\App\Config\ScopeConfigInterface',
+            ['getValue', 'isSetFlag'],
+            [],
+            '',
+            false
+        );
+        $this->_object = $objectManagerHelper->getObject(
+            'Magento\OfflinePayments\Block\Info\Checkmo',
+            [
+                'eventManager' => $eventManager,
+                'paymentData' => $paymentDataMock,
+                'scopeConfig' => $this->_scopeConfig,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getPayableToDataProvider
+     */
+    public function testGetPayableTo($details, $expected)
+    {
+        $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+        $info->expects($this->once())
+            ->method('getAdditionalData')
+            ->willReturn(serialize($details));
+        $this->_object->setData('info', $info);
+
+        $this->assertEquals($expected, $this->_object->getPayableTo());
+    }
+
+    /**
+     * @return array
+     */
+    public function getPayableToDataProvider()
+    {
+        return [
+            [['payable_to' => 'payable'], 'payable'],
+            ['', '']
+        ];
+    }
+
+    /**
+     * @dataProvider getMailingAddressDataProvider
+     */
+    public function testGetMailingAddress($details, $expected)
+    {
+        $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+        $info->expects($this->once())
+            ->method('getAdditionalData')
+            ->willReturn(serialize($details));
+        $this->_object->setData('info', $info);
+
+        $this->assertEquals($expected, $this->_object->getMailingAddress());
+    }
+
+    /**
+     * @return array
+     */
+    public function getMailingAddressDataProvider()
+    {
+        return [
+            [['mailing_address' => 'blah@blah.com'], 'blah@blah.com'],
+            ['', '']
+        ];
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
index 7dbc702c60f..a8705a4dc8f 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -12,18 +12,23 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
      */
     protected $_object;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfig;
+
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
         $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
-        $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+        $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
         $this->_object = $objectManagerHelper->getObject(
             'Magento\OfflinePayments\Model\Banktransfer',
             [
                 'eventManager' => $eventManager,
                 'paymentData' => $paymentDataMock,
-                'scopeConfig' => $scopeConfig,
+                'scopeConfig' => $this->_scopeConfig,
             ]
         );
     }
@@ -32,4 +37,14 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
+
+    public function testGetInstructions()
+    {
+        $this->_object->setStore(1);
+        $this->_scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with('payment/banktransfer/instructions', 'store', 1)
+            ->willReturn('payment configuration');
+        $this->assertEquals('payment configuration', $this->_object->getInstructions());
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
index e0f11d0283b..97bdf1127e5 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -12,6 +12,11 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
      */
     protected $_object;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfig;
+
     protected function setUp()
     {
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -19,13 +24,13 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
         $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
         $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
 
-        $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+        $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
         $this->_object = $helper->getObject(
             'Magento\OfflinePayments\Model\Cashondelivery',
             [
                 'eventManager' => $eventManager,
                 'paymentData' => $paymentDataMock,
-                'scopeConfig' => $scopeConfig,
+                'scopeConfig' => $this->_scopeConfig,
             ]
         );
     }
@@ -34,4 +39,14 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
+
+    public function testGetInstructions()
+    {
+        $this->_object->setStore(1);
+        $this->_scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with('payment/cashondelivery/instructions', 'store', 1)
+            ->willReturn('payment configuration');
+        $this->assertEquals('payment configuration', $this->_object->getInstructions());
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
new file mode 100644
index 00000000000..b6aee65b11e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class CheckmoTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Model\Checkmo
+     */
+    protected $_object;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfig;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+        $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->_scopeConfig = $this->getMock(
+            'Magento\Framework\App\Config\ScopeConfigInterface',
+            ['getValue', 'isSetFlag'],
+            [],
+            '',
+            false
+        );
+        $this->_object = $objectManagerHelper->getObject(
+            'Magento\OfflinePayments\Model\Checkmo',
+            [
+                'eventManager' => $eventManager,
+                'paymentData' => $paymentDataMock,
+                'scopeConfig' => $this->_scopeConfig,
+            ]
+        );
+    }
+
+    public function testGetPayableTo()
+    {
+        $this->_object->setStore(1);
+        $this->_scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with('payment/checkmo/payable_to', 'store', 1)
+            ->willReturn('payable');
+        $this->assertEquals('payable', $this->_object->getPayableTo());
+    }
+
+    public function testGetMailingAddress()
+    {
+        $this->_object->setStore(1);
+        $this->_scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with('payment/checkmo/mailing_address', 'store', 1)
+            ->willReturn('blah@blah.com');
+        $this->assertEquals('blah@blah.com', $this->_object->getMailingAddress());
+    }
+
+    public function testAssignData()
+    {
+        $details['payable_to'] = 'payable';
+        $details['mailing_address'] = 'blah@blah.com';
+        $this->_object->setStore(1);
+        $this->_scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturnMap([
+                ['payment/checkmo/payable_to', 'store', 1, 'payable'],
+                ['payment/checkmo/mailing_address', 'store', 1, 'blah@blah.com']
+            ]);
+        $instance = $this->getMock('Magento\Payment\Model\Info', ['setAdditionalData'], [], '', false);
+        $instance->expects($this->once())
+            ->method('setAdditionalData')
+            ->with(serialize($details));
+        $this->_object->setData('info_instance', $instance);
+        $this->_object->assignData('');
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
new file mode 100644
index 00000000000..34f9c0da865
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class ObserverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Model\Observer
+     */
+    protected $_model;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->_model = $objectManagerHelper->getObject('Magento\OfflinePayments\Model\Observer');
+    }
+
+    public function testBeforeOrderPaymentSave()
+    {
+        $observer = $this->getMock('Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
+        $event = $this->getMock('Magento\Framework\Event', ['getPayment'], [], '', false);
+        $payment = $this->getMock(
+            'Magento\Sales\Model\Order\Payment',
+            ['getMethod', 'setAdditionalInformation', 'getMethodInstance'],
+            [],
+            '',
+            false
+        );
+        $payment->expects($this->once())
+            ->method('getMethod')
+            ->willReturn('banktransfer');
+        $payment->expects($this->once())
+            ->method('setAdditionalInformation')
+            ->with('instructions', 'payment configuration');
+        $method = $this->getMock(
+            'Magento\Payment\Model\MethodInterface',
+            ['getInstructions', 'getFormBlockType', 'getTitle', 'getCode'],
+            [],
+            '',
+            false
+        );
+        $method->expects($this->once())
+            ->method('getInstructions')
+            ->willReturn('payment configuration');
+        $payment->expects($this->once())
+            ->method('getMethodInstance')
+            ->willReturn($method);
+        $event->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($payment);
+        $observer->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($event);
+        $this->_model->beforeOrderPaymentSave($observer);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php
new file mode 100644
index 00000000000..fb08707e9e4
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class PurchaseorderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflinePayments\Model\Purchaseorder
+     */
+    protected $_object;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfig;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+        $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+        $this->_scopeConfig = $this->getMock(
+            'Magento\Framework\App\Config\ScopeConfigInterface',
+            ['getValue', 'isSetFlag'],
+            [],
+            '',
+            false
+        );
+        $this->_object = $objectManagerHelper->getObject(
+            'Magento\OfflinePayments\Model\Purchaseorder',
+            [
+                'eventManager' => $eventManager,
+                'paymentData' => $paymentDataMock,
+                'scopeConfig' => $this->_scopeConfig,
+            ]
+        );
+    }
+
+    public function testAssignData()
+    {
+        $data = new \Magento\Framework\Object([
+            'po_number' => '12345'
+        ]);
+
+        $instance = $this->getMock('Magento\Payment\Model\Info', [], [], '', false);
+        $this->_object->setData('info_instance', $instance);
+        $this->_object->assignData($data);
+    }
+}
-- 
GitLab


From 7ee2df5b8a55ed3bad5029359d4b17daa1eb0c3d Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 20 Jan 2015 13:01:26 +0200
Subject: [PATCH 074/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

- Moved tests to correct repo
---
 .../DownloadableTaxCalculationTest.php        | 72 -------------------
 .../DownloadableTaxCalculationTest/test.csv   |  7 --
 .../Downloadable/Test/etc/scenario.xml        | 37 ----------
 .../app/Magento/Tax/Test/etc/scenario.xml     | 37 ----------
 4 files changed, 153 deletions(-)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
 delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
 delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
 delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml

diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
deleted file mode 100644
index c810efd7795..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Downloadable\Test\TestCase;
-
-use Mtf\TestCase\Scenario;
-
-/**
- * Test tax calculation with downloadable product.
- *
- * Test Flow:
- * Steps:
- * 1. Log in as default admin user.
- * 2. Go to Stores > Taxes > Tax Rules.
- * 3. Click 'Add New Tax Rule' button.
- * 4. Assign default rates to rule.
- * 5. Save Tax Rate.
- * 6. Go to Products > Catalog.
- * 7. Add new product.
- * 8. Fill data according to dataset.
- * 9. Save product.
- * 10. Go to Stores > Configuration.
- * 11. Fill Tax configuration according to data set.
- * 12. Save tax configuration.
- * 13. Perform all assertions.
- *
- * @group Tax_(CS)
- * @ZephyrId MAGETWO-32076
- */
-class DownloadableTaxCalculationTest extends Scenario
-{
-    /**
-     * Skip failed tests.
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        self::markTestIncomplete("Epic: MAGETWO-30073");
-    }
-
-    /**
-     * Runs tax calculation test.
-     *
-     * @return void
-     */
-    public function test()
-    {
-        $this->executeScenario();
-    }
-
-    /**
-     * Tear down after each test.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        $this->objectManager->create('\Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
-        $this->objectManager->create('\Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
-        $this->objectManager->create('\Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
-
-        // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331
-        $this->objectManager->create(
-            'Magento\Core\Test\TestStep\SetupConfigurationStep',
-            ['configData' => 'default_tax_configuration']
-        )->run();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
deleted file mode 100644
index c8778e2a9f0..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"prices/category_price_excl_tax";"prices/category_price_incl_tax";"prices/product_view_price_excl_tax";"prices/product_view_price_incl_tax";"prices/cart_item_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_incl_tax";"prices/subtotal_excl_tax";"prices/subtotal_incl_tax";"prices/discount";"prices/shipping_excl_tax";"prices/shipping_incl_tax";"prices/tax";"prices/grand_total_excl_tax";"prices/grand_total_incl_tax";"constraint";"issue"
-"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
-"Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
deleted file mode 100644
index d5d21016c52..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
-    <scenario name="DownloadableTaxCalculationTest" module="Magento_Downloadable">
-        <methods>
-            <method name="test">
-                <steps>
-                    <first>setupConfiguration</first>
-                    <step name="setupConfiguration" module="Magento_Core">
-                        <next>createSalesRule</next>
-                    </step>
-                    <step name="createSalesRule" module="Magento_SalesRule">
-                        <next>createCatalogRule</next>
-                    </step>
-                    <step name="createCatalogRule" module="Magento_CatalogRule">
-                        <next>createTaxRule</next>
-                    </step>
-                    <step name="createTaxRule" module="Magento_Tax">
-                        <next>createProduct</next>
-                    </step>
-                    <step name="createProduct" module="Magento_Catalog">
-                        <next>createCustomer</next>
-                    </step>
-                    <step name="createCustomer" module="Magento_Customer">
-                        <next>loginCustomerOnFrontend</next>
-                    </step>
-                    <step name="loginCustomerOnFrontend" module="Magento_Customer" />
-                </steps>
-            </method>
-        </methods>
-    </scenario>
-</scenarios>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
deleted file mode 100644
index 356993adf01..00000000000
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
-    <scenario name="TaxCalculationTest" module="Magento_Checkout">
-        <methods>
-            <method name="test">
-                <steps>
-                    <first>setupConfiguration</first>
-                    <step name="setupConfiguration" module="Magento_Core">
-                        <next>createSalesRule</next>
-                    </step>
-                    <step name="createSalesRule" module="Magento_SalesRule">
-                        <next>createCatalogRule</next>
-                    </step>
-                    <step name="createCatalogRule" module="Magento_CatalogRule">
-                        <next>createTaxRule</next>
-                    </step>
-                    <step name="createTaxRule" module="Magento_Tax">
-                        <next>createProduct</next>
-                    </step>
-                    <step name="createProduct" module="Magento_Catalog">
-                        <next>createCustomer</next>
-                    </step>
-                    <step name="createCustomer" module="Magento_Customer">
-                        <next>loginCustomerOnFrontend</next>
-                    </step>
-                    <step name="loginCustomerOnFrontend" module="Magento_Customer" />
-                </steps>
-            </method>
-        </methods>
-    </scenario>
-</scenarios>
-- 
GitLab


From ee882bfe47ae52c43f10c2fedea63472134e407d Mon Sep 17 00:00:00 2001
From: Vladimir Pelipenko <vpelipenko@ebay.com>
Date: Tue, 20 Jan 2015 13:21:05 +0200
Subject: [PATCH 075/101] MAGETWO-32829: [GITHUB] Add tests for
 View\Layout\Reader\Block and slight refactoring #906

- fixed code style and added lost copyright blocks
---
 .../View/Layout/Reader/BlockTest.php          | 21 +++++++++++++------
 .../Reader/_files/_layout_update_block.xml    | 15 ++++++-------
 .../_files/_layout_update_reference.xml       |  9 ++++++--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
index f6cd7b1b6af..3bd3e7f3024 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\Framework\View\Layout\Reader;
 
 class BlockTest extends \PHPUnit_Framework_TestCase
@@ -17,7 +20,14 @@ class BlockTest extends \PHPUnit_Framework_TestCase
      */
     private $readerContext;
 
+    /**
+     * @var string
+     */
     private $blockName = 'test.block';
+
+    /**
+     * @var string
+     */
     private $childBlockName = 'test.child.block';
 
     public function setUp()
@@ -25,7 +35,6 @@ class BlockTest extends \PHPUnit_Framework_TestCase
         $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Framework\View\Layout\Reader\Block'
         );
-        
         $this->readerContext = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Framework\View\Layout\Reader\Context'
         );
@@ -33,12 +42,13 @@ class BlockTest extends \PHPUnit_Framework_TestCase
 
     public function testInterpretBlockDirective()
     {
-        $pageXml = new \Magento\Framework\View\Layout\Element(__DIR__ . '/_files/_layout_update_block.xml', 0, true);
+        $pageXml = new \Magento\Framework\View\Layout\Element(
+            __DIR__ . '/_files/_layout_update_block.xml', 0, true
+        );
         $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
 
         foreach ($pageXml->xpath('body/block') as $blockElement) {
             $this->assertTrue(in_array($blockElement->getName(), $this->block->getSupportedNodes()));
-
             $this->block->interpret($this->readerContext, $blockElement, $parentElement);
         }
 
@@ -73,7 +83,6 @@ class BlockTest extends \PHPUnit_Framework_TestCase
 
         foreach ($pageXml->xpath('body/*') as $element) {
             $this->assertTrue(in_array($element->getName(), $this->block->getSupportedNodes()));
-
             $this->block->interpret($this->readerContext, $element, $parentElement);
         }
 
@@ -88,4 +97,4 @@ class BlockTest extends \PHPUnit_Framework_TestCase
             $resultElementData['arguments']
         );
     }
-} 
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
index 0a3c9c962ca..01cf6bf5dd2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
-        <block class="Dummy\Class"
-               name="test.block"
-               group="test.group"
-               template="test.phtml"
-               ttl="3">
+        <block class="Dummy\Class" name="test.block" group="test.group" template="test.phtml" ttl="3">
             <arguments>
                 <argument name="test_arg" xsi:type="string">test-argument-value</argument>
             </arguments>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
index 36a01a41bff..f25d5cecda8 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
         <block class="Dummy\Class" name="test.block"/>
         <referenceBlock name="test.block">
-- 
GitLab


From a45d7fda27de848b9458fdf4315460a0ae270fa0 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 13:21:47 +0200
Subject: [PATCH 076/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 dev/tests/functional/lib/Mtf/ObjectManagerFactory.php      | 7 ++++---
 .../Newsletter/Test/Constraint/AssertNewsletterPreview.php | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index 6197bea9c10..5c5a96fc093 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -74,11 +74,12 @@ class ObjectManagerFactory
         \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
         array $arguments
     ) {
+        $data = isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
+            ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
+            : null;
         return new \Magento\Framework\App\DeploymentConfig(
             new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
-            isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
-                ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
-                : null
+            $data
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index 0aa7d065d9d..5258ef9ba3c 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -29,8 +29,11 @@ class AssertNewsletterPreview extends AbstractConstraint
      * @param Template $newsletter
      * @return void
      */
-    public function processAssert(BrowserInterfaceInterface $browser, TemplatePreview $templatePreview, Template $newsletter)
-    {
+    public function processAssert(
+        BrowserInterface $browser,
+        TemplatePreview $templatePreview,
+        Template $newsletter
+    ) {
         $browser->selectWindow();
         $content = $templatePreview->getContent()->getPageContent();
         $browser->closeWindow();
-- 
GitLab


From fabe2ff686a74912a042b37821c8596419f78dbf Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 13:42:27 +0200
Subject: [PATCH 077/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 dev/tests/functional/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index aaa0e1d19c1..88ba1077889 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc12",
+        "magento/mtf": "1.0.0-rc13",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
-- 
GitLab


From 7d7d9e32cbfa88e7f6085f9cb646bd84dada3d3c Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 17:18:43 +0200
Subject: [PATCH 078/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/Config/Backend/Tablerate.php        |   4 +-
 .../Model/Observer/SalesRule/ActionsTab.php   |  32 ++---
 .../Adminhtml/Carrier/Tablerate/GridTest.php  | 126 ++++++++++++++++++
 .../Model/Config/Source/TablerateTest.php     |  47 +++++++
 .../Observer/SalesRule/ActionsTabTest.php     |  18 ++-
 .../Checkout/Block/Cart/ShippingTest.php      |   2 +-
 6 files changed, 211 insertions(+), 18 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php

diff --git a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
index 6056d7dbbb7..c0b311a1073 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
@@ -46,6 +46,8 @@ class Tablerate extends \Magento\Framework\App\Config\Value
      */
     public function afterSave()
     {
-        $this->_tablerateFactory->create()->uploadAndImport($this);
+        /** @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate $tableRate */
+        $tableRate = $this->_tablerateFactory->create();
+        $tableRate->uploadAndImport($this);
     }
 }
diff --git a/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php b/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
index b1e56563d74..10068f3d7e5 100644
--- a/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
+++ b/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
@@ -24,22 +24,24 @@ class ActionsTab
         $form = $observer->getForm();
         foreach ($form->getElements() as $element) {
             /** @var \Magento\Framework\Data\Form\Element\AbstractElement $element */
-            if ($element->getId() == 'action_fieldset') {
-                $element->addField(
-                    'simple_free_shipping',
-                    'select',
-                    [
-                        'label' => __('Free Shipping'),
-                        'title' => __('Free Shipping'),
-                        'name' => 'simple_free_shipping',
-                        'options' => [
-                            0 => __('No'),
-                            Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
-                            Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
-                        ]
-                    ]
-                );
+            if ($element->getId() != 'action_fieldset') {
+                continue;
             }
+
+            $element->addField(
+                'simple_free_shipping',
+                'select',
+                [
+                    'label' => __('Free Shipping'),
+                    'title' => __('Free Shipping'),
+                    'name' => 'simple_free_shipping',
+                    'options' => [
+                        0 => __('No'),
+                        Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
+                        Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
+                    ]
+                ]
+            );
         }
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
new file mode 100644
index 00000000000..f569f9515dd
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate;
+
+class GridTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $backendHelperMock;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tablerateMock;
+
+    /**
+     * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactoryMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context = $objectManager->getObject('Magento\Backend\Block\Template\Context', [
+            'storeManager' => $this->storeManagerMock
+        ]);
+
+        $this->backendHelperMock = $this->getMockBuilder('\Magento\Backend\Helper\Data')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->collectionFactoryMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->tablerateMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Carrier\Tablerate')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid(
+            $this->context,
+            $this->backendHelperMock,
+            $this->collectionFactoryMock,
+            $this->tablerateMock
+        );
+    }
+
+    public function testSetWebsiteId()
+    {
+        $websiteId = 1;
+
+        $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($websiteMock);
+
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($websiteId);
+
+        $this->assertSame($this->model, $this->model->setWebsiteId($websiteId));
+        $this->assertEquals($websiteId, $this->model->getWebsiteId());
+    }
+
+    public function testGetWebsiteId()
+    {
+        $websiteId = 10;
+
+        $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($websiteId);
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($websiteMock);
+
+        $this->assertEquals($websiteId, $this->model->getWebsiteId());
+
+        $this->storeManagerMock->expects($this->never())
+            ->method('getWebsite')
+            ->willReturn($websiteMock);
+
+        $this->assertEquals($websiteId, $this->model->getWebsiteId());
+    }
+
+    public function testSetAndGetConditionName()
+    {
+        $conditionName = 'someName';
+        $this->assertEquals($this->model, $this->model->setConditionName($conditionName));
+        $this->assertEquals($conditionName, $this->model->getConditionName());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
new file mode 100644
index 00000000000..8eea5073c3f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\OfflineShipping\Model\Config\Source\Tablerate
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\OfflineShipping\Model\Carrier\Tablerate|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $carrierTablerateMock;
+
+    protected function setUp()
+    {
+        $this->carrierTablerateMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Carrier\Tablerate')
+            ->disableOriginalConstructor()
+            ->setMethods(['getCode'])
+            ->getMock();
+
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->model = $helper->getObject('Magento\OfflineShipping\Model\Config\Source\Tablerate', [
+            'carrierTablerate' => $this->carrierTablerateMock
+        ]);
+    }
+
+    public function testToOptionArray()
+    {
+        $codes = [1, 2, 3, 4, 5];
+        $expected = [];
+        foreach ($codes as $k => $v) {
+            $expected[] = ['value' => $k, 'label' => $v];
+        }
+
+        $this->carrierTablerateMock->expects($this->once())
+            ->method('getCode')
+            ->willReturn($codes);
+
+        $this->assertEquals($expected, $this->model->toOptionArray());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
index f3ab5f5ca4f..751faf0cf82 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\OfflineShipping\Model\Observer\SalesRule;
 
+use Magento\OfflineShipping\Model\SalesRule\Rule;
+
 class ActionsTabTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -39,7 +41,21 @@ class ActionsTabTest extends \PHPUnit_Framework_TestCase
             ->willReturn('action_fieldset');
 
         $elementMock->expects($this->once())
-            ->method('addField');
+            ->method('addField')
+            ->with(
+                'simple_free_shipping',
+                'select',
+                [
+                    'label' => __('Free Shipping'),
+                    'title' => __('Free Shipping'),
+                    'name' => 'simple_free_shipping',
+                    'options' => [
+                        0 => __('No'),
+                        Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
+                        Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
+                    ]
+                ]
+            );
 
         $formMock->expects($this->once())
             ->method('getElements')
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
index 3e82bce9295..0fc0f97fbb7 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -48,7 +48,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
             ->method('getValue')
             ->willReturn($scopeConfigMockReturnValue);
 
-        $this->assertEquals($this->model->afterGetStateActive($subjectMock, $result), $assertResult);
+        $this->assertEquals($assertResult, $this->model->afterGetStateActive($subjectMock, $result));
     }
 
     public function afterGetStateActiveDataProvider()
-- 
GitLab


From 619125f1383f4d3da0c9f6921b9b8746ef8551e6 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Tue, 20 Jan 2015 13:54:09 +0200
Subject: [PATCH 079/101] MAGETWO-31363: Unit and Integration tests coverage

---
 .../Model/Quote/FreeshippingTest.php          | 178 ------------------
 .../Model/SalesRule/CalculatorTest.php        | 154 ++-------------
 2 files changed, 13 insertions(+), 319 deletions(-)
 delete mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
deleted file mode 100644
index 2259ed7829d..00000000000
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\OfflineShipping\Model\Quote;
-
-class FreeshippingTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \Magento\OfflineShipping\Model\Quote\Freeshipping|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $addressMock;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storeManagerMock;
-
-    /**
-     * @var \Magento\OfflineShipping\Model\SalesRule\Calculator|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $calculatorMock;
-
-    protected function setUp()
-    {
-        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
-        $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getQuote',
-                'getAllItems',
-                'getFreeShipping',
-                'setFreeShipping'
-            ])
-            ->getMock();
-
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
-            ->willReturn($storeMock);
-
-        $this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
-            ->disableOriginalConstructor()
-            ->setMethods(['init', 'processFreeShipping'])
-            ->getMock();
-
-        $this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
-            'storeManager' => $this->storeManagerMock,
-            'calculator' => $this->calculatorMock
-        ]);
-    }
-
-
-    public function testCollectWithEmptyAddressItems()
-    {
-        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->addressMock->expects($this->once())
-            ->method('getQuote')
-            ->willReturn($quoteMock);
-
-        $this->addressMock->expects($this->once())
-            ->method('getAllItems')
-            ->willReturn([]);
-
-        $this->assertSame($this->model->collect($this->addressMock), $this->model);
-    }
-
-    /**
-     * @dataProvider scenariosDataProvider
-     * @param $isNoDiscount
-     */
-    public function testCollectWithAddressItems($isNoDiscount)
-    {
-        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->addressMock->expects($this->once())
-            ->method('getQuote')
-            ->willReturn($quoteMock);
-
-        $addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getNoDiscount',
-                'setFreeShipping',
-                'getParentItemId',
-                'getFreeShipping',
-                'getHasChildren',
-                'isChildrenCalculated',
-                'getChildren'
-            ])
-            ->getMock();
-
-        $this->addressMock->expects($this->once())
-            ->method('getAllItems')
-            ->willReturn([$addressItemMock]);
-
-        $this->calculatorMock->expects($this->once())
-            ->method('init');
-
-        $addressItemMock->expects($this->once())
-            ->method('getNoDiscount')
-            ->willReturn($isNoDiscount);
-
-        $addressItemMock->expects($isNoDiscount ? $this->once() : $this->never())
-            ->method('setFreeShipping');
-
-        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('getParentItemId')
-            ->willReturn(false);
-
-        $this->calculatorMock->expects($isNoDiscount ? $this->never() : $this->exactly(2))
-            ->method('processFreeShipping');
-
-        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('getFreeShipping')
-            ->willReturn(true);
-
-        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('getHasChildren')
-            ->willReturn(true);
-
-        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('isChildrenCalculated')
-            ->willReturn(true);
-
-        $childMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item\AbstractItem')
-            ->disableOriginalConstructor()
-            ->setMethods(['setFreeShipping', 'getQuote', 'getAddress', 'getOptionByCode'])
-            ->getMock();
-
-        $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('getChildren')
-            ->willReturn([$childMock]);
-
-        $childMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('setFreeShipping');
-
-        $this->addressMock->expects($isNoDiscount ? $this->never() : $this->once())
-            ->method('getFreeShipping')
-            ->willReturn(false);
-
-        $this->addressMock->expects($isNoDiscount ? $this->once() : $this->exactly(2))
-            ->method('setFreeShipping');
-
-        $this->assertSame($this->model->collect($this->addressMock), $this->model);
-    }
-
-    public function scenariosDataProvider()
-    {
-        return [
-            [
-                true,  // there is no a discount
-            ],
-            [
-                false, // there is a discount
-            ]
-        ];
-    }
-}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
index b8e7b265792..b70631f2e42 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
@@ -5,163 +5,35 @@
  */
 namespace Magento\OfflineShipping\Model\SalesRule;
 
-class CalculatorForTest extends Calculator
-{
-    public function setValidatorUtility($validatorUtility)
-    {
-        $this->validatorUtility = $validatorUtility;
-    }
-}
-
 class CalculatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\OfflineShipping\Model\SalesRule\CalculatorForTest|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_model;
 
-    /**
-     * @var \Magento\Sales\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $itemMock;
-
-    /**
-     * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $utilityMock;
-
-    /**
-     * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $ruleMock;
-
-    /**
-     * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $addressMock;
-
     protected function setUp()
     {
-        $this->utilityMock = $this->getMockBuilder('Magento\SalesRule\Model\Utility')
-            ->disableOriginalConstructor()
-            ->setMethods(['canProcessRule'])
-            ->getMock();
-
-        $this->_model = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\CalculatorForTest')
-            ->disableOriginalConstructor()
-            ->setMethods(['_getRules', '__wakeup'])
-            ->getMock();
-
-        $this->ruleMock = $this->getMockBuilder('Magento\SalesRule\Model\Rule')
-            ->disableOriginalConstructor()
-            ->setMethods(['getActions', 'getSimpleFreeShipping'])
-            ->getMock();
-
-        $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
-            ->disableOriginalConstructor()
-            ->setMethods(['setFreeShipping'])
-            ->getMock();
-
-        $this->_model->setValidatorUtility($this->utilityMock);
-
-        $this->itemMock = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress'], [], '', false);
-
-        $this->itemMock->expects($this->once())
-            ->method('getAddress')
-            ->willReturn($this->addressMock);
+        $this->_model = $this->getMock(
+            'Magento\OfflineShipping\Model\SalesRule\Calculator',
+            ['_getRules', '__wakeup'],
+            [],
+            '',
+            false
+        );
+        $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
     }
 
     public function testProcessFreeShipping()
     {
-        $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
+        $item = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress', '__wakeup'], [], '', false);
+        $item->expects($this->once())->method('getAddress')->will($this->returnValue(true));
 
         $this->assertInstanceOf(
             'Magento\OfflineShipping\Model\SalesRule\Calculator',
-            $this->_model->processFreeShipping($this->itemMock)
+            $this->_model->processFreeShipping($item)
         );
-    }
-
-    public function testProcessFreeShippingContinueOnProcessRule()
-    {
-        $this->_model->expects($this->once())
-            ->method('_getRules')
-            ->willReturn(['rule1']);
-
-        $this->utilityMock->expects($this->once())
-            ->method('canProcessRule')
-            ->willReturn(false);
-
-        $this->_model->processFreeShipping($this->itemMock);
-    }
-
-    public function testProcessFreeShippingContinueOnValidateItem()
-    {
-        $this->utilityMock->expects($this->once())
-            ->method('canProcessRule')
-            ->willReturn(true);
-
-        $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
-            ->disableOriginalConstructor()
-            ->setMethods(['validate'])
-            ->getMock();
-
-        $actionsCollectionMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(false);
-
-        $this->ruleMock->expects($this->once())
-            ->method('getActions')
-            ->willReturn($actionsCollectionMock);
-
-        $this->_model->expects($this->once())
-            ->method('_getRules')
-            ->willReturn([$this->ruleMock]);
-
-        $this->_model->processFreeShipping($this->itemMock);
-    }
 
-    /**
-     * @dataProvider rulesDataProvider
-     */
-    public function testProcessFreeShippingFreeShippingItem($rule)
-    {
-        $this->utilityMock->expects($this->once())
-            ->method('canProcessRule')
-            ->willReturn(true);
-
-        $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
-            ->disableOriginalConstructor()
-            ->setMethods(['validate'])
-            ->getMock();
-
-        $actionsCollectionMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(true);
-
-        $this->ruleMock->expects($this->once())
-            ->method('getActions')
-            ->willReturn($actionsCollectionMock);
-
-        $this->_model->expects($this->once())
-            ->method('_getRules')
-            ->willReturn([$this->ruleMock]);
-
-        $this->ruleMock->expects($this->once())
-            ->method('getSimpleFreeShipping')
-            ->willReturn($rule);
-
-        $this->addressMock->expects(
-            $rule == \Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS ? $this->once() : $this->never()
-        )->method('setFreeShipping');
-
-        $this->_model->processFreeShipping($this->itemMock);
-    }
-
-    public function rulesDataProvider()
-    {
-        return [
-            [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ITEM],
-            [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS]
-        ];
+        return true;
     }
 }
-- 
GitLab


From cd513901f381079b947308905bf3e813e1b34138 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 14:37:25 +0200
Subject: [PATCH 080/101] MAGETWO-32081: MTF Alternative Web Driver pull
 request preparation

---
 dev/tests/functional/lib/Mtf/Client/Element/Tree.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 77d9808e689..499a7d645fd 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -45,6 +45,7 @@ abstract class Tree extends SimpleElement
      *
      * @param ElementInterface $target
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function dragAndDrop(ElementInterface $target)
     {
-- 
GitLab


From 3f6dc1dd5204cae39c90697f34473ce40aa572de Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 15:25:36 +0200
Subject: [PATCH 081/101] MAGETWO-32081: Magento vendor name is used as a home
 framework directory

---
 dev/tests/functional/.gitignore               |  2 +-
 dev/tests/functional/composer.json            |  3 +-
 dev/tests/functional/composer.json.dist       |  6 ++-
 dev/tests/functional/etc/global/di.xml        |  4 +-
 .../Mtf/App/State/AbstractState.php           |  4 +-
 .../{ => Magento}/Mtf/App/State/State1.php    |  6 +--
 .../Mtf/Client/Element/ConditionsElement.php  |  8 +--
 .../Mtf/Client/Element/DatepickerElement.php  |  4 +-
 .../Client/Element/GlobalsearchElement.php    |  6 +--
 .../Mtf/Client/Element/JquerytreeElement.php  |  4 +-
 .../Client/Element/LiselectstoreElement.php   |  4 +-
 .../Element/MultiselectgrouplistElement.php   |  6 +--
 .../Client/Element/MultiselectlistElement.php | 10 ++--
 .../Client/Element/MultisuggestElement.php    |  6 +--
 .../Client/Element/OptgroupselectElement.php  |  4 +-
 .../Mtf/Client/Element/SelectstoreElement.php |  4 +-
 .../Mtf/Client/Element/SuggestElement.php     |  4 +-
 .../{ => Magento}/Mtf/Client/Element/Tree.php |  4 +-
 .../Mtf/Client/Element/TreeElement.php        |  2 +-
 .../Mtf/Constraint/AbstractAssertForm.php     |  2 +-
 .../Mtf/EntryPoint/EntryPoint.php             |  6 +--
 .../Mtf/ObjectManagerFactory.php              | 52 +++++++++----------
 .../{ => Magento}/Mtf/Page/BackendPage.php    |  4 +-
 .../Mtf/Util/Generate/Factory.php             |  2 +-
 .../Util/Generate/Factory/AbstractFactory.php | 16 +++---
 .../Mtf/Util/Generate/Factory/Block.php       |  2 +-
 .../Mtf/Util/Generate/Factory/Fixture.php     |  2 +-
 .../Mtf/Util/Generate/Factory/Handler.php     |  2 +-
 .../Mtf/Util/Generate/Factory/Page.php        |  2 +-
 .../Mtf/Util/Generate/Factory/Repository.php  |  2 +-
 .../Util/Generate/Fixture/FieldsProvider.php  |  2 +-
 .../Repository/CollectionProvider.php         |  4 +-
 .../Mtf/Util/Generate/Repository/Resource.php |  2 +-
 .../Generate/Repository/TableCollection.php   |  6 +--
 .../Mtf/Util/Protocol/CurlInterface.php       |  2 +-
 .../Mtf/Util/Protocol/CurlTransport.php       |  2 +-
 .../CurlTransport/BackendDecorator.php        |  8 +--
 .../CurlTransport/FrontendDecorator.php       |  6 +--
 .../Mtf/Util/Protocol/SoapTransport.php       |  2 +-
 dev/tests/functional/phpunit.xml.dist         | 10 ++--
 .../Backend/Test/Block/Admin/Login.php        |  4 +-
 .../app/Magento/Backend/Test/Block/Cache.php  |  6 +--
 .../app/Magento/Backend/Test/Block/Denied.php |  4 +-
 .../Backend/Test/Block/FormPageActions.php    |  2 +-
 .../app/Magento/Backend/Test/Block/Menu.php   |  2 +-
 .../Backend/Test/Block/Page/Header.php        |  6 +--
 .../Magento/Backend/Test/Block/Page/Main.php  |  2 +-
 .../Backend/Test/Block/PageActions.php        |  2 +-
 .../Backend/Test/Block/System/Config/Form.php |  6 +--
 .../Test/Block/System/Config/Form/Group.php   |  2 +-
 .../Test/Block/System/Config/PageActions.php  |  2 +-
 .../Test/Block/System/Store/Delete/Form.php   |  4 +-
 .../System/Store/Edit/Form/GroupForm.php      |  4 +-
 .../System/Store/Edit/Form/StoreForm.php      |  4 +-
 .../System/Store/Edit/Form/WebsiteForm.php    |  2 +-
 .../Test/Block/System/Store/StoreGrid.php     |  2 +-
 .../System/Variable/Edit/VariableForm.php     |  2 +-
 .../Magento/Backend/Test/Block/Template.php   |  2 +-
 .../Backend/Test/Block/Widget/Form.php        |  8 +--
 .../Backend/Test/Block/Widget/FormTabs.php    | 18 +++----
 .../Backend/Test/Block/Widget/Grid.php        |  8 +--
 .../Magento/Backend/Test/Block/Widget/Tab.php |  6 +--
 .../AssertGlobalSearchCustomerName.php        |  2 +-
 .../AssertGlobalSearchNoRecordsFound.php      |  2 +-
 .../Constraint/AssertGlobalSearchOrderId.php  |  2 +-
 .../AssertGlobalSearchProductName.php         |  2 +-
 .../Backend/Test/Fixture/Admin/SuperAdmin.php |  2 +-
 .../app/Magento/Backend/Test/Fixture/Date.php |  2 +-
 .../Backend/Test/Fixture/GlobalSearch.php     |  2 +-
 .../Test/Fixture/GlobalSearch/Query.php       |  6 +--
 .../Backend/Test/Handler/Conditions.php       |  2 +-
 .../Backend/Test/Handler/Extractor.php        |  8 +--
 .../Backend/Test/Handler/Ui/LoginUser.php     |  6 +--
 .../Backend/Test/Handler/Ui/LogoutUser.php    |  6 +--
 .../Backend/Test/Page/AdminAuthLogin.php      |  6 +--
 .../Test/Constraint/AssertBackupInGrid.php    |  2 +-
 .../Catalog/Product/Edit/Tab/Bundle.php       |  4 +-
 .../Product/Edit/Tab/Bundle/Option.php        |  4 +-
 .../Edit/Tab/Bundle/Option/Selection.php      |  2 +-
 .../Adminhtml/Product/Composite/Configure.php |  2 +-
 .../Test/Block/Catalog/Product/View.php       |  6 +--
 .../Catalog/Product/View/Type/Bundle.php      | 10 ++--
 .../Catalog/Product/View/Type/Option.php      |  2 +-
 .../Constraint/AssertBundleInCategory.php     |  2 +-
 .../AssertBundleItemsOnProductPage.php        |  4 +-
 .../Test/Constraint/AssertBundlePriceType.php |  4 +-
 .../Test/Constraint/AssertBundlePriceView.php |  4 +-
 ...ProductInCustomerWishlistOnBackendGrid.php |  2 +-
 .../AssertGroupedPriceOnBundleProductPage.php |  2 +-
 .../AssertTierPriceOnBundleProductPage.php    |  4 +-
 .../Magento/Bundle/Test/Fixture/Bundle.php    |  4 +-
 .../Bundle/Test/Fixture/BundleDynamic.php     |  2 +-
 .../Bundle/Test/Fixture/BundleFixed.php       |  2 +-
 .../Bundle/Test/Fixture/BundleProduct.php     | 12 ++---
 .../BundleProduct/BundleSelections.php        |  4 +-
 .../Test/Fixture/BundleProduct/Price.php      |  2 +-
 .../Magento/Bundle/Test/Fixture/Cart/Item.php |  2 +-
 .../BundleProduct/BundleProductInterface.php  |  2 +-
 .../Test/Handler/BundleProduct/Curl.php       |  4 +-
 .../Bundle/Test/Handler/Curl/CreateBundle.php | 12 ++---
 .../Bundle/Test/Repository/BundleProduct.php  |  2 +-
 .../Test/TestCase/BundleDynamicTest.php       |  4 +-
 .../Bundle/Test/TestCase/BundleFixedTest.php  |  4 +-
 .../CreateBundleProductEntityTest.php         |  2 +-
 .../Bundle/Test/TestCase/EditBundleTest.php   |  4 +-
 .../UpdateBundleProductEntityTest.php         |  2 +-
 .../Test/Block/AbstractConfigureBlock.php     |  6 +--
 .../Adminhtml/Category/Edit/CategoryForm.php  |  2 +-
 .../Adminhtml/Category/Edit/Tab/Product.php   |  2 +-
 .../Test/Block/Adminhtml/Category/Tree.php    | 10 ++--
 .../Adminhtml/Category/Widget/Chooser.php     |  4 +-
 .../Product/Attribute/AttributeForm.php       |  8 +--
 .../Product/Attribute/CustomAttribute.php     |  4 +-
 .../Product/Attribute/Edit/AttributeForm.php  | 10 ++--
 .../Product/Attribute/Edit/Options.php        |  4 +-
 .../Product/Attribute/Edit/Tab/Advanced.php   |  4 +-
 .../Product/Attribute/Edit/Tab/Options.php    |  4 +-
 .../Attribute/Edit/Tab/Options/Option.php     |  2 +-
 .../Adminhtml/Product/Attribute/Set/Main.php  |  4 +-
 .../Attribute/Set/Main/AttributeSetForm.php   |  2 +-
 .../Product/Attribute/Set/Main/EditForm.php   |  2 +-
 .../Adminhtml/Product/Composite/Configure.php |  6 +--
 .../Product/Edit/Action/Attribute.php         |  2 +-
 .../Product/Edit/AdvancedPricingTab.php       |  2 +-
 .../Edit/AdvancedPricingTab/OptionGroup.php   |  2 +-
 .../Edit/AdvancedPricingTab/OptionTier.php    |  2 +-
 .../Adminhtml/Product/Edit/ProductTab.php     |  2 +-
 .../Product/Edit/Tab/AbstractRelated.php      |  2 +-
 .../Product/Edit/Tab/Attributes/Search.php    |  2 +-
 .../Adminhtml/Product/Edit/Tab/Crosssell.php  |  2 +-
 .../Adminhtml/Product/Edit/Tab/Options.php    |  6 +--
 .../Edit/Tab/Options/AbstractOptions.php      |  2 +-
 .../Edit/Tab/Options/Type/DropDown.php        |  2 +-
 .../Product/Edit/Tab/ProductDetails.php       |  4 +-
 .../Edit/Tab/ProductDetails/AttributeSet.php  |  2 +-
 .../Edit/Tab/ProductDetails/CategoryIds.php   |  4 +-
 .../ProductDetails/ProductOnlineSwitcher.php  |  4 +-
 .../Adminhtml/Product/Edit/Tab/Related.php    |  2 +-
 .../Adminhtml/Product/Edit/Tab/Upsell.php     |  2 +-
 .../Product/Edit/Tab/Websites/StoreTree.php   |  4 +-
 .../Adminhtml/Product/FormPageActions.php     |  4 +-
 .../Adminhtml/Product/GridPageAction.php      |  2 +-
 .../Block/Adminhtml/Product/ProductForm.php   | 12 ++---
 .../Test/Block/Category/ProductPagination.php |  4 +-
 .../Catalog/Test/Block/Category/View.php      |  4 +-
 .../Catalog/Test/Block/Product/Additional.php |  8 +--
 .../Block/Product/Compare/ListCompare.php     |  6 +--
 .../Product/Grouped/AssociatedProducts.php    |  8 +--
 .../ListAssociatedProducts.php                |  8 +--
 .../ListAssociatedProducts/Product.php        |  2 +-
 .../Test/Block/Product/ListProduct.php        |  8 +--
 .../Catalog/Test/Block/Product/Price.php      |  6 +--
 .../Product/ProductList/BottomToolbar.php     |  2 +-
 .../Block/Product/ProductList/Crosssell.php   |  8 +--
 .../Block/Product/ProductList/Related.php     |  6 +--
 .../Block/Product/ProductList/TopToolbar.php  |  2 +-
 .../Test/Block/Product/ProductList/Upsell.php |  6 +--
 .../Catalog/Test/Block/Product/View.php       |  6 +--
 .../Test/Block/Product/View/CustomOptions.php | 10 ++--
 .../app/Magento/Catalog/Test/Block/Search.php |  4 +-
 .../AssertAbsenceDeleteAttributeButton.php    |  2 +-
 .../AssertAddToCartButtonAbsent.php           |  2 +-
 .../AssertAddToCartButtonPresent.php          |  2 +-
 ...sertAddedProductAttributeOnProductForm.php |  6 +--
 .../Test/Constraint/AssertAttributeForm.php   |  2 +-
 .../AssertAttributeOptionsOnProductForm.php   |  2 +-
 .../AssertAttributeSearchableByLabel.php      |  2 +-
 .../AssertCategoryAbsenceOnBackend.php        |  2 +-
 .../AssertCategoryAbsenceOnFrontend.php       |  4 +-
 .../AssertCategoryForAssignedProducts.php     |  4 +-
 .../Test/Constraint/AssertCategoryForm.php    |  2 +-
 .../Constraint/AssertCategoryIsNotActive.php  |  4 +-
 .../AssertCategoryIsNotIncludeInMenu.php      |  4 +-
 .../Test/Constraint/AssertCategoryPage.php    |  6 +--
 .../Constraint/AssertCategoryRedirect.php     |  4 +-
 .../Constraint/AssertCategorySaveMessage.php  |  2 +-
 .../AssertCategorySuccessDeleteMessage.php    |  2 +-
 .../AssertCrossSellsProductsSection.php       |  6 +--
 .../AssertNoCrossSellsProductsSection.php     |  6 +--
 .../AssertNoRelatedProductsSection.php        |  6 +--
 .../AssertNoUpSellsProductsSection.php        |  6 +--
 .../AssertPriceOnProductPageInterface.php     |  2 +-
 .../AssertProductAttributeAbsenceInGrid.php   |  2 +-
 ...tAttributeAbsenceInSearchOnProductForm.php |  2 +-
 ...roductAttributeAbsenceInTemplateGroups.php |  2 +-
 ...AttributeAbsenceInUnassignedAttributes.php |  2 +-
 ...rtProductAttributeDisplayingOnFrontend.php |  6 +--
 ...ProductAttributeDisplayingOnSearchForm.php |  2 +-
 .../AssertProductAttributeInGrid.php          |  2 +-
 .../AssertProductAttributeIsComparable.php    |  6 +--
 .../AssertProductAttributeIsFilterable.php    |  6 +--
 ...rtProductAttributeIsFilterableInSearch.php |  4 +-
 .../AssertProductAttributeIsGlobal.php        |  2 +-
 .../AssertProductAttributeIsHtmlAllowed.php   |  6 +--
 .../AssertProductAttributeIsRequired.php      |  4 +-
 .../AssertProductAttributeIsUnique.php        |  4 +-
 ...ProductAttributeIsUsedInSortOnFrontend.php |  4 +-
 ...AssertProductAttributeIsUsedPromoRules.php |  2 +-
 .../AssertProductAttributeSaveMessage.php     |  2 +-
 ...rtProductAttributeSuccessDeleteMessage.php |  2 +-
 .../AssertProductCompareBlockOnCmsPage.php    |  6 +--
 .../AssertProductCompareItemsLink.php         |  2 +-
 .../AssertProductCompareItemsLinkIsAbsent.php |  2 +-
 .../Constraint/AssertProductComparePage.php   |  2 +-
 ...ProductCompareRemoveLastProductMessage.php |  2 +-
 .../AssertProductCompareSuccessAddMessage.php |  4 +-
 ...CompareSuccessRemoveAllProductsMessage.php |  2 +-
 ...sertProductCompareSuccessRemoveMessage.php |  4 +-
 ...ssertProductCustomOptionsOnProductPage.php |  6 +--
 .../Constraint/AssertProductDuplicateForm.php |  2 +-
 ...ductDuplicateIsNotDisplayingOnFrontend.php |  2 +-
 .../AssertProductDuplicateMessage.php         |  2 +-
 .../AssertProductDuplicatedInGrid.php         |  4 +-
 .../Test/Constraint/AssertProductForm.php     |  4 +-
 ...AssertProductGroupedPriceOnProductPage.php |  6 +--
 .../Test/Constraint/AssertProductInCart.php   |  6 +--
 .../Constraint/AssertProductInCategory.php    |  4 +-
 .../Test/Constraint/AssertProductInGrid.php   |  4 +-
 .../Test/Constraint/AssertProductInStock.php  |  6 +--
 ...AssertProductIsNotDisplayingOnFrontend.php |  6 +--
 ...ssertProductIsNotVisibleInCompareBlock.php |  4 +-
 ...AssertProductIsNotVisibleInComparePage.php |  4 +-
 .../Constraint/AssertProductNotInGrid.php     |  4 +-
 .../AssertProductNotSearchableBySku.php       |  4 +-
 .../AssertProductNotVisibleInCategory.php     |  4 +-
 .../Constraint/AssertProductOutOfStock.php    |  6 +--
 .../Test/Constraint/AssertProductPage.php     |  6 +--
 .../Constraint/AssertProductSaveMessage.php   |  2 +-
 .../AssertProductSearchableBySku.php          |  4 +-
 .../AssertProductSkuAutoGenerated.php         |  4 +-
 ...AssertProductSpecialPriceOnProductPage.php |  6 +--
 .../AssertProductSuccessDeleteMessage.php     |  4 +-
 .../Constraint/AssertProductTemplateForm.php  |  2 +-
 ...ssertProductTemplateGroupOnProductForm.php |  6 +--
 .../AssertProductTemplateInGrid.php           |  2 +-
 .../AssertProductTemplateNotInGrid.php        |  2 +-
 .../AssertProductTemplateOnProductForm.php    |  4 +-
 ...ertProductTemplateSuccessDeleteMessage.php |  2 +-
 ...ssertProductTemplateSuccessSaveMessage.php |  2 +-
 .../AssertProductTierPriceOnProductPage.php   |  6 +--
 .../Test/Constraint/AssertProductView.php     |  4 +-
 .../AssertProductVisibleInCategory.php        |  4 +-
 .../AssertRelatedProductsSection.php          |  6 +--
 .../AssertUpSellsProductsSection.php          |  8 +--
 ...SuperAttributeImpossibleDeleteMessages.php |  2 +-
 .../Catalog/Test/Fixture/AssignProducts.php   |  4 +-
 .../Catalog/Test/Fixture/Cart/Item.php        |  2 +-
 .../Test/Fixture/CatalogAttributeSet.php      |  2 +-
 .../AssignedAttributes.php                    |  4 +-
 .../CatalogAttributeSet/SkeletonSet.php       |  4 +-
 .../Test/Fixture/CatalogProductAttribute.php  |  2 +-
 .../CatalogProductAttribute/Options.php       |  2 +-
 .../Test/Fixture/CatalogProductSimple.php     | 12 ++---
 .../AbstractRelatedProducts.php               |  4 +-
 .../CatalogProductSimple/AttributeSetId.php   |  4 +-
 .../CatalogProductSimple/CategoryIds.php      |  4 +-
 .../CatalogProductSimple/CheckoutData.php     |  2 +-
 .../CatalogProductSimple/CustomAttribute.php  |  4 +-
 .../CatalogProductSimple/CustomOptions.php    |  4 +-
 .../Test/Fixture/CatalogProductSimple/Fpt.php |  2 +-
 .../GroupPriceOptions.php                     |  6 +--
 .../Fixture/CatalogProductSimple/Price.php    |  4 +-
 .../Fixture/CatalogProductSimple/TaxClass.php | 12 ++---
 .../CatalogProductSimple/TierPriceOptions.php |  2 +-
 .../Test/Fixture/CatalogProductVirtual.php    | 12 ++---
 .../Magento/Catalog/Test/Fixture/Category.php |  2 +-
 .../Fixture/Category/CategoryProducts.php     |  4 +-
 .../Test/Fixture/Category/LandingPage.php     |  4 +-
 .../Test/Fixture/Category/ParentId.php        |  4 +-
 .../Test/Fixture/CrosssellProducts.php        |  2 +-
 .../Magento/Catalog/Test/Fixture/Product.php  |  8 +--
 .../Catalog/Test/Fixture/ProductAttribute.php |  6 +--
 .../Catalog/Test/Fixture/SimpleProduct.php    |  4 +-
 .../Catalog/Test/Fixture/VirtualProduct.php   |  2 +-
 .../CatalogAttributeSetInterface.php          |  2 +-
 .../Test/Handler/CatalogAttributeSet/Curl.php | 12 ++---
 .../CatalogProductAttributeInterface.php      |  2 +-
 .../Handler/CatalogProductAttribute/Curl.php  | 12 ++---
 .../CatalogProductSimpleInterface.php         |  2 +-
 .../Handler/CatalogProductSimple/Curl.php     | 12 ++---
 .../Test/Handler/CatalogProductSimple/Ui.php  |  6 +--
 .../CatalogProductVirtualInterface.php        |  2 +-
 .../Handler/Category/CategoryInterface.php    |  2 +-
 .../Catalog/Test/Handler/Category/Curl.php    | 12 ++---
 .../Test/Handler/Curl/CreateProduct.php       | 14 ++---
 .../Handler/Curl/CreateProductAttribute.php   | 12 ++---
 .../Catalog/Test/Handler/Ui/CreateProduct.php |  6 +--
 .../Test/Page/Category/CatalogCategory.php    |  6 +--
 .../Page/Category/CatalogCategoryEdit.php     |  6 +--
 .../CatalogProductActionAttributeEdit.php     |  6 +--
 .../Test/Repository/AssignProducts.php        |  2 +-
 .../Test/Repository/CatalogAttributeSet.php   |  2 +-
 .../Repository/CatalogProductAttribute.php    |  2 +-
 .../Test/Repository/CatalogProductSimple.php  |  2 +-
 .../Test/Repository/CatalogProductVirtual.php |  2 +-
 .../Catalog/Test/Repository/Category.php      |  2 +-
 .../Catalog/Test/Repository/Product.php       |  2 +-
 .../Test/Repository/ProductAttribute.php      |  2 +-
 .../Category/CreateCategoryEntityTest.php     |  2 +-
 .../Category/DeleteCategoryEntityTest.php     |  2 +-
 .../Category/UpdateCategoryEntityTest.php     |  2 +-
 .../AbstractAddRelatedProductsEntityTest.php  |  6 +--
 .../Product/AbstractCompareProductsTest.php   | 10 ++--
 .../TestCase/Product/CreateProductTest.php    |  4 +-
 .../Product/CreateSimpleProductEntityTest.php |  2 +-
 .../Product/CreateSimpleWithCategoryTest.php  |  4 +-
 ...SimpleWithCustomOptionsAndCategoryTest.php |  4 +-
 .../Test/TestCase/Product/CreateTest.php      |  4 +-
 .../CreateVirtualProductEntityTest.php        |  2 +-
 .../TestCase/Product/CreateVirtualTest.php    |  4 +-
 .../Test/TestCase/Product/CrosssellTest.php   |  4 +-
 .../Product/EditSimpleProductTest.php         |  4 +-
 .../ProductTypeSwitchingOnCreationTest.php    |  4 +-
 .../ProductTypeSwitchingOnUpdateTest.php      |  4 +-
 .../TestCase/Product/RelatedProductTest.php   |  4 +-
 .../TestCase/Product/UnassignCategoryTest.php |  4 +-
 .../Product/UpdateSimpleProductEntityTest.php |  4 +-
 .../UpdateVirtualProductEntityTest.php        |  4 +-
 .../Test/TestCase/Product/UpsellTest.php      |  4 +-
 .../CreateAttributeSetEntityTest.php          |  2 +-
 ...ductAttributeEntityFromProductPageTest.php |  6 +--
 .../CreateProductAttributeEntityTest.php      |  4 +-
 ...AssignedToTemplateProductAttributeTest.php |  2 +-
 .../DeleteAttributeSetTest.php                |  4 +-
 .../DeleteProductAttributeEntityTest.php      |  2 +-
 .../DeleteSystemProductAttributeTest.php      |  2 +-
 ...UsedInConfigurableProductAttributeTest.php |  2 +-
 .../UpdateAttributeSetTest.php                |  2 +-
 .../UpdateProductAttributeEntityTest.php      |  2 +-
 .../AddAttributeToProductTemplateStep.php     |  4 +-
 .../AddNewAttributeFromProductPageStep.php    |  2 +-
 .../Test/TestStep/AddNewAttributeStep.php     |  2 +-
 .../Test/TestStep/CreateProductStep.php       |  6 +--
 .../TestStep/CreateProductTemplateStep.php    |  2 +-
 .../Test/TestStep/CreateProductsStep.php      |  6 +--
 .../Test/TestStep/DeleteAttributeStep.php     |  2 +-
 .../FillAttributeFormOnProductPageStep.php    |  2 +-
 .../Test/TestStep/FillAttributeFormStep.php   |  2 +-
 .../OpenProductAttributesPageStep.php         |  2 +-
 .../TestStep/OpenProductOnBackendStep.php     |  4 +-
 .../TestStep/OpenProductsOnFrontendStep.php   |  4 +-
 .../SaveAttributeOnProductPageStep.php        |  2 +-
 .../Test/TestStep/SaveAttributeStep.php       |  2 +-
 .../Catalog/Test/TestStep/SaveProductStep.php |  4 +-
 .../Test/TestStep/SaveProductTemplateStep.php |  2 +-
 .../TestStep/SetDefaultAttributeValueStep.php |  4 +-
 .../Magento/Catalog/Test/etc/constraint.xml   | 42 +++++++--------
 .../app/Magento/Catalog/Test/etc/scenario.xml |  2 +-
 .../Test/Block/Adminhtml/Promo/Catalog.php    |  4 +-
 .../Promo/Catalog/Edit/PromoForm.php          |  6 +--
 .../Promo/Catalog/Edit/Tab/Conditions.php     |  4 +-
 .../CatalogRule/Test/Block/Conditions.php     |  4 +-
 ...sertCatalogPriceRuleAppliedCatalogPage.php |  2 +-
 ...sertCatalogPriceRuleAppliedProductPage.php |  2 +-
 ...ertCatalogPriceRuleAppliedShoppingCart.php |  2 +-
 .../Constraint/AssertCatalogPriceRuleForm.php |  2 +-
 .../AssertCatalogPriceRuleInGrid.php          |  2 +-
 .../AssertCatalogPriceRuleNotInGrid.php       |  2 +-
 .../AssertCatalogPriceRuleNoticeMessage.php   |  2 +-
 ...rtCatalogPriceRuleSuccessDeleteMessage.php |  2 +-
 ...sertCatalogPriceRuleSuccessSaveMessage.php |  2 +-
 .../Test/Fixture/CatalogPriceRule.php         |  4 +-
 .../CatalogRule/Test/Fixture/CatalogRule.php  |  2 +-
 .../Test/Fixture/CatalogRule/Conditions.php   |  6 +--
 .../CatalogRule/Test/Fixture/Conditions.php   |  4 +-
 .../Test/Fixture/Product/Category.php         |  6 +--
 .../CatalogRule/CatalogRuleInterface.php      |  2 +-
 .../Test/Handler/CatalogRule/Curl.php         | 10 ++--
 .../Test/Repository/CatalogPriceRule.php      |  2 +-
 .../Test/Repository/CatalogRule.php           |  2 +-
 .../AbstractCatalogRuleEntityTest.php         |  4 +-
 .../DeleteCatalogPriceRuleEntityTest.php      |  2 +-
 .../TestStep/DeleteAllCatalogRulesStep.php    |  2 +-
 .../Test/Block/Advanced/Form.php              | 10 ++--
 .../Test/Block/Advanced/Result.php            |  4 +-
 .../AssertAdvancedSearchProductsResult.php    |  2 +-
 .../Constraint/AssertCatalogSearchResult.php  |  2 +-
 ...sertProductCanBeOpenedFromSearchResult.php |  2 +-
 ...rtSearchSynonymMassActionNotOnFrontend.php |  4 +-
 .../AssertSearchSynonymNotOnFrontend.php      |  4 +-
 .../Test/Constraint/AssertSearchTermForm.php  |  2 +-
 .../Constraint/AssertSearchTermInGrid.php     |  2 +-
 ...ssertSearchTermMassActionNotOnFrontend.php |  4 +-
 .../AssertSearchTermMassActionsNotInGrid.php  |  2 +-
 .../Constraint/AssertSearchTermNotInGrid.php  |  2 +-
 .../AssertSearchTermNotOnFrontend.php         |  4 +-
 .../Constraint/AssertSearchTermOnFrontend.php |  4 +-
 .../AssertSearchTermSuccessDeleteMessage.php  |  2 +-
 ...sertSearchTermSuccessMassDeleteMessage.php |  2 +-
 .../AssertSearchTermSuccessSaveMessage.php    |  2 +-
 .../AssertSearchTermSynonymOnFrontend.php     |  4 +-
 .../AssertSuggestSearchingResult.php          |  2 +-
 .../Test/Fixture/CatalogSearchQuery.php       |  2 +-
 .../Fixture/CatalogSearchQuery/QueryText.php  |  6 +--
 .../CatalogSearchQueryInterface.php           |  2 +-
 .../Test/Handler/CatalogSearchQuery/Curl.php  | 12 ++---
 .../Test/Repository/CatalogSearchQuery.php    |  2 +-
 .../TestCase/AdvancedSearchEntityTest.php     |  4 +-
 .../TestCase/CreateSearchTermEntityTest.php   |  2 +-
 .../TestCase/DeleteSearchTermEntityTest.php   |  2 +-
 .../TestCase/EditSearchTermEntityTest.php     |  2 +-
 .../MassDeleteSearchTermEntityTest.php        |  4 +-
 .../Test/TestCase/SearchEntityResultsTest.php |  2 +-
 .../SuggestSearchingResultEntityTest.php      |  2 +-
 .../CatalogSearch/Test/etc/constraint.xml     | 12 ++---
 .../app/Magento/Checkout/Test/Block/Cart.php  |  8 +--
 .../Test/Block/Cart/AbstractCartItem.php      |  2 +-
 .../Checkout/Test/Block/Cart/CartEmpty.php    |  4 +-
 .../Checkout/Test/Block/Cart/CartItem.php     |  2 +-
 .../Test/Block/Cart/DiscountCodes.php         |  4 +-
 .../Checkout/Test/Block/Cart/Shipping.php     |  4 +-
 .../Checkout/Test/Block/Cart/Sidebar.php      |  6 +--
 .../Checkout/Test/Block/Cart/Totals.php       |  4 +-
 .../Checkout/Test/Block/Onepage/Link.php      |  2 +-
 ...AssertAddedProductToCartSuccessMessage.php |  4 +-
 .../Test/Constraint/AssertCartIsEmpty.php     |  4 +-
 .../Constraint/AssertCartItemsOptions.php     |  4 +-
 .../AssertGrandTotalInShoppingCart.php        |  2 +-
 .../AssertOrderSuccessPlacedMessage.php       |  2 +-
 .../AssertOrderTotalOnReviewPage.php          |  2 +-
 .../Constraint/AssertPriceInShoppingCart.php  |  4 +-
 .../AssertProductAbsentInMiniShoppingCart.php |  4 +-
 .../Constraint/AssertProductIsNotEditable.php |  2 +-
 ...AssertProductPresentInMiniShoppingCart.php |  2 +-
 .../AssertProductPresentInShoppingCart.php    |  2 +-
 .../AssertProductQtyInMiniShoppingCart.php    |  4 +-
 .../AssertProductQtyInShoppingCart.php        |  4 +-
 .../AssertProductsAbsentInShoppingCart.php    |  2 +-
 .../AssertSubtotalInShoppingCart.php          |  4 +-
 .../Magento/Checkout/Test/Fixture/Cart.php    |  2 +-
 .../Checkout/Test/Fixture/Cart/Items.php      |  4 +-
 .../AddProductsToShoppingCartEntityTest.php   |  8 +--
 .../DeleteProductFromMiniShoppingCartTest.php |  8 +--
 .../DeleteProductsFromShoppingCartTest.php    | 10 ++--
 ...eProductFromMiniShoppingCartEntityTest.php |  6 +--
 .../Test/TestCase/UpdateShoppingCartTest.php  |  6 +--
 .../TestStep/AddProductsToTheCartStep.php     |  4 +-
 .../TestStep/FillBillingInformationStep.php   |  2 +-
 .../Test/TestStep/FillShippingMethodStep.php  |  2 +-
 .../Checkout/Test/TestStep/PlaceOrderStep.php |  2 +-
 .../Test/TestStep/ProceedToCheckoutStep.php   |  2 +-
 .../TestStep/SelectCheckoutMethodStep.php     |  2 +-
 .../Test/TestStep/SelectPaymentMethodStep.php |  2 +-
 .../Magento/Checkout/Test/etc/scenario.xml    |  2 +-
 .../Handler/CmsBlock/CmsBlockInterface.php    |  2 +-
 .../Cms/Test/Handler/CmsBlock/Curl.php        | 12 ++---
 .../Test/Handler/CmsPage/CmsPageInterface.php |  2 +-
 .../Magento/Cms/Test/Handler/CmsPage/Curl.php | 10 ++--
 .../Product/AffectedAttributeSet.php          |  8 +--
 .../Adminhtml/Product/Composite/Configure.php |  2 +-
 .../Product/Edit/Tab/Super/Config.php         |  6 +--
 .../Edit/Tab/Super/Config/Attribute.php       |  4 +-
 .../Config/Attribute/AttributeSelector.php    |  2 +-
 .../Super/Config/Attribute/ToggleDropdown.php |  4 +-
 .../Product/Edit/Tab/Super/Config/Matrix.php  |  4 +-
 .../Adminhtml/Product/FormPageActions.php     |  4 +-
 .../Block/Adminhtml/Product/ProductForm.php   | 10 ++--
 .../Test/Block/Product/View.php               |  4 +-
 .../Product/View/ConfigurableOptions.php      | 10 ++--
 ...rtChildProductIsNotDisplayedSeparately.php |  2 +-
 .../Constraint/AssertChildProductsInGrid.php  |  2 +-
 ...figurableAttributesAbsentOnProductPage.php |  4 +-
 ...leAttributesBlockIsAbsentOnProductPage.php |  4 +-
 ...AssertConfigurableProductDuplicateForm.php |  2 +-
 .../AssertConfigurableProductInCart.php       |  4 +-
 ...ProductInCustomerWishlistOnBackendGrid.php |  2 +-
 ...tConfigurableProductInItemsOrderedGrid.php |  2 +-
 ...ductAttributeAbsenceInVariationsSearch.php |  2 +-
 .../AssertProductAttributeIsConfigurable.php  |  2 +-
 .../Test/Fixture/Cart/Item.php                |  2 +-
 .../Test/Fixture/ConfigurableProduct.php      |  4 +-
 .../Fixture/ConfigurableProductInjectable.php | 12 ++---
 .../ConfigurableAttributesData.php            |  6 +--
 ...ConfigurableProductInjectableInterface.php |  2 +-
 .../ConfigurableProductInjectable/Curl.php    |  4 +-
 .../Test/Handler/Curl/CreateConfigurable.php  | 12 ++---
 .../ConfigurableProductInjectable.php         |  2 +-
 .../CreateConfigurableProductEntityTest.php   |  2 +-
 .../Test/TestCase/CreateConfigurableTest.php  |  4 +-
 .../Test/TestCase/CreateWithAttributeTest.php |  4 +-
 .../Test/TestCase/EditConfigurableTest.php    |  2 +-
 .../UpdateConfigurableProductEntityTest.php   |  2 +-
 .../UpdateConfigurableProductStep.php         |  4 +-
 .../ConfigurableProduct/Test/etc/scenario.xml |  2 +-
 .../System/Variable/FormPageActions.php       |  2 +-
 .../app/Magento/Core/Test/Block/Messages.php  |  4 +-
 .../Constraint/AssertCustomVariableForm.php   |  2 +-
 .../Constraint/AssertCustomVariableInGrid.php |  2 +-
 .../Constraint/AssertCustomVariableInPage.php |  6 +--
 .../AssertCustomVariableNotInCmsPageForm.php  |  2 +-
 .../AssertCustomVariableNotInGrid.php         |  2 +-
 ...sertCustomVariableSuccessDeleteMessage.php |  2 +-
 ...AssertCustomVariableSuccessSaveMessage.php |  2 +-
 .../Magento/Core/Test/Fixture/ConfigData.php  |  2 +-
 .../Core/Test/Fixture/SystemVariable.php      |  2 +-
 .../ConfigData/ConfigDataInterface.php        |  2 +-
 .../Core/Test/Handler/ConfigData/Curl.php     | 12 ++---
 .../Core/Test/Handler/SystemVariable/Curl.php | 12 ++---
 .../SystemVariableInterface.php               |  2 +-
 .../Core/Test/Repository/SystemVariable.php   |  2 +-
 .../Block/Account/AddressesAdditional.php     |  4 +-
 .../Test/Block/Account/AddressesDefault.php   |  4 +-
 .../Test/Block/Account/Dashboard/Address.php  |  2 +-
 .../Test/Block/Account/Dashboard/Info.php     |  2 +-
 .../Customer/Test/Block/Account/Links.php     |  4 +-
 .../Customer/Test/Block/Address/Edit.php      |  4 +-
 .../Block/Adminhtml/Edit/CustomerForm.php     |  4 +-
 .../Block/Adminhtml/Edit/Tab/Addresses.php    |  8 +--
 .../Customer/Test/Block/Form/CustomerForm.php |  6 +--
 .../Test/Block/Form/ForgotPassword.php        |  4 +-
 .../Customer/Test/Block/Form/Login.php        |  6 +--
 .../Customer/Test/Block/Form/Register.php     |  6 +--
 .../AssertAddressDeletedBackend.php           |  2 +-
 .../AssertAddressDeletedFrontend.php          |  2 +-
 .../AssertChangePasswordFailMessage.php       |  2 +-
 ...ssertCustomerAddressSuccessSaveMessage.php |  2 +-
 .../AssertCustomerDefaultAddresses.php        |  2 +-
 .../AssertCustomerFailRegisterMessage.php     |  2 +-
 .../Test/Constraint/AssertCustomerForm.php    |  2 +-
 .../AssertCustomerGroupAlreadyExists.php      |  2 +-
 .../Constraint/AssertCustomerGroupForm.php    |  2 +-
 .../Constraint/AssertCustomerGroupInGrid.php  |  2 +-
 .../AssertCustomerGroupNotInGrid.php          |  2 +-
 .../AssertCustomerGroupOnCustomerForm.php     |  4 +-
 ...ssertCustomerGroupSuccessDeleteMessage.php |  2 +-
 .../AssertCustomerGroupSuccessSaveMessage.php |  2 +-
 .../Test/Constraint/AssertCustomerInGrid.php  |  2 +-
 .../AssertCustomerInfoSuccessSavedMessage.php |  2 +-
 .../Constraint/AssertCustomerInvalidEmail.php |  2 +-
 .../AssertCustomerMassDeleteInGrid.php        |  2 +-
 .../AssertCustomerMassDeleteNotInGrid.php     |  2 +-
 ...AssertCustomerMassDeleteSuccessMessage.php |  2 +-
 .../Constraint/AssertCustomerNotInGrid.php    |  2 +-
 .../AssertCustomerPasswordChanged.php         |  4 +-
 .../AssertCustomerRedirectToDashboard.php     |  2 +-
 .../AssertCustomerSuccessDeleteMessage.php    |  2 +-
 .../AssertCustomerSuccessRegisterMessage.php  |  2 +-
 .../AssertCustomerSuccessSaveMessage.php      |  2 +-
 .../AssertMassActionSuccessUpdateMessage.php  |  2 +-
 .../AssertWrongPassConfirmationMessage.php    |  2 +-
 .../Magento/Customer/Test/Fixture/Address.php |  6 +--
 .../Customer/Test/Fixture/AddressBook.php     |  8 +--
 .../Test/Fixture/AddressInjectable.php        |  2 +-
 .../Customer/Test/Fixture/Customer.php        |  4 +-
 .../Customer/Test/Fixture/CustomerBackend.php |  2 +-
 .../Customer/Test/Fixture/CustomerGroup.php   |  4 +-
 .../Fixture/CustomerGroup/TaxClassIds.php     |  4 +-
 .../Test/Fixture/CustomerGroupInjectable.php  |  2 +-
 .../Test/Fixture/CustomerInjectable.php       |  2 +-
 .../Fixture/CustomerInjectable/Address.php    |  4 +-
 .../Fixture/CustomerInjectable/GroupId.php    |  4 +-
 .../Test/Handler/Curl/CreateCustomer.php      |  8 +--
 .../Handler/Curl/CreateCustomerBackend.php    | 12 ++---
 .../Test/Handler/Curl/CreateCustomerGroup.php | 12 ++---
 .../Handler/Curl/SaveCustomerWithAddress.php  |  8 +--
 .../Handler/CustomerGroupInjectable/Curl.php  | 12 ++---
 .../CustomerGroupInjectableInterface.php      |  2 +-
 .../Test/Handler/CustomerInjectable/Curl.php  | 12 ++---
 .../CustomerInjectableInterface.php           |  2 +-
 .../Test/Handler/Ui/CreateAddress.php         |  6 +--
 .../Test/Handler/Webapi/CreateCustomer.php    |  6 +--
 .../Test/Page/Address/DefaultAddress.php      |  6 +--
 .../Page/CustomerAccountForgotPassword.php    |  6 +--
 .../Test/Page/CustomerAccountLogout.php       |  2 +-
 .../Test/Page/CustomerAddressEdit.php         |  6 +--
 .../Customer/Test/Repository/Address.php      |  2 +-
 .../Test/Repository/AddressInjectable.php     |  2 +-
 .../Customer/Test/Repository/Customer.php     |  2 +-
 .../Test/Repository/CustomerGroup.php         |  2 +-
 .../Repository/CustomerGroupInjectable.php    |  2 +-
 .../Test/Repository/CustomerInjectable.php    |  2 +-
 .../TestCase/BackendCustomerCreateTest.php    |  4 +-
 .../CreateCustomerBackendEntityTest.php       |  2 +-
 .../CreateCustomerGroupEntityTest.php         |  2 +-
 .../CreateExistingCustomerFrontendEntity.php  |  2 +-
 .../TestCase/DeleteCustomerAddressTest.php    |  2 +-
 .../DeleteCustomerBackendEntityTest.php       |  2 +-
 .../DeleteCustomerGroupEntityTest.php         |  2 +-
 .../TestCase/ForgotPasswordOnFrontendTest.php |  4 +-
 .../TestCase/MassAssignCustomerGroupTest.php  |  2 +-
 .../MassDeleteCustomerBackendEntityTest.php   |  4 +-
 .../RegisterCustomerFrontendEntityTest.php    |  2 +-
 .../UpdateCustomerBackendEntityTest.php       |  2 +-
 .../UpdateCustomerFrontendEntityTest.php      |  4 +-
 .../UpdateCustomerGroupEntityTest.php         |  2 +-
 .../Test/TestStep/CreateCustomerStep.php      |  2 +-
 .../CreateOrderFromCustomerAccountStep.php    |  2 +-
 .../TestStep/LoginCustomerOnFrontendStep.php  |  2 +-
 .../TestStep/LogoutCustomerOnFrontendStep.php |  2 +-
 .../TestStep/OpenCustomerOnBackendStep.php    |  2 +-
 .../Magento/Customer/Test/etc/scenario.xml    |  2 +-
 .../Catalog/Product/Edit/Tab/Downloadable.php |  6 +--
 .../Product/Edit/Tab/Downloadable/LinkRow.php |  2 +-
 .../Product/Edit/Tab/Downloadable/Links.php   |  6 +--
 .../Edit/Tab/Downloadable/SampleRow.php       |  2 +-
 .../Product/Edit/Tab/Downloadable/Samples.php |  6 +--
 .../Adminhtml/Product/Composite/Configure.php |  2 +-
 .../Test/Block/Catalog/Product/View.php       |  4 +-
 .../Test/Block/Catalog/Product/View/Links.php |  4 +-
 .../Block/Catalog/Product/View/Samples.php    |  2 +-
 .../Block/Customer/Products/ListProducts.php  |  4 +-
 .../AssertDownloadableDuplicateForm.php       |  2 +-
 .../AssertDownloadableLinksData.php           |  4 +-
 ...ProductInCustomerWishlistOnBackendGrid.php |  2 +-
 .../AssertDownloadableSamplesData.php         |  4 +-
 .../Downloadable/Test/Fixture/Cart/Item.php   |  2 +-
 .../Test/Fixture/DownloadableProduct.php      |  2 +-
 .../LinksNotPurchasedSeparately.php           |  2 +-
 .../LinksPurchasedSeparately.php              |  2 +-
 .../Fixture/DownloadableProductInjectable.php |  2 +-
 .../DownloadableProductInjectable/Links.php   |  2 +-
 .../DownloadableProductInjectable/Samples.php |  2 +-
 .../Test/Handler/Curl/CreateDownloadable.php  | 12 ++---
 .../DownloadableProductInjectable/Curl.php    | 10 ++--
 ...DownloadableProductInjectableInterface.php |  2 +-
 .../DownloadableProductInjectable.php         |  2 +-
 .../Create/LinksPurchasedSeparatelyTest.php   |  4 +-
 .../CreateDownloadableProductEntityTest.php   |  2 +-
 .../UpdateDownloadableProductEntityTest.php   |  4 +-
 .../Downloadable/Test/etc/constraint.xml      |  2 +-
 .../Block/Adminhtml/Order/Create/Form.php     |  6 +--
 .../Adminhtml/Order/Create/GiftOptions.php    |  2 +-
 .../Block/Adminhtml/Order/Create/Items.php    |  4 +-
 .../Order/Create/Items/ItemProduct.php        |  2 +-
 .../Test/Block/Adminhtml/Order/View/Form.php  |  2 +-
 .../Adminhtml/Order/View/GiftOptions.php      |  2 +-
 .../Test/Block/Adminhtml/Order/View/Items.php |  4 +-
 .../Order/View/Items/ItemProduct.php          |  2 +-
 .../GiftMessage/Test/Block/Message/Inline.php |  4 +-
 .../Block/Message/Inline/GiftMessageForm.php  |  2 +-
 .../Test/Block/Message/Order/Items/View.php   |  4 +-
 .../AssertGiftMessageInBackendOrder.php       |  2 +-
 .../AssertGiftMessageInFrontendOrder.php      |  2 +-
 .../AssertGiftMessageInFrontendOrderItems.php |  2 +-
 .../GiftMessage/Test/Fixture/GiftMessage.php  |  2 +-
 .../Test/Fixture/GiftMessage/Items.php        |  4 +-
 .../Test/Repository/GiftMessage.php           |  2 +-
 .../TestStep/AddGiftMessageBackendStep.php    |  2 +-
 .../Test/TestStep/AddGiftMessageStep.php      |  2 +-
 .../Magento/GiftMessage/Test/etc/scenario.xml |  2 +-
 .../Types/Edit/GoogleShoppingForm.php         |  6 +--
 ...uctAttributeAbsenceForAttributeMapping.php |  4 +-
 .../Test/Fixture/GoogleShoppingAttribute.php  |  2 +-
 .../AttributeSetId.php                        |  4 +-
 .../Repository/GoogleShoppingAttribute.php    |  2 +-
 .../Adminhtml/Product/Composite/Configure.php |  2 +-
 .../Product/Grouped/AssociatedProducts.php    |  6 +--
 .../ListAssociatedProducts.php                |  4 +-
 .../ListAssociatedProducts/Product.php        |  2 +-
 .../Test/Block/Catalog/Product/View.php       |  2 +-
 .../Catalog/Product/View/Type/Grouped.php     |  8 +--
 .../Test/Block/Checkout/Cart.php              |  2 +-
 ...bstractAssertPriceOnGroupedProductPage.php |  4 +-
 ...AssertGroupedPriceOnGroupedProductPage.php |  2 +-
 .../Constraint/AssertGroupedProductForm.php   |  2 +-
 ...ProductInCustomerWishlistOnBackendGrid.php |  2 +-
 ...AssertGroupedProductInItemsOrderedGrid.php |  2 +-
 .../AssertGroupedProductsDefaultQty.php       |  4 +-
 ...AssertSpecialPriceOnGroupedProductPage.php |  2 +-
 .../AssertTierPriceOnGroupedProductPage.php   |  2 +-
 .../GroupedProduct/Test/Fixture/Cart/Item.php |  2 +-
 .../Test/Fixture/GroupedProduct.php           |  4 +-
 .../Test/Fixture/GroupedProductInjectable.php | 12 ++---
 .../GroupedProductInjectable/Associated.php   |  6 +--
 .../GroupedProductInjectable/Price.php        |  2 +-
 .../Handler/GroupedProductInjectable/Curl.php |  2 +-
 .../GroupedProductInjectableInterface.php     |  2 +-
 .../Repository/GroupedProductInjectable.php   |  2 +-
 .../CreateGroupedProductEntityTest.php        |  2 +-
 .../Test/TestCase/CreateGroupedTest.php       |  4 +-
 .../UpdateGroupedProductEntityTest.php        |  2 +-
 .../Test/Block/Adminhtml/Export/Edit/Form.php |  2 +-
 ...AssertProductAttributeAbsenceForExport.php |  2 +-
 .../Test/Fixture/ImportExport.php             |  2 +-
 .../Install/Test/Block/CreateAdmin.php        |  8 +--
 .../Install/Test/Block/CustomizeStore.php     |  8 +--
 .../Magento/Install/Test/Block/Database.php   |  4 +-
 .../Magento/Install/Test/Block/Install.php    |  4 +-
 .../Magento/Install/Test/Block/Landing.php    |  4 +-
 .../Magento/Install/Test/Block/License.php    |  4 +-
 .../Magento/Install/Test/Block/Readiness.php  |  4 +-
 .../Install/Test/Block/WebConfiguration.php   |  2 +-
 .../Constraint/AssertAgreementTextPresent.php |  2 +-
 .../Constraint/AssertCurrencySelected.php     |  2 +-
 .../Test/Constraint/AssertKeyCreated.php      |  2 +-
 .../Constraint/AssertLanguageSelected.php     |  2 +-
 .../Test/Constraint/AssertRewritesEnabled.php |  4 +-
 .../Constraint/AssertSecureUrlEnabled.php     |  4 +-
 .../Test/Constraint/AssertSuccessInstall.php  |  2 +-
 .../AssertSuccessfulReadinessCheck.php        |  2 +-
 .../Magento/Install/Test/Fixture/Install.php  |  2 +-
 .../Install/Test/TestCase/InstallTest.php     |  6 +--
 .../Adminhtml/Integration/IntegrationGrid.php |  2 +-
 .../IntegrationGrid/DeleteDialog.php          |  4 +-
 .../IntegrationGrid/ResourcesPopup.php        |  2 +-
 .../IntegrationGrid/TokensPopup.php           |  2 +-
 .../Test/Constraint/AssertIntegrationForm.php |  2 +-
 .../Constraint/AssertIntegrationInGrid.php    |  2 +-
 .../Constraint/AssertIntegrationNotInGrid.php |  2 +-
 .../AssertIntegrationResourcesPopup.php       |  2 +-
 ...ertIntegrationSuccessActivationMessage.php |  2 +-
 .../AssertIntegrationSuccessDeleteMessage.php |  2 +-
 ...rtIntegrationSuccessReauthorizeMessage.php |  2 +-
 .../AssertIntegrationSuccessSaveMessage.php   |  2 +-
 ...ssertIntegrationTokensAfterReauthorize.php |  2 +-
 .../AssertIntegrationTokensPopup.php          |  2 +-
 .../Integration/Test/Fixture/Integration.php  |  2 +-
 .../Test/Handler/Integration/Curl.php         | 12 ++---
 .../Integration/IntegrationInterface.php      |  2 +-
 .../Test/Repository/Integration.php           |  2 +-
 .../ActivateIntegrationEntityTest.php         |  2 +-
 .../TestCase/CreateIntegrationEntityTest.php  |  2 +-
 .../TestCase/DeleteIntegrationEntityTest.php  |  2 +-
 ...ReAuthorizeTokensIntegrationEntityTest.php |  4 +-
 .../TestCase/UpdateIntegrationEntityTest.php  |  2 +-
 .../Test/Block/Adminhtml/Template/Grid.php    |  2 +-
 .../Test/Block/Adminhtml/Template/Preview.php |  4 +-
 ...AssertCustomerIsSubscribedToNewsletter.php |  2 +-
 .../Test/Constraint/AssertNewsletterForm.php  |  2 +-
 .../Constraint/AssertNewsletterInGrid.php     |  2 +-
 .../Constraint/AssertNewsletterPreview.php    |  4 +-
 .../Test/Constraint/AssertNewsletterQueue.php |  2 +-
 .../AssertNewsletterSuccessCreateMessage.php  |  2 +-
 .../Newsletter/Test/Fixture/Template.php      |  2 +-
 .../Newsletter/Test/Handler/Template/Curl.php | 12 ++---
 .../Handler/Template/TemplateInterface.php    |  2 +-
 .../Newsletter/Test/Repository/Template.php   |  2 +-
 .../ActionNewsletterTemplateEntityTest.php    |  2 +-
 .../CreateNewsletterTemplateEntityTest.php    |  2 +-
 .../TestCase/UpdateNewsletterTemplateTest.php |  2 +-
 .../Test/Block/Adminhtml/AbstractFilter.php   |  4 +-
 .../Block/Adminhtml/Customer/AccountsGrid.php |  4 +-
 .../Block/Adminhtml/Customer/Totals/Grid.php  |  4 +-
 .../Adminhtml/Refresh/Statistics/Grid.php     |  2 +-
 .../Block/Adminhtml/Review/Customer/Grid.php  |  2 +-
 .../Block/Adminhtml/Review/Products/Grid.php  |  2 +-
 .../Review/Products/Viewed/ProductGrid.php    |  2 +-
 .../Sales/Orders/Viewed/FilterGrid.php        |  2 +-
 .../Block/Adminhtml/Shopcart/Product/Grid.php |  2 +-
 ...bstractAssertCustomerOrderReportResult.php |  2 +-
 .../AbstractAssertInvoiceReportResult.php     |  4 +-
 .../AbstractAssertSalesReportResult.php       |  4 +-
 .../AssertAbandonedCartCustomerInfoResult.php |  2 +-
 .../AssertBestsellerReportResult.php          |  2 +-
 .../Constraint/AssertCouponReportResult.php   |  2 +-
 .../AssertDownloadsReportResult.php           |  2 +-
 .../AssertLowStockProductInGrid.php           |  2 +-
 .../AssertNewAccountsReportTotalResult.php    |  2 +-
 .../Constraint/AssertOrderedProductResult.php |  2 +-
 .../Constraint/AssertProductInCartResult.php  |  2 +-
 .../AssertProductReportByCustomerInGrid.php   |  2 +-
 ...AssertProductReportByCustomerNotInGrid.php |  2 +-
 ...sertProductReviewIsAvailableForProduct.php |  2 +-
 ...sertProductReviewReportIsVisibleInGrid.php |  2 +-
 .../AssertProductReviewsQtyByCustomer.php     |  2 +-
 .../AssertProductViewsReportTotalResult.php   |  2 +-
 .../Constraint/AssertSearchTermReportForm.php |  2 +-
 .../Constraint/AssertSearchTermsInGrid.php    |  2 +-
 .../Test/Constraint/AssertTaxReportInGrid.php |  2 +-
 .../Constraint/AssertTaxReportNotInGrid.php   |  2 +-
 .../AbandonedCartsReportEntityTest.php        |  6 +--
 .../CustomerReviewReportEntityTest.php        |  6 +--
 .../LowStockProductsReportEntityTest.php      |  2 +-
 .../TestCase/NewAccountsReportEntityTest.php  |  2 +-
 .../ProductReviewReportEntityTest.php         |  2 +-
 .../TestCase/ProductsInCartReportEntity.php   |  4 +-
 .../TestCase/SearchTermsReportEntityTest.php  |  4 +-
 .../ViewedProductsReportEntityTest.php        |  6 +--
 .../Block/Adminhtml/Edit/RatingElement.php    |  4 +-
 .../Test/Block/Adminhtml/ReviewForm.php       |  2 +-
 .../app/Magento/Review/Test/Block/Form.php    |  8 +--
 .../Review/Test/Block/Product/View.php        |  2 +-
 .../Test/Block/Product/View/Summary.php       |  4 +-
 .../Constraint/AssertProductRatingInGrid.php  |  2 +-
 .../AssertProductRatingInProductPage.php      |  4 +-
 .../AssertProductRatingNotInGrid.php          |  2 +-
 .../AssertProductRatingNotInProductPage.php   |  4 +-
 .../AssertProductRatingOnReviewPage.php       |  2 +-
 ...ssertProductRatingSuccessDeleteMessage.php |  2 +-
 .../AssertProductRatingSuccessSaveMessage.php |  2 +-
 ...ProductReviewBackendSuccessSaveMessage.php |  2 +-
 .../Constraint/AssertProductReviewForm.php    |  2 +-
 .../Constraint/AssertProductReviewInGrid.php  |  4 +-
 ...ssertProductReviewInGridOnCustomerPage.php |  2 +-
 ...sertProductReviewIsAbsentOnProductPage.php |  2 +-
 ...ctReviewMassActionSuccessDeleteMessage.php |  2 +-
 ...tProductReviewMassActionSuccessMessage.php |  2 +-
 .../AssertProductReviewNotInGrid.php          |  4 +-
 .../AssertProductReviewNotOnProductPage.php   |  4 +-
 .../AssertProductReviewOnProductPage.php      |  6 +--
 .../AssertReviewCreationSuccessMessage.php    |  2 +-
 ...ssertReviewLinksIsPresentOnProductPage.php |  6 +--
 .../AssertReviewSuccessSaveMessage.php        |  2 +-
 .../AssertSetApprovedProductReview.php        |  2 +-
 .../Magento/Review/Test/Fixture/Rating.php    |  2 +-
 .../Magento/Review/Test/Fixture/Review.php    |  2 +-
 .../Review/Test/Fixture/Review/EntityId.php   |  6 +--
 .../Review/Test/Fixture/Review/Ratings.php    |  4 +-
 .../Review/Test/Handler/Rating/Curl.php       | 12 ++---
 .../Test/Handler/Rating/RatingInterface.php   |  2 +-
 .../Review/Test/Handler/Review/Curl.php       | 12 ++---
 .../Test/Handler/Review/ReviewInterface.php   |  2 +-
 .../Magento/Review/Test/Repository/Rating.php |  2 +-
 .../Magento/Review/Test/Repository/Review.php |  2 +-
 .../CreateProductRatingEntityTest.php         |  4 +-
 .../CreateProductReviewBackendEntityTest.php  |  2 +-
 .../CreateProductReviewFrontendEntityTest.php |  4 +-
 .../DeleteProductRatingEntityTest.php         |  4 +-
 ...anageProductReviewFromCustomerPageTest.php |  4 +-
 .../MassActionsProductReviewEntityTest.php    |  2 +-
 .../ModerateProductReviewEntityTest.php       |  2 +-
 ...teProductReviewEntityOnProductPageTest.php |  4 +-
 .../UpdateProductReviewEntityTest.php         |  2 +-
 .../Block/Adminhtml/Order/AbstractForm.php    |  2 +-
 .../Adminhtml/Order/AbstractForm/Product.php  |  2 +-
 .../Block/Adminhtml/Order/AbstractItems.php   |  2 +-
 .../Adminhtml/Order/AbstractItemsNewBlock.php |  4 +-
 .../Test/Block/Adminhtml/Order/Actions.php    |  4 +-
 .../Test/Block/Adminhtml/Order/Create.php     |  8 +--
 .../Order/Create/Billing/Address.php          |  2 +-
 .../Adminhtml/Order/Create/Billing/Method.php |  2 +-
 .../Block/Adminhtml/Order/Create/Customer.php |  2 +-
 .../Order/Create/CustomerActivities.php       |  4 +-
 .../Create/CustomerActivities/Sidebar.php     |  4 +-
 .../Sidebar/RecentlyViewedProducts.php        |  2 +-
 .../Block/Adminhtml/Order/Create/Items.php    |  4 +-
 .../Order/Create/Items/ItemProduct.php        |  4 +-
 .../Order/Create/Shipping/Address.php         |  4 +-
 .../Order/Create/Shipping/Method.php          |  4 +-
 .../Block/Adminhtml/Order/Create/Store.php    |  6 +--
 .../Block/Adminhtml/Order/Create/Totals.php   |  2 +-
 .../Sales/Test/Block/Adminhtml/Order/Grid.php |  2 +-
 .../Test/Block/Adminhtml/Order/History.php    |  4 +-
 .../Adminhtml/Order/Invoice/Form/Items.php    |  4 +-
 .../Block/Adminhtml/Order/Invoice/Grid.php    |  2 +-
 .../Block/Adminhtml/Order/Invoice/Totals.php  |  4 +-
 .../Block/Adminhtml/Order/Shipment/Totals.php |  2 +-
 .../Order/Status/Assign/AssignForm.php        |  2 +-
 .../Test/Block/Adminhtml/Order/Totals.php     |  4 +-
 .../Test/Block/Adminhtml/Order/View/Info.php  |  4 +-
 .../Test/Block/Adminhtml/Order/View/Items.php |  4 +-
 .../Block/Adminhtml/Order/View/Tab/Info.php   |  4 +-
 .../Sales/Test/Block/Order/History.php        |  6 +--
 .../Magento/Sales/Test/Block/Order/Info.php   |  4 +-
 .../Magento/Sales/Test/Block/Order/Items.php  |  6 +--
 .../Magento/Sales/Test/Block/Order/View.php   |  4 +-
 .../Test/Block/Order/View/ActionsToolbar.php  |  4 +-
 .../Test/Constraint/AbstractAssertItems.php   |  2 +-
 .../AbstractAssertOrderOnFrontend.php         |  4 +-
 .../Constraint/AssertCreditMemoButton.php     |  2 +-
 .../AssertInvoiceInInvoicesGrid.php           |  2 +-
 .../Constraint/AssertInvoiceInInvoicesTab.php |  2 +-
 .../AssertInvoiceSuccessCreateMessage.php     |  2 +-
 ...ssertInvoiceWithShipmentSuccessMessage.php |  2 +-
 .../Constraint/AssertNoCreditMemoButton.php   |  2 +-
 .../Test/Constraint/AssertNoInvoiceButton.php |  2 +-
 .../AssertOrderButtonsAvailable.php           |  2 +-
 .../AssertOrderButtonsUnavailable.php         |  2 +-
 ...AssertOrderCancelMassActionFailMessage.php |  2 +-
 ...ertOrderCancelMassActionSuccessMessage.php |  2 +-
 .../AssertOrderCancelSuccessMessage.php       |  2 +-
 .../Test/Constraint/AssertOrderGrandTotal.php |  2 +-
 .../Constraint/AssertOrderInOrdersGrid.php    |  2 +-
 .../AssertOrderInOrdersGridOnFrontend.php     |  4 +-
 .../AssertOrderMassOnHoldSuccessMessage.php   |  2 +-
 .../Constraint/AssertOrderNotInOrdersGrid.php |  2 +-
 .../AssertOrderNotVisibleOnMyAccount.php      |  4 +-
 .../AssertOrderOnHoldFailMessage.php          |  2 +-
 .../AssertOrderOnHoldSuccessMessage.php       |  2 +-
 .../AssertOrderReleaseFailMessage.php         |  2 +-
 .../AssertOrderReleaseSuccessMessage.php      |  2 +-
 .../AssertOrderStatusDuplicateStatus.php      |  2 +-
 .../Constraint/AssertOrderStatusInGrid.php    |  2 +-
 .../Constraint/AssertOrderStatusIsCorrect.php |  2 +-
 .../AssertOrderStatusNotAssigned.php          |  2 +-
 .../AssertOrderStatusSuccessAssignMessage.php |  2 +-
 .../AssertOrderStatusSuccessCreateMessage.php |  2 +-
 ...ssertOrderStatusSuccessUnassignMessage.php |  2 +-
 .../AssertOrderSuccessCreateMessage.php       |  2 +-
 .../Constraint/AssertOrdersInOrdersGrid.php   |  2 +-
 .../AssertProductInItemsOrderedGrid.php       |  4 +-
 .../AssertRefundInCreditMemoTab.php           |  2 +-
 .../Constraint/AssertRefundInRefundsGrid.php  |  2 +-
 .../AssertRefundSuccessCreateMessage.php      |  2 +-
 .../AssertReorderStatusIsCorrect.php          |  2 +-
 .../AssertSalesPrintOrderBillingAddress.php   |  2 +-
 .../AssertSalesPrintOrderGrandTotal.php       |  2 +-
 .../AssertSalesPrintOrderPaymentMethod.php    |  2 +-
 .../AssertSalesPrintOrderProducts.php         |  4 +-
 .../Test/Constraint/AssertUnholdButton.php    |  2 +-
 .../Sales/Test/Page/SalesOrderShipmentNew.php |  6 +--
 .../Sales/Test/TestStep/AddProductsStep.php   |  2 +-
 .../AddRecentlyViewedProductsToCartStep.php   |  2 +-
 .../Test/TestStep/ConfigureProductsStep.php   |  2 +-
 .../Test/TestStep/CreateNewOrderStep.php      |  2 +-
 .../Test/TestStep/FillBillingAddressStep.php  |  2 +-
 .../Test/TestStep/OpenSalesOrdersStep.php     |  2 +-
 .../TestStep/PrintOrderOnFrontendStep.php     |  4 +-
 .../Sales/Test/TestStep/ReorderStep.php       |  2 +-
 .../Test/TestStep/SelectCustomerOrderStep.php |  2 +-
 .../SelectPaymentMethodForOrderStep.php       |  2 +-
 .../SelectShippingMethodForOrderStep.php      |  2 +-
 .../Sales/Test/TestStep/SelectStoreStep.php   |  2 +-
 .../Sales/Test/TestStep/SubmitOrderStep.php   |  6 +--
 .../Test/TestStep/UpdateProductsDataStep.php  |  2 +-
 .../app/Magento/Sales/Test/etc/scenario.xml   |  2 +-
 .../Test/Block/Adminhtml/Order/Tracking.php   |  4 +-
 .../Block/Adminhtml/Order/Tracking/Item.php   |  2 +-
 .../Shipping/Test/Block/Order/Info.php        |  2 +-
 .../Shipping/Test/Block/Order/Shipment.php    |  4 +-
 .../Test/Block/Order/Shipment/Items.php       |  2 +-
 .../Test/Constraint/AssertNoShipButton.php    |  2 +-
 .../AssertShipmentInShipmentsGrid.php         |  2 +-
 .../AssertShipmentInShipmentsTab.php          |  2 +-
 .../Test/Constraint/AssertShipmentItems.php   |  2 +-
 .../AssertShipmentSuccessCreateMessage.php    |  2 +-
 .../AssertShippingMethodOnPrintOrder.php      |  2 +-
 .../Magento/Shipping/Test/Fixture/Method.php  |  4 +-
 .../Shipping/Test/Repository/Method.php       |  2 +-
 .../Test/Block/Adminhtml/SitemapGrid.php      |  2 +-
 .../Test/Constraint/AssertSitemapContent.php  |  2 +-
 .../AssertSitemapFailFolderSaveMessage.php    |  2 +-
 .../AssertSitemapFailPathSaveMessage.php      |  2 +-
 .../Test/Constraint/AssertSitemapInGrid.php   |  2 +-
 .../Constraint/AssertSitemapNotInGrid.php     |  2 +-
 .../AssertSitemapSuccessDeleteMessage.php     |  2 +-
 .../AssertSitemapSuccessGenerateMessage.php   |  2 +-
 ...tSitemapSuccessSaveAndGenerateMessages.php |  2 +-
 .../AssertSitemapSuccessSaveMessage.php       |  2 +-
 .../Magento/Sitemap/Test/Fixture/Sitemap.php  |  2 +-
 .../Sitemap/Test/Handler/Sitemap/Curl.php     | 12 ++---
 .../Test/Handler/Sitemap/SitemapInterface.php |  2 +-
 .../Sitemap/Test/Repository/Sitemap.php       |  2 +-
 .../Test/TestCase/CreateSitemapEntityTest.php |  2 +-
 .../Test/TestCase/DeleteSitemapEntityTest.php |  2 +-
 .../app/Magento/Store/Test/Block/Switcher.php |  4 +-
 .../Test/Constraint/AssertStoreBackend.php    |  2 +-
 .../Store/Test/Constraint/AssertStoreForm.php |  2 +-
 .../Test/Constraint/AssertStoreFrontend.php   |  2 +-
 .../Test/Constraint/AssertStoreGroupForm.php  |  2 +-
 .../Constraint/AssertStoreGroupInGrid.php     |  2 +-
 .../Constraint/AssertStoreGroupNotInGrid.php  |  2 +-
 .../AssertStoreGroupOnStoreViewForm.php       |  2 +-
 ...oreGroupSuccessDeleteAndBackupMessages.php |  2 +-
 .../AssertStoreGroupSuccessDeleteMessage.php  |  2 +-
 .../AssertStoreGroupSuccessSaveMessage.php    |  2 +-
 .../Test/Constraint/AssertStoreInGrid.php     |  2 +-
 .../Test/Constraint/AssertStoreNotInGrid.php  |  2 +-
 .../Constraint/AssertStoreNotOnFrontend.php   |  2 +-
 ...ertStoreSuccessDeleteAndBackupMessages.php |  2 +-
 .../AssertStoreSuccessDeleteMessage.php       |  2 +-
 .../AssertStoreSuccessSaveMessage.php         |  2 +-
 .../Test/Constraint/AssertWebsiteForm.php     |  2 +-
 .../Test/Constraint/AssertWebsiteInGrid.php   |  2 +-
 .../Constraint/AssertWebsiteNotInGrid.php     |  2 +-
 .../Constraint/AssertWebsiteOnStoreForm.php   |  2 +-
 ...tWebsiteSuccessDeleteAndBackupMessages.php |  2 +-
 .../AssertWebsiteSuccessDeleteMessage.php     |  2 +-
 .../AssertWebsiteSuccessSaveMessage.php       |  2 +-
 .../app/Magento/Store/Test/Fixture/Store.php  |  2 +-
 .../Store/Test/Fixture/Store/GroupId.php      |  4 +-
 .../Magento/Store/Test/Fixture/StoreGroup.php |  2 +-
 .../Test/Fixture/StoreGroup/CategoryId.php    |  4 +-
 .../Test/Fixture/StoreGroup/WebsiteId.php     |  4 +-
 .../Magento/Store/Test/Fixture/Website.php    |  2 +-
 .../Magento/Store/Test/Handler/Store/Curl.php | 12 ++---
 .../Test/Handler/Store/StoreInterface.php     |  2 +-
 .../Store/Test/Handler/StoreGroup/Curl.php    | 12 ++---
 .../StoreGroup/StoreGroupInterface.php        |  2 +-
 .../Store/Test/Handler/Website/Curl.php       | 12 ++---
 .../Test/Handler/Website/WebsiteInterface.php |  2 +-
 .../Magento/Store/Test/Repository/Store.php   |  2 +-
 .../Store/Test/Repository/StoreGroup.php      |  2 +-
 .../Magento/Store/Test/Repository/Website.php |  2 +-
 .../Test/TestCase/CreateStoreEntityTest.php   |  2 +-
 .../TestCase/CreateStoreGroupEntityTest.php   |  2 +-
 .../Test/TestCase/CreateWebsiteEntityTest.php |  2 +-
 .../Test/TestCase/DeleteStoreEntityTest.php   |  2 +-
 .../TestCase/DeleteStoreGroupEntityTest.php   |  2 +-
 .../Test/TestCase/DeleteWebsiteEntityTest.php |  2 +-
 .../Magento/Store/Test/TestCase/StoreTest.php |  4 +-
 .../Test/TestCase/UpdateStoreEntityTest.php   |  2 +-
 .../TestCase/UpdateStoreGroupEntityTest.php   |  2 +-
 .../Test/TestCase/UpdateWebsiteEntityTest.php |  4 +-
 .../Test/Block/Adminhtml/Rate/Edit/Form.php   |  2 +-
 .../Test/Block/Adminhtml/Rule/Edit/Form.php   | 10 ++--
 .../Block/Adminhtml/Rule/Edit/TaxRate.php     |  2 +-
 ...stractAssertTaxWithCrossBorderApplying.php |  2 +-
 .../Tax/Test/Constraint/AssertTaxRateForm.php |  2 +-
 .../Test/Constraint/AssertTaxRateInGrid.php   |  2 +-
 .../Constraint/AssertTaxRateInTaxRule.php     |  2 +-
 .../AssertTaxRateIsInCorrectRange.php         |  2 +-
 .../Constraint/AssertTaxRateNotInGrid.php     |  2 +-
 .../Constraint/AssertTaxRateNotInTaxRule.php  |  2 +-
 .../AssertTaxRateSuccessDeleteMessage.php     |  2 +-
 .../AssertTaxRateSuccessSaveMessage.php       |  2 +-
 .../Test/Constraint/AssertTaxRuleApplying.php |  6 +--
 .../Tax/Test/Constraint/AssertTaxRuleForm.php |  2 +-
 .../Test/Constraint/AssertTaxRuleInGrid.php   |  2 +-
 .../AssertTaxRuleIsAppliedToAllPrices.php     |  4 +-
 .../Constraint/AssertTaxRuleNotInGrid.php     |  2 +-
 .../AssertTaxRuleSuccessDeleteMessage.php     |  2 +-
 .../AssertTaxRuleSuccessSaveMessage.php       |  2 +-
 .../app/Magento/Tax/Test/Fixture/TaxClass.php |  2 +-
 .../app/Magento/Tax/Test/Fixture/TaxRate.php  |  2 +-
 .../app/Magento/Tax/Test/Fixture/TaxRule.php  |  2 +-
 .../Tax/Test/Fixture/TaxRule/TaxClass.php     |  4 +-
 .../Tax/Test/Fixture/TaxRule/TaxRate.php      |  4 +-
 .../Tax/Test/Handler/Curl/RemoveTaxRule.php   | 12 ++---
 .../Tax/Test/Handler/TaxClass/Curl.php        | 12 ++---
 .../Handler/TaxClass/TaxClassInterface.php    |  2 +-
 .../Magento/Tax/Test/Handler/TaxRate/Curl.php | 12 ++---
 .../Test/Handler/TaxRate/TaxRateInterface.php |  2 +-
 .../Magento/Tax/Test/Handler/TaxRule/Curl.php | 12 ++---
 .../Test/Handler/TaxRule/TaxRuleInterface.php |  2 +-
 .../Magento/Tax/Test/Repository/TaxClass.php  |  2 +-
 .../Magento/Tax/Test/Repository/TaxRate.php   |  2 +-
 .../Magento/Tax/Test/Repository/TaxRule.php   |  2 +-
 .../Test/TestCase/CreateTaxRateEntityTest.php |  2 +-
 .../Test/TestCase/CreateTaxRuleEntityTest.php |  4 +-
 .../Test/TestCase/DeleteTaxRateEntityTest.php |  2 +-
 .../Test/TestCase/DeleteTaxRuleEntityTest.php |  4 +-
 .../Test/TestCase/UpdateTaxRateEntityTest.php |  2 +-
 .../Test/TestCase/UpdateTaxRuleEntityTest.php |  6 +--
 .../Test/TestStep/DeleteAllTaxRulesStep.php   |  2 +-
 .../Magento/Theme/Test/Block/Html/Footer.php  |  4 +-
 .../Magento/Theme/Test/Block/Html/Title.php   |  2 +-
 .../Magento/Theme/Test/Block/Html/Topmenu.php |  4 +-
 .../app/Magento/Theme/Test/Block/Links.php    |  4 +-
 .../Block/Adminhtml/Catalog/Category/Tree.php |  4 +-
 .../Adminhtml/Catalog/Edit/UrlRewriteForm.php |  6 +--
 .../Test/Block/Adminhtml/Selector.php         |  4 +-
 .../AssertPageByUrlRewriteIsNotFound.php      |  4 +-
 .../AssertUrlRewriteCategoryInGrid.php        |  2 +-
 .../AssertUrlRewriteCategoryNotInGrid.php     |  2 +-
 .../AssertUrlRewriteCategoryRedirect.php      |  4 +-
 .../AssertUrlRewriteCustomRedirect.php        |  4 +-
 .../AssertUrlRewriteCustomSearchRedirect.php  |  4 +-
 .../AssertUrlRewriteDeletedMessage.php        |  2 +-
 .../Constraint/AssertUrlRewriteInGrid.php     |  2 +-
 .../Constraint/AssertUrlRewriteNotInGrid.php  |  2 +-
 .../AssertUrlRewriteProductRedirect.php       |  6 +--
 .../AssertUrlRewriteSaveMessage.php           |  2 +-
 ...AssertUrlRewriteSuccessOutsideRedirect.php |  4 +-
 .../AssertUrlRewriteUpdatedProductInGrid.php  |  2 +-
 .../UrlRewrite/Test/Fixture/UrlRewrite.php    |  2 +-
 .../Test/Fixture/UrlRewrite/StoreId.php       |  4 +-
 .../Test/Fixture/UrlRewrite/TargetPath.php    |  4 +-
 .../Test/Handler/UrlRewrite/Curl.php          | 12 ++---
 .../UrlRewrite/UrlRewriteInterface.php        |  2 +-
 .../UrlRewrite/Test/Repository/UrlRewrite.php |  2 +-
 .../CreateCategoryRewriteEntityTest.php       |  4 +-
 .../CreateProductUrlRewriteEntityTest.php     |  2 +-
 .../DeleteCategoryUrlRewriteEntityTest.php    |  2 +-
 .../DeleteCustomUrlRewriteEntityTest.php      |  2 +-
 .../DeleteProductUrlRewriteEntityTest.php     |  2 +-
 .../UpdateCategoryUrlRewriteEntityTest.php    |  4 +-
 .../UpdateCustomUrlRewriteEntityTest.php      |  2 +-
 .../UpdateProductUrlRewriteEntityTest.php     |  4 +-
 .../UrlRewrite/Test/etc/constraint.xml        | 10 ++--
 .../Test/Block/Adminhtml/Role/Tab/Role.php    |  2 +-
 .../Test/Block/Adminhtml/User/Edit/Form.php   |  4 +-
 .../Block/Adminhtml/User/Edit/Tab/Roles.php   |  2 +-
 .../Test/Block/Adminhtml/User/Tab/Role.php    |  2 +-
 .../AssertAccessTokensErrorRevokeMessage.php  |  2 +-
 .../AssertImpossibleDeleteYourOwnAccount.php  |  2 +-
 .../AssertImpossibleDeleteYourOwnRole.php     |  2 +-
 .../User/Test/Constraint/AssertRoleInGrid.php |  2 +-
 .../Test/Constraint/AssertRoleNotInGrid.php   |  2 +-
 .../AssertRoleSuccessDeleteMessage.php        |  2 +-
 .../AssertRoleSuccessSaveMessage.php          |  2 +-
 .../Constraint/AssertUserDuplicateMessage.php |  2 +-
 .../User/Test/Constraint/AssertUserInGrid.php |  2 +-
 .../AssertUserInvalidEmailMessage.php         |  2 +-
 .../Test/Constraint/AssertUserNotInGrid.php   |  2 +-
 .../AssertUserRoleSalesRestrictedAccess.php   |  2 +-
 .../AssertUserSuccessDeleteMessage.php        |  2 +-
 .../Constraint/AssertUserSuccessLogOut.php    |  2 +-
 .../Constraint/AssertUserSuccessLogin.php     |  2 +-
 .../AssertUserSuccessSaveMessage.php          |  2 +-
 .../AssertUserWrongCredentialsMessage.php     |  2 +-
 .../Magento/User/Test/Fixture/AdminUser.php   | 12 ++---
 .../User/Test/Fixture/AdminUserRole.php       |  2 +-
 .../Fixture/AdminUserRole/InRoleUsers.php     |  4 +-
 .../Magento/User/Test/Fixture/Resource.php    |  2 +-
 .../app/Magento/User/Test/Fixture/Role.php    |  4 +-
 .../app/Magento/User/Test/Fixture/User.php    | 12 ++---
 .../Magento/User/Test/Fixture/User/RoleId.php |  4 +-
 .../AdminUserRole/AdminUserRoleInterface.php  |  2 +-
 .../User/Test/Handler/AdminUserRole/Curl.php  | 12 ++---
 .../User/Test/Handler/Curl/CreateRole.php     | 12 ++---
 .../User/Test/Handler/Curl/CreateUser.php     | 12 ++---
 .../Magento/User/Test/Handler/User/Curl.php   | 12 ++---
 .../User/Test/Handler/User/UserInterface.php  |  2 +-
 .../User/Test/Repository/AdminUser.php        |  2 +-
 .../User/Test/Repository/AdminUserRole.php    |  2 +-
 .../app/Magento/User/Test/Repository/Role.php |  4 +-
 .../app/Magento/User/Test/Repository/User.php |  8 +--
 .../TestCase/CreateAdminUserEntityTest.php    |  4 +-
 .../CreateAdminUserRoleEntityTest.php         |  2 +-
 .../TestCase/DeleteAdminUserEntityTest.php    |  4 +-
 .../TestCase/DeleteUserRoleEntityTest.php     |  4 +-
 ...lAccessTokensForAdminWithoutTokensTest.php |  2 +-
 .../TestCase/UpdateAdminUserEntityTest.php    |  4 +-
 .../UpdateAdminUserRoleEntityTest.php         |  2 +-
 .../UserLoginAfterChangingPermissionsTest.php |  4 +-
 .../Adminhtml/Customer/Edit/Tab/Wishlist.php  |  2 +-
 .../Customer/Edit/Tab/Wishlist/Grid.php       |  4 +-
 .../Wishlist/Test/Block/Customer/Sharing.php  |  2 +-
 .../Wishlist/Test/Block/Customer/Wishlist.php |  2 +-
 .../Test/Block/Customer/Wishlist/Items.php    |  6 +--
 .../Block/Customer/Wishlist/Items/Product.php |  4 +-
 ...sertAddProductToWishlistSuccessMessage.php |  4 +-
 ...ertMoveProductToWishlistSuccessMessage.php |  4 +-
 .../AssertProductDetailsInWishlist.php        |  6 +--
 ...ProductInCustomerWishlistOnBackendGrid.php |  4 +-
 ...ductIsPresentInCustomerBackendWishlist.php |  4 +-
 .../AssertProductIsPresentInWishlist.php      |  4 +-
 .../AssertProductsIsAbsentInWishlist.php      |  4 +-
 .../Test/Constraint/AssertWishlistIsEmpty.php |  2 +-
 .../Constraint/AssertWishlistShareMessage.php |  2 +-
 .../Test/TestCase/AbstractWishlistTest.php    |  6 +--
 .../Test/TestCase/ShareWishlistEntityTest.php |  4 +-
 .../TestStep/AddProductsToWishlistStep.php    |  4 +-
 .../Mtf/TestSuite/GithubPublicationTests.php  |  2 +-
 .../Mtf/TestSuite/InjectableTests.php         | 18 +++----
 .../TestSuite/InjectableTests/acceptance.xml  |  2 +-
 .../Mtf/TestSuite/InjectableTests/basic.xml   |  2 +-
 .../Mtf/TestSuite/InjectableTests/bat_ce.xml  |  2 +-
 .../TestSuite/InjectableTests/domain_cs.xml   |  2 +-
 .../TestSuite/InjectableTests/domain_mx.xml   |  2 +-
 .../TestSuite/InjectableTests/domain_ps.xml   |  2 +-
 .../InjectableTests/end_to_end_ce.xml         |  2 +-
 .../InjectableTests/installation.xml          |  2 +-
 .../Mtf/TestSuite/InjectableTests/mvp.xml     |  2 +-
 dev/tests/functional/utils/bootstrap.php      |  4 +-
 dev/tests/functional/utils/generate.php       | 14 ++---
 .../functional/utils/generate/constraint.php  |  4 +-
 .../functional/utils/generate/factory.php     |  6 +--
 .../functional/utils/generate/fixture.php     |  4 +-
 .../functional/utils/generate/handler.php     |  4 +-
 dev/tests/functional/utils/generate/page.php  |  4 +-
 .../functional/utils/generate/repository.php  |  4 +-
 1143 files changed, 2083 insertions(+), 2082 deletions(-)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/App/State/AbstractState.php (93%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/App/State/State1.php (93%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/ConditionsElement.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/DatepickerElement.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/GlobalsearchElement.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/JquerytreeElement.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/LiselectstoreElement.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultiselectgrouplistElement.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultiselectlistElement.php (90%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultisuggestElement.php (94%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/OptgroupselectElement.php (94%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/SelectstoreElement.php (96%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/SuggestElement.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/Tree.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/TreeElement.php (95%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Constraint/AbstractAssertForm.php (99%)
 mode change 100755 => 100644
 rename dev/tests/functional/lib/{ => Magento}/Mtf/EntryPoint/EntryPoint.php (91%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/ObjectManagerFactory.php (61%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Page/BackendPage.php (91%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/AbstractFactory.php (94%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Block.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Fixture.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Handler.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Page.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Repository.php (97%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Fixture/FieldsProvider.php (98%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/CollectionProvider.php (95%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/Resource.php (95%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/TableCollection.php (89%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlInterface.php (96%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport.php (99%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php (95%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php (96%)
 rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/SoapTransport.php (97%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/GithubPublicationTests.php (98%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests.php (82%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/acceptance.xml (82%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/basic.xml (75%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/bat_ce.xml (91%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_cs.xml (73%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_mx.xml (73%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_ps.xml (73%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml (95%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/installation.xml (73%)
 rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/mvp.xml (73%)

diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
index d3b32c5f1d4..a415b0cffbf 100755
--- a/dev/tests/functional/.gitignore
+++ b/dev/tests/functional/.gitignore
@@ -8,4 +8,4 @@
 !/config/isolation.yml.dist
 !/config/server.yml.dist
 phpunit.xml
-/lib/Mtf/Util/Generate/testcase.xml
+/lib/Magento/Mtf/Util/Generate/testcase.xml
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 88ba1077889..4a3418c0ff5 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -11,8 +11,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
-            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+            "Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
             "Test\\": "generated/Test/"
         }
     }
diff --git a/dev/tests/functional/composer.json.dist b/dev/tests/functional/composer.json.dist
index 2ea37c5b4a7..81d984634e9 100644
--- a/dev/tests/functional/composer.json.dist
+++ b/dev/tests/functional/composer.json.dist
@@ -6,10 +6,12 @@
         "phpunit/phpunit-selenium": ">=1.2",
         "netwing/selenium-server-standalone": ">=2.35"
     },
+    "suggest": {
+        "facebook/webdriver": "dev-master"
+    },
     "autoload": {
         "psr-4": {
-            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
-            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+            "Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
             "Test\\": "generated/Test/"
         }
     }
diff --git a/dev/tests/functional/etc/global/di.xml b/dev/tests/functional/etc/global/di.xml
index e4cd6218292..034b05ab359 100644
--- a/dev/tests/functional/etc/global/di.xml
+++ b/dev/tests/functional/etc/global/di.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <preference for="Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Mtf\Util\Generate\Fixture\FieldsProvider" />
-    <preference for="Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Mtf\Util\Generate\Repository\CollectionProvider" />
+    <preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
+    <preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
 </config>
diff --git a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
similarity index 93%
rename from dev/tests/functional/lib/Mtf/App/State/AbstractState.php
rename to dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
index f1c47546ed0..ad7353b2b53 100644
--- a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\App\State;
+namespace Magento\Mtf\App\State;
 
 use Magento\Framework\App\DeploymentConfig\DbConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -39,7 +39,7 @@ abstract class AbstractState implements StateInterface
      */
     public function clearInstance()
     {
-        $dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
+        $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
         $deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
             new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
             []
diff --git a/dev/tests/functional/lib/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
similarity index 93%
rename from dev/tests/functional/lib/Mtf/App/State/State1.php
rename to dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
index 59d8ecced3b..a5422ee0884 100644
--- a/dev/tests/functional/lib/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\App\State;
+namespace Magento\Mtf\App\State;
 
-use Mtf\ObjectManager;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Core\Test\Fixture\ConfigData;
 
 /**
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
index 96cf6112ad3..ea8d59e184e 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\ObjectManager;
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Class ConditionsElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
index 6b6247ee8de..06e56905715 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * General class for datepicker elements.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
index 1c8e0acc4c7..9d074a65d2c 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Typified element class for global search element.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
index c7d36387b3c..e08b8a6adff 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Class JquerytreeElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
index 0308a312ea1..858fe692fa2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class LiselectstoreElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
index f2fe3958147..88f9924f7eb 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Class MultiselectgrouplistElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
similarity index 90%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
index c7c01a8de68..d5d4539e1b4 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Typified element class for  Multiple Select List elements
@@ -39,7 +39,7 @@ class MultiselectlistElement extends MultiselectElement
         $values = is_array($values) ? $values : [$values];
 
         foreach ($options as $option) {
-            /** @var \Mtf\Client\ElementInterface $option */
+            /** @var \Magento\Mtf\Client\ElementInterface $option */
             $optionText = $option->getText();
             $isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
             $inArray = in_array($optionText, $values);
@@ -60,7 +60,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var \Mtf\Client\ElementInterface $option */
+            /** @var \Magento\Mtf\Client\ElementInterface $option */
             $checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
             if ($checkedOption->isVisible()) {
                 $checkedOptions[] = $checkedOption->getText();
@@ -101,7 +101,7 @@ class MultiselectlistElement extends MultiselectElement
         $options = $this->getOptions();
 
         foreach ($options as $option) {
-            /** @var \Mtf\Client\ElementInterface $option */
+            /** @var \Magento\Mtf\Client\ElementInterface $option */
             $optionsValue[] = $option->getText();
         }
 
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
index daffc52b3ae..a2644d92930 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Typified element class for multi suggest element.
@@ -73,7 +73,7 @@ class MultisuggestElement extends SuggestElement
         $values = [];
 
         foreach ($choices as $choice) {
-            /** @var \Mtf\Client\ElementInterface $choice */
+            /** @var \Magento\Mtf\Client\ElementInterface $choice */
             $values[] = $choice->getText();
         }
         return $values;
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
index ecb06a901ca..a8398f49316 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class OptgroupselectElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
index f2e914969f2..32d1b11119a 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Typified element class for option group selectors.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
index fc1d685204e..a44151e5a98 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class SuggestElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/Tree.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
index 499a7d645fd..00c3d41ffe2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Class Tree
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
index 0d715f55a01..09995686b04 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
 
 /**
  * Class TreeElement
diff --git a/dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
old mode 100755
new mode 100644
similarity index 99%
rename from dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php
rename to dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
index e6b0d60d131..a26ff55f584
--- a/dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Constraint;
+namespace Magento\Mtf\Constraint;
 
 /**
  * Class AssertForm
diff --git a/dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php
rename to dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
index f991ae7b6b1..701897c4562 100644
--- a/dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php
+++ b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\EntryPoint;
+namespace Magento\Mtf\EntryPoint;
 
-use Mtf\ObjectManager;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class EntryPoint
@@ -60,7 +60,7 @@ class EntryPoint
     {
         try {
             if (!$this->_locator) {
-                $locatorFactory = new \Mtf\ObjectManagerFactory();
+                $locatorFactory = new \Magento\Mtf\ObjectManagerFactory();
                 $this->_locator = $locatorFactory->create();
             }
             return $this->_locator->create($applicationName, $arguments)->launch();
diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
similarity index 61%
rename from dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
rename to dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
index 5c5a96fc093..9811a2e9f84 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf;
+namespace Magento\Mtf;
 
-use Mtf\ObjectManagerInterface as MagentoObjectManager;
-use Mtf\Stdlib\BooleanUtils;
-use Mtf\ObjectManager\Factory;
+use Magento\Mtf\ObjectManagerInterface as MagentoObjectManager;
+use Magento\Mtf\Stdlib\BooleanUtils;
+use Magento\Mtf\ObjectManager\Factory;
 
 /**
  * Class ObjectManagerFactory
@@ -23,14 +23,14 @@ class ObjectManagerFactory
      *
      * @var string
      */
-    protected $locatorClassName = '\Mtf\ObjectManager';
+    protected $locatorClassName = '\Magento\Mtf\ObjectManager';
 
     /**
      * DI Config class name
      *
      * @var string
      */
-    protected $configClassName = '\Mtf\ObjectManager\Config';
+    protected $configClassName = '\Magento\Mtf\ObjectManager\Config';
 
     /**
      * Create Object Manager
@@ -44,15 +44,15 @@ class ObjectManagerFactory
             define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
         }
         if (!defined('MTF_STATES_PATH')) {
-            define('MTF_STATES_PATH', MTF_BP . '/lib/Mtf/App/State/');
+            define('MTF_STATES_PATH', MTF_BP . '/lib/Magento/Mtf/App/State/');
         }
 
         $diConfig = new $this->configClassName();
         $factory = new Factory($diConfig);
         $argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
-        $argumentMapper = new \Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
+        $argumentMapper = new \Magento\Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
 
-        $sharedInstances['Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
+        $sharedInstances['Magento\Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
         $objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
 
         $factory->setObjectManager($objectManager);
@@ -86,27 +86,27 @@ class ObjectManagerFactory
     /**
      * Return newly created instance on an argument interpreter, suitable for processing DI arguments
      *
-     * @param \Mtf\Stdlib\BooleanUtils $booleanUtils
-     * @return \Mtf\Data\Argument\InterpreterInterface
+     * @param \Magento\Mtf\Stdlib\BooleanUtils $booleanUtils
+     * @return \Magento\Mtf\Data\Argument\InterpreterInterface
      */
     protected function createArgumentInterpreter(
-        \Mtf\Stdlib\BooleanUtils $booleanUtils
+        \Magento\Mtf\Stdlib\BooleanUtils $booleanUtils
     ) {
-        $constInterpreter = new \Mtf\Data\Argument\Interpreter\Constant();
-        $result = new \Mtf\Data\Argument\Interpreter\Composite(
+        $constInterpreter = new \Magento\Mtf\Data\Argument\Interpreter\Constant();
+        $result = new \Magento\Mtf\Data\Argument\Interpreter\Composite(
             [
-                'boolean' => new \Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
-                'string' => new \Mtf\Data\Argument\Interpreter\String($booleanUtils),
-                'number' => new \Mtf\Data\Argument\Interpreter\Number(),
-                'null' => new \Mtf\Data\Argument\Interpreter\NullType(),
+                'boolean' => new \Magento\Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
+                'string' => new \Magento\Mtf\Data\Argument\Interpreter\String($booleanUtils),
+                'number' => new \Magento\Mtf\Data\Argument\Interpreter\Number(),
+                'null' => new \Magento\Mtf\Data\Argument\Interpreter\NullType(),
                 'const' => $constInterpreter,
-                'object' => new \Mtf\Data\Argument\Interpreter\Object($booleanUtils),
-                'init_parameter' => new \Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
+                'object' => new \Magento\Mtf\Data\Argument\Interpreter\Object($booleanUtils),
+                'init_parameter' => new \Magento\Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
             ],
-            \Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
+            \Magento\Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
         );
         // Add interpreters that reference the composite
-        $result->addInterpreter('array', new \Mtf\Data\Argument\Interpreter\ArrayType($result));
+        $result->addInterpreter('array', new \Magento\Mtf\Data\Argument\Interpreter\ArrayType($result));
         return $result;
     }
 
@@ -134,19 +134,19 @@ class ObjectManagerFactory
     public static function configure(MagentoObjectManager $objectManager)
     {
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Primary')->load()
+            $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Primary')->load()
         );
 
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load()
+            $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load()
         );
 
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc/ui')
+            $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load('etc/ui')
         );
 
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc/curl')
+            $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load('etc/curl')
         );
     }
 }
diff --git a/dev/tests/functional/lib/Mtf/Page/BackendPage.php b/dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/Page/BackendPage.php
rename to dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
index 47999dd6852..e5b6c09f905 100644
--- a/dev/tests/functional/lib/Mtf/Page/BackendPage.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
@@ -3,9 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Mtf\Page;
+namespace Magento\Mtf\Page;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class BackendPage
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
index 5f87958798d..6083b509f9a 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate;
+namespace Magento\Mtf\Util\Generate;
 
 use Magento\Framework\App;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
index 5239975f965..df7b6c873c5 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class AbstractFactory
@@ -37,7 +37,7 @@ abstract class AbstractFactory
 
         $this->endFactory($this->type);
 
-        \Mtf\Util\Generate\GenerateResult::addResult($this->type, $this->cnt);
+        \Magento\Mtf\Util\Generate\GenerateResult::addResult($this->type, $this->cnt);
     }
 
     abstract protected function generateContent();
@@ -50,15 +50,15 @@ abstract class AbstractFactory
     protected function startFactory($type)
     {
         $this->factoryContent = "<?php\n\n";
-        $this->factoryContent .= "namespace Mtf\\{$type}; \n\n";
-        $this->factoryContent .= "use Mtf\\Fixture\\FixtureInterface; \n\n";
+        $this->factoryContent .= "namespace Magento\Mtf\\{$type}; \n\n";
+        $this->factoryContent .= "use Magento\Mtf\\Fixture\\FixtureInterface; \n\n";
         $this->factoryContent .= "class {$type}FactoryDeprecated\n";
         $this->factoryContent .= "{\n";
 
         $this->factoryContent .= "    /**
      * Object Manager
      *
-     * @var \\Mtf\\ObjectManager
+     * @var \\Magento\Mtf\\ObjectManager
      */
     protected \$objectManager;
 
@@ -68,7 +68,7 @@ abstract class AbstractFactory
      */
     public function __construct()
     {
-        \$this->objectManager = \\Mtf\\ObjectManager::getInstance();
+        \$this->objectManager = \\Magento\Mtf\\ObjectManager::getInstance();
     }\n";
     }
 
@@ -85,11 +85,11 @@ abstract class AbstractFactory
             return $this;
         }
 
-        $this->checkAndCreateFolder(MTF_BP . "/generated/Mtf/{$type}");
+        $this->checkAndCreateFolder(MTF_BP . "/generated/Magento/Mtf/{$type}");
 
         $this->factoryContent .= "}\n";
 
-        $file = MTF_BP . "/generated/Mtf/{$type}/{$type}FactoryDeprecated.php";
+        $file = MTF_BP . "/generated/Magento/Mtf/{$type}/{$type}FactoryDeprecated.php";
         if (false === file_put_contents($file, $this->factoryContent)) {
             throw new \RuntimeException("Can't write content to {$file} file");
         }
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
index 24bdbf29f8a..b564d6aca69 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class Block
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
index 1d9425f68e1..174a17a2718 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class Fixture
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
index c8c0b42a3e5..2dbced547a6 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class Handler
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
index b557cb15d2e..c1cb6f22762 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class Page
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
index ea6f30c9c8a..79facfdcb13 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
 
 /**
  * Class Repository
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
index b0ae3b9eade..fa8923f4ba0 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Fixture;
+namespace Magento\Mtf\Util\Generate\Fixture;
 
 use Magento\Framework\App\Resource;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
index 5088d06530b..a02df91cb8a 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -69,7 +69,7 @@ class CollectionProvider implements CollectionProviderInterface
     {
         $collection = $fixture['collection'];
         $collection = $this->objectManager->create($collection, ['fixture' => $fixture]);
-        /** @var $collection \Mtf\Util\Generate\Repository\TableCollection */
+        /** @var $collection \Magento\Mtf\Util\Generate\Repository\TableCollection */
         return $collection->getItems();
     }
 
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
index 3df60fd5bc9..f366bbc7400 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
 
 /**
  * Class Resource
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
similarity index 89%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
index 35d36c1a051..9c4ed81e91f 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
 
 use Magento\Framework\Model\Resource\Db\Collection\AbstractCollection;
 
@@ -39,7 +39,7 @@ class TableCollection extends AbstractCollection
         array $fixture = []
     ) {
         $this->setModel('Magento\Framework\Object');
-        $this->setResourceModel('Mtf\Util\Generate\Repository\Resource');
+        $this->setResourceModel('Magento\Mtf\Util\Generate\Repository\Resource');
 
         $resource = $this->getResource();
         $resource->setFixture($fixture);
@@ -50,7 +50,7 @@ class TableCollection extends AbstractCollection
     /**
      * Get resource instance
      *
-     * @return \Mtf\Util\Generate\Repository\Resource
+     * @return \Magento\Mtf\Util\Generate\Repository\Resource
      */
     public function getResource()
     {
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
index f3233d88817..63a53a84e1c 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
 
 /**
  * Class CurlInterface
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
similarity index 99%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
index 9d1ccb86617..30c20908ed7 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
 
 /**
  * HTTP CURL Adapter
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
index a255547319a..5705d52766d 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Protocol\CurlTransport;
+namespace Magento\Mtf\Util\Protocol\CurlTransport;
 
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * Class BackendDecorator
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
index fbd0aa152d1..97b29483cba 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Protocol\CurlTransport;
+namespace Magento\Mtf\Util\Protocol\CurlTransport;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * Class FrontendDecorator
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
index 943a45b9801..8ddeb74e4cd 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
 
 class SoapTransport
 {
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index d16c9629371..1bc47ba8998 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -19,14 +19,14 @@
     </testsuites>
 
     <listeners>
-        <listener class="Mtf\System\Browser\Listener" />
-        <listener class="Mtf\System\Isolation\Listener">
+        <listener class="Magento\Mtf\System\Browser\Listener" />
+        <listener class="Magento\Mtf\System\Isolation\Listener">
             <arguments>
-                <object class="Mtf\System\Isolation\Driver\Base" />
+                <object class="Magento\Mtf\System\Isolation\Driver\Base" />
             </arguments>
         </listener>
-        <listener class="Mtf\System\Event\StateListener" />
-        <listener class="Mtf\System\JUnit"/>
+        <listener class="Magento\Mtf\System\Event\StateListener" />
+        <listener class="Magento\Mtf\System\JUnit"/>
     </listeners>
 
     <php>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
index a8bc0c1f888..54f750ceeec 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Test\Block\Admin;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
index 8e4bddadbb0..c25eac6454d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class Actions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
index da7112348bd..c74b042f76f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Denied
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
index 00ad4106dea..246c3113a8d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
index 4f3aee61055..23cd977b4c2 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Menu
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
index 530ea9bf4ea..94b36cc6a95 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Backend\Test\Block\Page;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\GlobalsearchElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\GlobalsearchElement;
 
 /**
  * Header block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
index da9b8ec3376..9de2cdc4349 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Block\Page;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Main block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
index 1f55b62de53..58e1d53e0ce 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class PageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
index 980c5d880f0..86ae1d8d66a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\Backend\Test\Block\System\Config;
 
-use Mtf\Block\Block;
-use Mtf\Factory\Factory;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Client\Locator;
 
 class Form extends Block
 {
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
index aee07e2a3f3..0d3244802c7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Backend\Test\Block\System\Config\Form;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Form;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
index 00f81789c1e..8ed2b6a7bfb 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
@@ -10,7 +10,7 @@ namespace Magento\Backend\Test\Block\System\Config;
 
 use Magento\Backend\Test\Block\FormPageActions as AbstractPageActions;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class PageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
index 1ded412d79b..ac3cce60722 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Test\Block\System\Store\Delete;
 
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as AbstractForm;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
index 87672eeba74..819e075dbe9 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class GroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
index 78ca7212fe8..0d9824e284f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class StoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
index 28a29b48688..cfbfa524c77 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class WebsiteForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index b1c71f65b2a..f559e6130ec 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -10,7 +10,7 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Store\Test\Fixture\StoreGroup;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class StoreGrid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
index 0c3ad11e969..2b0c596f1f1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Block\System\Variable\Edit;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
index 31b67b6b873..5170a9b72ee 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Backend\Test\Block;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Template
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
index f6cf553fa62..d57bd1aa4d7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
@@ -7,10 +7,10 @@
 
 namespace Magento\Backend\Test\Block\Widget;
 
-use Mtf\Block\Form as FormInstance;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form as FormInstance;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
index 6b0e7faca54..ad1e586f8b6 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
@@ -6,15 +6,15 @@
 
 namespace Magento\Backend\Test\Block\Widget;
 
-use Mtf\Block\BlockFactory;
-use Mtf\Block\Mapper;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\BrowserInterface;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Util\Iterator\File;
-use Mtf\Util\XmlConverter;
+use Magento\Mtf\Block\BlockFactory;
+use Magento\Mtf\Block\Mapper;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Util\Iterator\File;
+use Magento\Mtf\Util\XmlConverter;
 
 /**
  * Class FormTabs
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
index 528fbdac096..3843da95b7b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Backend\Test\Block\Widget;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Abstract class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
index 82c770fb510..a4f434313fc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Backend\Test\Block\Widget;
 
-use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Tab
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
index 999eb88ce4e..70e2cf29fb4 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Constraint;
 
 use Magento\Backend\Test\Fixture\GlobalSearch;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGlobalSearchCustomerName
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
index 8b14b75af7c..69a2652ce24 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
@@ -7,7 +7,7 @@
 namespace Magento\Backend\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGlobalSearchNoRecordsFound
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
index cc0af65d028..4f78438f27c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Constraint;
 
 use Magento\Backend\Test\Fixture\GlobalSearch;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGlobalSearchOrderId
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
index 5c32c84fb1f..4e477ff193c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
@@ -9,7 +9,7 @@ namespace Magento\Backend\Test\Constraint;
 use Magento\Backend\Test\Fixture\GlobalSearch;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGlobalSearchProductName
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
index 017da4d2aca..2a519151087 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Fixture\Admin;
 
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class SuperAdmin
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
index e9f9c69db99..12c06f560e7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Fixture;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Date
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
index a32966711b5..d4f4890694a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class GlobalSearch
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
index 2c7de345435..3f14768fb45 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Backend\Test\Fixture\GlobalSearch;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Query
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
index 527fa524e21..ce80fa82d40 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Test\Handler;
 
-use Mtf\Handler\Curl;
+use Magento\Mtf\Handler\Curl;
 
 /**
  * Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
index 9346e1203a5..6e980ea374c 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
@@ -7,10 +7,10 @@
 
 namespace Magento\Backend\Test\Handler;
 
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Extractor
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
index 7589e2bddd6..51cc5e3ab6f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Backend\Test\Handler\Ui;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
 
 /**
  * Class LoginUser
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
index e774b6dc7fd..9ffe8a5665b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Backend\Test\Handler\Ui;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
 
 /**
  * Class LogoutUser
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index 3020764a452..c53ef25e6dc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Test\Page;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class AdminAuthLogin
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
index 073ce6fcde7..71c85156978 100644
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
@@ -7,7 +7,7 @@
 namespace Magento\Backup\Test\Constraint;
 
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertBackupInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 21cb7fb9395..12d9fc7f39e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -7,9 +7,9 @@
 namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
 
 /**
  * Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index c7e342e81c5..b3286de48a5 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
 
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search\Grid;
 use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Option
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index f7e96753e9e..5d213baa8b4 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Selection
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
index f34696966fd..af5173612c1 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Bundle\Test\Block\Adminhtml\Product\Composite;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
index bee98cdd38b..5f99ab3bce3 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
@@ -8,9 +8,9 @@ namespace Magento\Bundle\Test\Block\Catalog\Product;
 
 use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
 use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 43b9016d072..137eadb438b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -10,11 +10,11 @@ use Magento\Bundle\Test\Fixture\Bundle as BundleDataFixture;
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
index 9a9427361df..1d3c35ccece 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
@@ -9,7 +9,7 @@
 
 namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Option
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
index e808b34f92e..d05b7beb50e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
@@ -10,7 +10,7 @@ use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check bundle product on the category page.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index ee30f2933d3..a7ceb39b65a 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertBundleItemsOnProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
index 98ed0719aab..22e4f9c693a 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
@@ -9,8 +9,8 @@ namespace Magento\Bundle\Test\Constraint;
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertBundlePriceType
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
index 41b921dc2d0..d4e8779a778 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check displayed price view for bundle product on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
index f512ad01556..868112dce9f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertBundleProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
index 4f431b4a0c1..da18ba61b48 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertGroupedPriceOnBundleProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
index 3a549206fdf..3c62ea1c4ea 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertTierPriceOnBundleProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
index 092be30151c..082ce5fa3db 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
@@ -7,8 +7,8 @@
 namespace Magento\Bundle\Test\Fixture;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
 
 /**
  * Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
index 05619530cf7..18f692eeda8 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Fixture;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class BundleDynamic
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
index 903a8da05d0..3cebc6dfa36 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Fixture;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class BundleFixed
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
index 9745ac6b032..399f0184150 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Bundle\Test\Fixture;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Class BundleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
index 02d987d9eb3..b3d46087acd 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Bundle\Test\Fixture\BundleProduct;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class BundleSelections
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
index d155c6236f7..33965ee8bdf 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Fixture\BundleProduct;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Price
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
index 8ecfd8c910f..89bab0c1b7e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
 namespace Magento\Bundle\Test\Fixture\Cart;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
index c1f62b99914..d53e765d8c0 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Handler\BundleProduct;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface BundleProductInterface
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
index e5f194127e9..c7746327b72 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Handler\BundleProduct;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
 
 /**
  * Create new bundle product via curl.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
index 2b93aaf4b95..31abf5c1547 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
@@ -7,12 +7,12 @@
 
 namespace Magento\Bundle\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class CreateBundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
index 7f91b0f2ae9..7e3ea715cca 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class BundleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
index 42af8b78cc8..fcdff4b9407 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Bundle\Test\TestCase;
 
 use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class BundleDynamicTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
index cbc2227fd0e..ba309fcd6ed 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Bundle\Test\TestCase;
 
 use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class BundleFixedTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
index d39be09dbb6..3dc5fec8c7a 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateBundleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
index 6e466a1f809..f4592e21dda 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Bundle\Test\TestCase;
 
 use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class EditBundleTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
index aeddf4bcaae..e2ab1af866a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Bundle\Test\TestCase;
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update BundleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
index e291635c52f..148e06c61fa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Block;
 
 use Magento\Catalog\Test\Block\Product\View\CustomOptions;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Block\Form;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AbstractConfigureBlock
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
index 27aac4a235e..4a1ba08b856 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class CategoryForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 5b5054cda3d..3f29be8ab7f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index a4681d4df89..15a87f2de91 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -8,11 +8,11 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category;
 
 use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\TreeElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\TreeElement;
 
 /**
  * Class Tree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
index 4a0c63728c0..160116b7518 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Widget;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class CategoryChooser
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
index c3594ae9718..75a6c1b1c89 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
@@ -8,10 +8,10 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Edit attribute form on catalog product edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
index 031a6143208..4dfc6d203b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Catalog product custom attribute element.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
index 30e2266fda2..0a3a1b52f4a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
@@ -8,11 +8,11 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Catalog Product Attribute form.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
index 400cc754393..3e5a6fd3355 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 
-use Mtf\ObjectManager;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index b0dbd7d65ac..b1091273427 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
 
 /**
  * Class AdvancedPropertiesTab
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index 09996767ee7..37bf323fa12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
 
 /**
  * Class Options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
index 6918f41b767..062ac3c4a35 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Option
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
index 5d085db1b67..47a2e261ba1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Main
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
index 4d034090adf..ef673d484b7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main;
 
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
index 6f9dc7e7be3..9dcc851e7f9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main;
 
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
 
 /**
  * Class EditForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
index a1419eb6eb9..bd6988a5afe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Composite;
 
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Block\AbstractConfigureBlock;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
index bcec82a633d..d6943bf14db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
 
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Product attribute massaction edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
index 6d89bb37601..269e53dfcba 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
 
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class AdvancedPricingTab
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
index c539fb92cec..36ea46aaff0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class OptionField
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
index 9c405921972..7dc90c88899 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class OptionTier
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
index 935f79fe52d..c7c48a1847c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
index a584ce5f69f..e23a8abf1ad 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class AbstractRelated
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index c430866c70a..fac0fe3f9fb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes;
 
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 23a18775135..ea40e9576f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -8,7 +8,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid as CrosssellGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Crosssell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
index 1657d20cc40..e1782ef6ca1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -7,10 +7,10 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Search\Grid;
-use Mtf\ObjectManager;
-use Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
index 05bed7630c9..55af1526e62 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options;
 
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Tab;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
index 3eca8eb7415..bf958e52b0a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Type;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Form "Option dropdown" on tab product "Custom options".
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
index a78b3fef4db..546719a20d4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Product details tab.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
index 5e581084680..56d6b46ed62 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
 
 /**
  * Class AttributeSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
index 2387a6ee456..0e45e4c6cdd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\MultisuggestElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\MultisuggestElement;
 
 /**
  * Typified element class for category element.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
index 2b43fa76d62..55f800b3f67 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ProductOnlineSwitcher
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
index abeb2849647..78298efb56a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -8,7 +8,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid as RelatedGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Related
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index b63f90d4429..f3d4ff8f8bc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -8,7 +8,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid as UpsellGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Upsell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
index 9ab4508f1e3..f9b1f1a92be 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Websites;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class StoreTree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
index 957c9273591..9778f9a4b34 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product;
 
 use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class FormAction
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
index d35d5292d71..bafda38e5f5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Product;
 
 use Magento\Backend\Test\Block\GridPageActions as ParentGridPageActions;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class GridPageAction
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index eb1b40fb87e..51df922610d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -11,14 +11,14 @@ use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\AttributeForm;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\CustomAttribute;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Product form on backend product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
index ae9a508fb56..7051e8d5372 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Category;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class ProductPagination
@@ -26,7 +26,7 @@ class ProductPagination extends Block
     /**
      * Getting the active element to go to the next page
      *
-     * @return \Mtf\Client\Element|null
+     * @return \Magento\Mtf\Client\Element|null
      */
     public function getNextPage()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
index 844e537f2f8..b8c85e290dd 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Block\Category;
 
 use Magento\Widget\Test\Fixture\Widget;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
index 875657a1feb..fdfbc654c12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Catalog\Test\Block\Product;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
 
 /**
  * Product additional information block on the product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
index 161638635b3..22c7b8213d2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Block\Product\Compare;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Compare list product block.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
index 73bae6656ae..59f48c60913 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
@@ -7,10 +7,10 @@
 namespace Magento\Catalog\Test\Block\Product\Grouped;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class AssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index af5dc96d528..51fba6b4440 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 6a06c92fb6e..80f0b1d6b8b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Product
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
index ce2bf986a1a..4415fec2ac0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Block\Product;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Product list.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 68f4197cafb..39ea6ff8c38 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Block\Product;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Price
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
index e5866a521d3..7bbe9c2d761 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class BottomToolbar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
index dc858eee1d8..9b5d42d49b9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Fixture\Product;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
index 90922b213e8..dd65782e9f2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Related
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
index 4090f15dc36..7f53f190bd4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class TopToolbar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
index 1b54233f438..ce1ee095156 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Block\Product\ProductList;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Upsell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 40f8ea6e25d..b658bb823cd 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Block\Product;
 
 use Magento\Catalog\Test\Block\AbstractConfigureBlock;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Product view block on the product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 72f128f70ea..ea07ff104aa 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Catalog\Test\Block\Product\View;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class CustomOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 86102bbac90..2257512b72f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Search
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
index 4174cb6d23e..3c017e29dab 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAbsenceDeleteAttributeButton
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
index 71992451111..4aad21571bd 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAddToCartButtonAbsent
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
index 470580cddbf..b779f7a8eaa 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAddToCartButtonPresent
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 2fa65b17147..a5ffd6438ac 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -8,12 +8,12 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\ObjectManager;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Check attribute on product form.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
index f6bf4105907..d559f1386cd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Assert that displayed attribute data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
index 7ce9ed37e46..5d8898934c1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAttributeOptionsOnProductForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
index 0497a340736..f79f14a6689 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAttributeSearchableByLabel
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
index 3668858b2a9..16be1cbf6e0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryAbsenceOnBackend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
index 9ba88c2a3af..f4c2b6530a7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryAbsenceOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
index f049debd229..f81d4b389d2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryForAssignedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
index c0bf8c3bb07..06d7ce4fe0a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Assert that displayed category data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index 73b62e396df..b83d2fd8599 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryIsNotActive
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
index 5a468a0b2ff..07b23794984 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryIsNotIncludeInMenu
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index 05175fa7ebb..3197b59c3d5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\Category\LandingPage;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Assert that displayed category data on category page equals to passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
index ca0bce01e8e..3c72fa66599 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategoryRedirect
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
index 37150e69985..95552645afe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategorySaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
index 898a92ea6d2..2f0348ef51d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCategorySuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
index 360233913f1..b6a8c8c559f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertCrossSellsProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
index 7fec659f98b..9ba318c3a3f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertNoCrossSellsProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
index c3eac37c87c..77dafc88946 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertNoRelatedProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
index 10e60aacbc2..e2ec0224da5 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertNoUpSellsProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
index 391b2394ceb..e26cb9d0dfe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Interface AssertPriceOnProductPageInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
index f7d97ff7c1b..1091df6e8b2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAbsenceProductAttributeInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
index a0eb096a1b0..3cf4328573e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAbsenceInAddAttributeSearch
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
index 7393939c7e7..178bdd40780 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeAbsenceInTemplateGroups
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
index 517a00547fa..7131b704c9c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeAbsenceInUnassignedAttributes
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
index 11ec8c330fc..a7f562305a0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check whether the attribute is visible on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
index 4c1b3d5a125..1d9a0a73cf0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\CatalogSearch\Test\Page\AdvancedSearch;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check whether attribute is displayed in the advanced search form on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
index 5247acf20d0..4f76dc4d50d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
index ea8a2fb6713..bc4a1c23c9e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check whether there is an opportunity to compare products using given attribute.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index 343dce13148..bd3c2262147 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
index fd0e4173327..d43006c06f6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check out if the attribute in the navigation bar on the search results page in Layered navigation.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
index 7db85843f97..486497d81c9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Look on the scope of product attribute in the grid.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
index 1ee1e91f870..33b93ac4f1e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check whether html tags are using in an attribute value.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
index fcd98a85b6d..d563b8966aa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check whether the attribute is mandatory.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index 9d33cbdf8f9..ca35c959794 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Check whether the attribute is unique.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
index 4af9bd95be9..73d9c93fdf2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Assert that attribute present in sort dropdown on search results page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
index 3dca6021de3..cda2dbe885c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeIsUsedPromoRules
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
index b6c11594ab6..f58f02ad1f4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
index ea2adf5025f..60b68f622cb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSuccessDeletedAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
index bdaf461656d..5388bf823b4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertProductCompareBlockOnCmsPage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
index d54776b16ee..716bb8c0093 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductCompareItemsLink
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
index 1deb79c236d..3455b8dad45 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductCompareItemsLinkIsAbsent
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
index bd023344378..c08c1850494 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductComparePage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
index 3a6fb000b07..0ede4a57e7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductCompareRemoveLastProductMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
index 38875701b97..733c8b72659 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductCompareSuccessAddMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
index 5f0f8266ff3..4c878871b76 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductCompareSuccessRemoveAllProductsMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
index f78b2770a04..434daafcee8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductCompareSuccessRemoveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
index 9b2a635d653..7150626d7dc 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductCustomOptionsOnProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
index a26e9b5d4f3..51da2a9c5d3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert form data equals fixture data.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
index c27dcb38930..89f7eaae399 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductDuplicateIsNotDisplayingOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
index 3abcce7a600..837fb1ebdb2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductDuplicateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
index 278786c42b5..4adca9c9b7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductDuplicatedInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
index efbdc1f4aa1..e10767e1eb6 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
index bf7b21c6281..bfd4ea2306d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductGroupedPriceOnProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
index 81b7aa62c95..c231814db8b 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductInCart
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
index 63fcbcf8007..ea20ef12903 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductInCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
index 7f12ecab2f3..b2a87f0ee3e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
index ca7813a34e8..b00dc4d1713 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductInStock
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
index 1b2f8fba221..f53f723ebc2 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
@@ -11,9 +11,9 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductIsNotDisplayingOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
index 8785c154add..e0cd14a071e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductIsNotVisibleInCompareBlock
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
index ddbba15320b..65205e252f7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductIsNotVisibleInComparePage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
index 342c6113967..d973f1ae0bc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
index e3963b136f1..bf5fe7db227 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductNotSearchableBySku
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
index a96967889aa..cb885fcee6f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductNotVisibleInCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
index 0b80ebe44bb..9aeec7495e1 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductOutOfStock
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
index ff401913e52..23e31de68ca 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
index 2d2e0ff69f5..7f972607e95 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
index 118a0aedf71..337aec58a57 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductSearchableBySku
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
index 985b0e30d23..cfeed99f470 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductSkuAutoGenerated
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
index 5bed77b3a43..4a4df8f12a0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert that displayed special price on product page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
index 408d2aea57d..0be5aaf2f66 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
index d5d4beaf5ba..af751de70b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductTemplateForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
index 87d0c910598..d207b3b1a35 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
-use Mtf\ObjectManager;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
index 1a616f41bc6..6c5f5a361f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductTemplateInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
index 870fa371f97..6169fe31598 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductTemplateNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
index 378370a4524..34dbf3c2914 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
@@ -12,8 +12,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertProductTemplateOnProductForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
index 1308b188bc0..8fe292c2423 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductTemplateSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
index cc06f1cce7c..e19ff627456 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductTemplateSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
index ef322cf1ee3..94702a94536 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Block\Product\View;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert that displayed tier price on product page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
index 9b93ddcd2f0..52bfc9299be 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
index a58ede70359..c8167af1480 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductVisibleInCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
index f762b48b227..c2279cf6a73 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertRelatedProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
index 35fbfcf3a3b..0dae93dd6d2 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
@@ -7,10 +7,10 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertUpSellsProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
index 133d2e28910..8bb9e412214 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUsedSuperAttributeImpossibilityDeleteMessages
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
index e1c04547aa3..47ba4a555e5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
 
 class AssignProducts extends Product
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
index 1d977962b2e..9e8d1996b13 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Fixture\Cart;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
index 4a3c8f5da9c..21cf68bc8a8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CatalogAttributeSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
index fe38371d7ab..3cab1236414 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssignedAttributes
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
index 4d70dd528ea..27f86800767 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class SkeletonSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
index db403b73608..4d645477ec2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CatalogAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
index fce3250d3d7..f05c63c30d7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
index 4c988324e04..ffaa24098d3 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\System\Config;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Class CatalogProductSimple
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
index 7d041eb90f1..b1ffd032219 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AbstractRelatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
index 17faa3b5b06..28b6e17750a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AttributeSetId
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
index 9453ec0828e..cf59c0bc7a1 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class CategoryIds
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
index ac5d1798095..6cabd44b50e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class CheckoutData
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
index 49d6a01d0c0..024e8bc7680 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Source for attribute field.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
index 733a611b3cb..82d498b27c0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class CustomOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
index 5e84f8822e5..8d29bd7bd8b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Fpt
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
index 256bb41cb82..096fa2fd20d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class GroupPriceOptions
@@ -19,7 +19,7 @@ use Mtf\Fixture\FixtureInterface;
 class GroupPriceOptions implements FixtureInterface
 {
     /**
-     * @var \Mtf\Fixture\FixtureFactory
+     * @var \Magento\Mtf\Fixture\FixtureFactory
      */
     protected $fixtureFactory;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
index 9c68b4060f2..470558b5d4d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Price
@@ -33,7 +33,7 @@ class Price implements FixtureInterface
     protected $params;
 
     /**
-     * @var \Mtf\Fixture\FixtureFactory
+     * @var \Magento\Mtf\Fixture\FixtureFactory
      */
     protected $fixtureFactory;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
index 0d5b1c9981a..bfec8539bb6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
@@ -7,12 +7,12 @@
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 use Magento\Tax\Test\Fixture\TaxClass as FixtureTaxClass;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
index 4dbc4be608d..1d2c292ec6e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class TierPriceOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
index 997b81fbbda..c7102655fe9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Class CatalogProductVirtual
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
index d27ae4c345b..c159bb8f739 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
index c84d694e909..1230c6c9654 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Fixture\Category;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class CategoryProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
index b8110cfe174..add0a7c40e1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\Category;
 
 use Magento\Cms\Test\Fixture\CmsBlock;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Prepare landing page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
index 57c0c0e49ee..7075706983b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\Fixture\Category;
 
 use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class ParentId
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
index 9f8bfc89254..6314c21b52c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Fixture;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 class CrosssellProducts extends AssignProducts
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
index ba65b0bb50c..ca49dbcb874 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\ObjectManager;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Config;
 
 class Product extends DataFixture
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
index 9ae108402b3..e0bcf99fe40 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class Attribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
index 43a32cb5864..29ce1edf925 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
 
 /**
  * Class SimpleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
index 35057a1f722..be101be7e28 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 class VirtualProduct extends Product
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
index fb00c52d4d9..da04410ef23 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogCategoryEntityInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
index 6e33e1ee8ac..869c7507cda 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
index 1a5221e0501..de29b27f945 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogCategoryEntityInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index 9d3652fe978..fb0e7437711 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
index f4df1f92896..f705cfd88f2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogProductSimpleInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
index 0f7a8b1dd6b..c6ee44d2d0c 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
 
-use Mtf\System\Config;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Create new simple product via curl.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
index e3b8421cc3e..1e3631bc057 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui as AbstractUi;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui as AbstractUi;
 
 /**
  * Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
index 67a4bf6cfff..d9cc8dff4df 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Handler\CatalogProductVirtual;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogProductVirtualInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
index adfdcb62c0a..d63688100a2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Handler\Category;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CategoryInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
index 030d3bbae3b..0e8c6e7fd42 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Catalog\Test\Handler\Category;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
index 6f3040413d8..1205d69fa11 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
@@ -7,13 +7,13 @@
 
 namespace Magento\Catalog\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
index f2873e71543..18a8f3598f0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
@@ -8,12 +8,12 @@
 namespace Magento\Catalog\Test\Handler\Curl;
 
 use Magento\Catalog\Test\Fixture\ProductAttribute;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class CreateProductAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
index 1533bae18f6..acabe4b5e64 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Handler\Ui;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
 
 /**
  * Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
index 06155fa4297..43666299a1a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Page\Category;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
index 052b360b14a..f7bcf562cd9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Test\Page\Category;
 
 use Magento\Backend\Test\Block\FormPageActions;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class CatalogCategoryEdit
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
index b29d69f56c7..96ffb35c545 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Page\Product;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class CatalogProductActionAttributeEdit
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
index cfe500f811c..9d31fe311d9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Product Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
index 87da5eb4b6f..1bba2984d00 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogProductTemplate
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
index fc5aacdd8e4..0c274785757 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogProductAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
index 43ee2aadb8f..de287058e44 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Data for creation Catalog Product Simple.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
index fd43d3c3aa3..d62d7b3ddb5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogProductVirtual
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
index ecb9febd09a..61b458e067e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
index 7e83c80ef20..4c9b8591ac0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\Repository;
 
 use Magento\Catalog\Test\Fixture;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Product Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
index 500c30275b0..607a80eea4e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Product Attribute Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
index 232fd29cfc8..ed8172c2fe9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateCategoryEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
index 4148746b6e2..85496befeb3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteCategoryEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
index 8362d31c4fb..7b43b018904 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateCategoryEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
index 6865d2fad80..c0200a2ccb2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Class AbstractAddRelatedProductsEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
index 7cc92323a57..b8bcce9c6c7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
@@ -11,11 +11,11 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Abstract class for compare products class.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
index 209fb3f589c..251ff8c60d3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateProductTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
index 19bb0fa8f7b..02044246737 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateSimpleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
index bef726b3adb..01f3fecddca 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateSimpleWithCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
index 9cc4424bf05..1f6c1e41b6f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateSimpleWithCustomOptionsAndCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
index 5eba6633509..b168b568d24 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
index c3662e3f685..b7e1955b146 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\CatalogProductVirtual;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateVirtualProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
index 473a7a2599a..7e966ab4371 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\VirtualProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
index 0a454ded8bc..2f71f814a2a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CrosssellTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
index b03a0cf4e53..75898fccf9a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Edit products
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
index 9b35f9081b3..1cdff9dbf0e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ProductTypeSwitchingOnCreation
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index c1b821dedef..7448eb5eb32 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ProductTypeSwitchingOnUpdating
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
index 448e534fdab..2dce365a7bc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related;
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class RelatedProductTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
index 69ca4b005de..bf024a2a2a4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class UnassignCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
index 248bd5a6a71..33125f9bdff 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateProductSimpleEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
index f3bfd46975f..0868765d7b5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\CatalogProductVirtual;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateVirtualProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
index b8e7bb4e70b..23d3a2a5813 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell;
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class UpsellTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
index aca4fb8a4fc..7ddb966ed99 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetAdd;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateAttributeSetEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
index 0dfee0e266d..d17441b09b1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Scenario;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
index c863602bbcd..aa04e94af83 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Scenario;
 
 /**
  * Test Creation for CreateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
index ef01e486b83..5a717e86f09 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete Attribute Set (Product Template)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
index 86b4b2db53f..5e88db04c3c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete Attribute Set (Product Template)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
index 0375978ad72..7303aaf305c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
index ccb1ccadf1b..5bf2a74ee1e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Cover DeleteSystemProductAttribute with functional tests designed for automation
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
index 7437d0e488d..9485ebe8e08 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete Used in Configurable ProductAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
index dc1e25e7703..0939c76aadb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateAttributeSetTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
index a8f77b33c44..b9e8ed962b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
index 2224e63068c..ef52d2a94f0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Move attribute To attribute set.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
index 5c220ce185d..58d29f12e4d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Add custom attribute to product from product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
index 84d3f05f7ad..4b446c35fab 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Add New Attribute from Attribute index page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
index 299dc6d37bf..ad7ed5c25be 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\TestStep;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Create product using handler.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
index 7464f5c1d19..e8b106042af 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Create product attribute template using handler.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
index 914c92bd68d..74adfb27e10 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\TestStep;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class CreateProductsStep
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
index b485cf5956b..0c028ca6a48 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestStep;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Delete product attribute.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
index 63b6c188f1a..2d867c8aaa5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Fill custom attribute form on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
index b00e58a291f..265871d80b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Fill attribute form on attribute page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
index a357b802340..39f35eef6a5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Open Product Attribute Index Page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
index 99cacb3269e..d6f6f73cd5b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Open product on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
index ccba37cb304..cae7f71355d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\TestStep;
 
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Open products on frontend via url.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
index 5cccb4c6a34..38d6ebdf1b5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Click "Save" button on attribute form on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
index 60b9acf32ac..0651b72bc37 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Save attribute on attribute page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
index d592470490c..9d1e5d89968 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Save product step.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
index 09f46665104..759f036f3f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Save attributeSet on attribute set page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
index 1f1c6a2b71b..7ab1e215e9c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Set default attribute value.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
index 07d18daff56..9ad414f26cb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
@@ -10,7 +10,7 @@
         <severity>high</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductInGrid>
     <assertProductSaveMessage module="Magento_Catalog">
@@ -23,14 +23,14 @@
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductOutOfStock>
     <assertProductInStock module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductInStock>
     <assertProductVisibleInCategory module="Magento_Catalog">
@@ -39,7 +39,7 @@
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <category class="Magento\Catalog\Test\Fixture\Category" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductVisibleInCategory>
     <assertProductNotVisibleInCategory module="Magento_Catalog">
@@ -48,7 +48,7 @@
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <category class="Magento\Catalog\Test\Fixture\Category" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductNotVisibleInCategory>
     <assertProductSearchableBySku module="Magento_Catalog">
@@ -56,7 +56,7 @@
         <require>
             <catalogSearchResult class="Magento\CatalogSearch\Test\Page\CatalogsearchResult" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductSearchableBySku>
     <assertProductInCategory module="Magento_Catalog">
@@ -64,7 +64,7 @@
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
             <category class="Magento\Catalog\Test\Fixture\Category" />
         </require>
     </assertProductInCategory>
@@ -72,7 +72,7 @@
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
             <checkoutCart class="Magento\Checkout\Test\Page\CheckoutCart" />
         </require>
     </assertProductInCart>
@@ -80,42 +80,42 @@
         <severity>middle</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductPage>
     <assertProductGroupedPriceOnProductPage module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductGroupedPriceOnProductPage>
     <assertProductSpecialPriceOnProductPage module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductSpecialPriceOnProductPage>
     <assertProductTierPriceOnProductPage module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductTierPriceOnProductPage>
     <assertProductCustomOptionsOnProductPage module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductCustomOptionsOnProductPage>
     <assertProductForm module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductForm>
     <assertAddToCartButtonAbsent module="Magento_Catalog">
@@ -129,7 +129,7 @@
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
             <category class="Magento\Catalog\Test\Fixture\Category" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <catalogSearchResult class="Magento\CatalogSearch\Test\Page\CatalogsearchResult" />
@@ -139,14 +139,14 @@
         <severity>low</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductSkuAutoGenerated>
     <assertProductGroupedPriceOnProductPage module="Magento_Catalog">
         <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"  />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductGroupedPriceOnProductPage>
     <assertProductAttributeSaveMessage module="Magento_Catalog">
@@ -171,7 +171,7 @@
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <productSetEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit" />
             <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
-            <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+            <fixtureFactory class="Magento\Mtf\Fixture\FixtureFactory" />
         </require>
     </assertAddedProductAttributeOnProductForm>
     <assertProductAttributeIsRequired module="Magento_Catalog">
@@ -289,7 +289,7 @@
     <assertCategoryAbsenceOnFrontend module="Magento_Catalog">
         <severity>low</severity>
         <require>
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
             <categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <category class="Magento\Catalog\Test\Fixture\Category" />
         </require>
@@ -326,7 +326,7 @@
     <assertProductTemplateOnProductForm module="Magento_Catalog">
         <severity>high</severity>
         <require>
-            <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+            <fixtureFactory class="Magento\Mtf\Fixture\FixtureFactory" />
             <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
             <productEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
@@ -394,7 +394,7 @@
     <assertProductDuplicatedInGrid module="Magento_Catalog">
         <severity>low</severity>
         <require>
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
         </require>
     </assertProductDuplicatedInGrid>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
index 34945296329..fadb2635416 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="CreateProductAttributeEntityFromProductPageTest" module="Magento_Catalog">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
index a2e53144ce8..e667956e1f8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Grid;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
index 913a5dfeb7b..ed6797e5656 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
@@ -7,9 +7,9 @@
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class PromoForm
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index e4f55722744..2ad3ea93baa 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\Tab;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
index 068d5094e46..a66e4e04959 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogRule\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
index 7de205897b2..7b5c27f818e 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleAppliedCatalogPage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
index f5cf729f3b3..fb49621cc04 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleAppliedProductPage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
index 3ff64a39e77..e1a3b8bccf3 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleAppliedShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
index 1247ca4e175..5fc6a6d7bb7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\Constraint;
 use Magento\CatalogRule\Test\Fixture\CatalogRule;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleForm
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
index bf157e0a4bc..88ffb1308f2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\Constraint;
 
 use Magento\CatalogRule\Test\Fixture\CatalogRule;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleInGrid
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
index 0a8c3522d38..c38cab63849 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\Constraint;
 
 use Magento\CatalogRule\Test\Fixture\CatalogRule;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
index 0c1e8c41d7e..8106e0062b1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Constraint;
 
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleNoticeMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
index da703e0b1e6..30729236399 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Constraint;
 
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
index 46fa4556486..95e32ec3bd7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Constraint;
 
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCatalogPriceRuleSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
index d14ef23b1bf..ff33ac103f3 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
@@ -7,8 +7,8 @@
 namespace Magento\CatalogRule\Test\Fixture;
 
 use Magento\CatalogRule\Test\Repository\CatalogPriceRule as Repository;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class CatalogPriceRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
index 910c5a91f0b..087f07330c5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CatalogRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
index 714f7069486..548477e346f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogRule\Test\Fixture\CatalogRule;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Conditions
@@ -23,7 +23,7 @@ class Conditions implements FixtureInterface
     protected $data = [];
 
     /**
-     * @var \Mtf\Fixture\FixtureFactory
+     * @var \Magento\Mtf\Fixture\FixtureFactory
      */
     protected $fixtureFactory;
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
index 9b66a1bdd3b..10b7388a42a 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogRule\Test\Fixture;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
index c92ec7fe231..ed8f7755097 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogRule\Test\Fixture\Product;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Category
@@ -18,7 +18,7 @@ use Mtf\Fixture\FixtureInterface;
 class Category implements FixtureInterface
 {
     /**
-     * @var \Mtf\Fixture\FixtureFactory
+     * @var \Magento\Mtf\Fixture\FixtureFactory
      */
     protected $fixtureFactory;
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
index 7e94d6c9874..5ea223b692b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogRule\Test\Handler\CatalogRule;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogRuleInterface
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
index 8225dc55dcb..d1b01f2b89a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
@@ -8,11 +8,11 @@ namespace Magento\CatalogRule\Test\Handler\CatalogRule;
 
 use Magento\Backend\Test\Handler\Conditions;
 use Magento\CatalogRule\Test\Handler\CatalogRule;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
index 3aad355402c..1a9b4268b9f 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogPriceRule Repository
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
index a2d1254e13c..0fa29eb5721 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
index 83535be670a..5602c65632c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Backend\Test\Page\Adminhtml\AdminCache;
 use Magento\CatalogRule\Test\Fixture\CatalogRule;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Parent class for CatalogRule tests
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
index 13fb5e1a6c3..959edfcf464 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\TestCase;
 use Magento\CatalogRule\Test\Fixture\CatalogRule;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete CatalogPriceRuleEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
index 9bffed37d4e..fd52826d9bc 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\TestStep;
 
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class DeleteAllCatalogRulesStep
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
index 4503bbea042..c98608a6063 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
@@ -6,11 +6,11 @@
 
 namespace Magento\CatalogSearch\Test\Block\Advanced;
 
-use Mtf\Block\Form as ParentForm;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Advanced search form.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
index 79541bcf3d1..f62cc2ddfb1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogSearch\Test\Block\Advanced;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Result
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
index 93246a5256e..3eb7492a8f7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\CatalogSearch\Test\Page\AdvancedResult;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAdvancedSearchProductsResult
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
index df52f62ce4f..410a7134bae 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\AdvancedResult;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert search results.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
index 444b6ffba31..337398e208c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogSearch\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\CatalogSearch\Test\Page\AdvancedResult;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
index 2057dc418cc..1f1eeb86e3d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
@@ -7,8 +7,8 @@
 namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchSynonymMassActionNotOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
index 347b51322bb..63d60cf7c53 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchSynonymNotOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
index bdde33a21d9..1a9dd4b4b7e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermForm
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
index bb03c1a485b..9307dfff97a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermInGrid
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
index 54cd1e2d301..9e6fc929963 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermMassActionNotOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
index ba31e19ee04..4480b8795a9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermMassActionsNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
index 986c39c669c..e1ddef02322 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
index 0a331193d86..07016ce2297 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermNotOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
index e696d2f7b9f..58e1aa3ab13 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
@@ -9,8 +9,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
 use Magento\Catalog\Test\Block\Search;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
index 16ff4f13f1c..0177e5d8860 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
index c71093f642e..f05a61e2d0f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermSuccessMassDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
index 8eb589cc133..96d9df392e9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
index 05b1f68274f..01379f373a4 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermSynonymOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
index ff6bc79e1a8..388806e1f3a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSuggestSearchingResult
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
index ce372d1c8ad..82858efa74f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogSearch\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CatalogSearchQuery
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
index 172d79054d9..b2bf945cc67 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Data to search for.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
index 431ad8860dd..cc6f02816f1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogSearch\Test\Handler\CatalogSearchQuery;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CatalogSearchQueryInterface
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
index ac1f7447596..d570d3653db 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\CatalogSearch\Test\Handler\CatalogSearchQuery;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Create new search term via curl.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
index 789e3312ad1..60eea1265c7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogSearch\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CatalogSearchQuery
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
index 98eaf67aad6..2bd73f161a8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\CatalogSearch\Test\TestCase;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\CatalogSearch\Test\Page\AdvancedSearch;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Preconditions:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
index 02dc9a6038c..106070b62ec 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
index d9f55fe3744..b8400504d03 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
index 4c6c542abae..a2b143d4786 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
@@ -10,7 +10,7 @@ use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for EditSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
index 306ea03431d..4f35edd4150 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\TestCase;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for MassDeleteSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
index a965f34e0fa..30a54eda01b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Preconditions:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
index dda437f4e48..d4ce912e613 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
 
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Cover Suggest Searching Result (SearchEntity)
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
index 7a061c80ad1..9a215cf30c0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
@@ -48,7 +48,7 @@
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchTermOnFrontend>
     <assertSearchTermSuccessSaveMessage  module="Magento_CatalogSearch">
@@ -62,7 +62,7 @@
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchTermSynonymOnFrontend>
     <assertSearchTermSuccessDeleteMessage module="Magento_CatalogSearch">
@@ -83,7 +83,7 @@
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchTermNotOnFrontend>
     <assertSearchSynonymNotOnFrontend module="Magento_CatalogSearch">
@@ -91,7 +91,7 @@
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchSynonymNotOnFrontend>
     <assertSearchTermSuccessMassDeleteMessage module="Magento_CatalogSearch">
@@ -110,14 +110,14 @@
         <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchTermMassActionNotOnFrontend>
     <assertSearchSynonymMassActionNotOnFrontend module="Magento_CatalogSearch">
         <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
-            <browser class="Mtf\Client\Browser" />
+            <browser class="Magento\Mtf\Client\Browser" />
         </require>
     </assertSearchSynonymMassActionNotOnFrontend>
     <assertProductCanBeOpenedFromSearchResult module="Magento_CatalogSearch">
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 78e78b920cf..2802929c106 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -9,10 +9,10 @@ namespace Magento\Checkout\Test\Block;
 use Exception;
 use Magento\Checkout\Test\Block\Cart\CartItem;
 use Magento\Checkout\Test\Block\Onepage\Link;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
index 9bb23fb9ef1..c2c64fd6903 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class AbstractCartItem
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
index 37279e168e8..0df5fe46b9e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class CartEmpty
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
index 28eb3677d16..afd5015cfa5 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class CartItem
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
index 10cc6f978fe..58637651153 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class DiscountCodes
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index be5ac4d8680..b6fde4920b1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -7,8 +7,8 @@
 namespace Magento\Checkout\Test\Block\Cart;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Shipping
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 8c9fcba5500..f909e97086b 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
@@ -6,9 +6,9 @@
 namespace Magento\Checkout\Test\Block\Cart;
 
 use Magento\Checkout\Test\Block\Cart\Sidebar\Item;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Sidebar
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
index 009dbf2080c..4805e9e8195 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
index db25444ba3b..cd1310aa639 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Checkout\Test\Block\Onepage;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Link
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
index fcfbe4fa3cf..e45449de86f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertAddedProductToCartSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
index c82dffd2d97..884ade85b09 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
@@ -8,8 +8,8 @@ namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCartIsEmpty
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
index 1daf7be9ffe..c2dc2534f43 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert that cart item options for product(s) display with correct information block.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
index cc6b3b6d8c0..ae6092c120f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGrandTotalInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
index cb4befc85d1..752aaf9c871 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderSuccessPlacedMessage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
index 5639da766ad..aefa6c7410f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderTotalOnReviewPage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
index b010de8e5dc..3e45f83a879 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertPriceInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
index 64ee8bb3a26..db61bb67086 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
@@ -7,8 +7,8 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductAbsentInMiniShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
index cfce160ea59..b371ec3fc3a 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductIsNotEditable
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
index 75c3ce9bf03..4a64e5610c2 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductPresentInMiniShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
index 1fd9499bdba..f01fb902ebd 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductPresentInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
index 23e4a1662f8..8a0dd741d18 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductQtyInMiniShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
index c104a7172da..b8c353c3f31 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductQtyInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
index 1486d72d50c..515b7433ede 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that products are absent in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
index 81d8c95bef2..770595ed2bd 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertSubtotalInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
index 4a2db34cc9c..aab39fa9e4e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Checkout\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
index de23b4c2811..6ca6c12cc21 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Test\Fixture\Cart;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index ea5315c2dce..8bfa4789d0e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -8,10 +8,10 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for AddProductsToShoppingCartEntity
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
index fe869f8eb60..b3ae8fdbd93 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
@@ -8,10 +8,10 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Class DeleteProductFromMiniShoppingCartTest
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
index caa67406169..87b1cd59973 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
@@ -8,11 +8,11 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Class DeleteProductsFromShoppingCartTest
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
index a4a01f195a5..f5d30d2f9bd 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -8,9 +8,9 @@ namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 7f950968d95..bd3f7381fb4 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -10,9 +10,9 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update ShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index a6e478ed087..bc314698d1f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -9,8 +9,8 @@ namespace Magento\Checkout\Test\TestStep;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class AddProductsToTheCartStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index 40deeb5db84..1c0ce87c688 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Test\TestStep;
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class FillBillingInformationStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
index 0d051665e6e..df510f1e2e8 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class FillShippingMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
index 3b72746e08c..7adfc7fc1ac 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Test\TestStep;
 use Magento\Checkout\Test\Constraint\AssertOrderTotalOnReviewPage;
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class PlaceOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
index 2776d137891..6fdee3ab317 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class ProceedToCheckoutStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
index 154ccf10810..3d37267a82e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectCheckoutMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
index ba5eee6cc93..f17bc063c16 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectPaymentMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
index ab0fe4da4e6..bef12be128c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="OnePageCheckoutTest" module="Magento_Checkout">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
index 128aee14baf..20685db1cde 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Cms\Test\Handler\CmsBlock;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CmsBlockInterface
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
index 2c716b8c993..49f62f95f85 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Cms\Test\Handler\CmsBlock;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
index 5c3ce1b3c17..35f8db75513 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Cms\Test\Handler\CmsPage;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CmsPageInterface
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
index 012448057df..85e033bcf4a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
@@ -7,11 +7,11 @@
 namespace Magento\Cms\Test\Handler\CmsPage;
 
 use Magento\Backend\Test\Handler\Conditions;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
index 70bb2840162..1385164d592 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
@@ -6,10 +6,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Form as ParentForm;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
index fd89c189a2f..8470504b7f2 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Composite;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index a449ffbd476..c402668ebfe 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -9,9 +9,9 @@ namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Supe
 use Magento\Backend\Test\Block\Template;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Fixture\CatalogCategory;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Config
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index d187039b054..eecdf4f31dd 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -6,9 +6,9 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute\AttributeSelector;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
index 960fe7a5a41..7fac9008118 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
 
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
index 8bb6c1eb331..fffb5b80c8e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
@@ -6,8 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
 
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ToggleDropdown
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
index 2d7bf391fcb..11db5ed3046 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
@@ -6,10 +6,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Template;
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Matrix
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
index 33906db2f02..b1822f54f0e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
index 868a284241a..7a666e37075 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
@@ -6,12 +6,12 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
 
-use Mtf\Client\Element;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ProductForm
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
index 99d42204d7c..f7b417ba658 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Block\Product;
 use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
index fbe61c3b1c3..c191f139706 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
@@ -9,11 +9,11 @@ namespace Magento\ConfigurableProduct\Test\Block\Product\View;
 use Magento\Catalog\Test\Block\Product\View\CustomOptions;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class ConfigurableOptions
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
index 6ba16adff26..49ed7543a01 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
@@ -9,7 +9,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertChildProductIsNotDisplayedSeparately
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
index 3cb601b6485..80446fef978 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertChildProductsInGrid
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
index 73e39cb697c..22695040b34 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that deleted configurable attributes are absent on product page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
index 443e8ab302c..e43779622b8 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
@@ -8,8 +8,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that all configurable attributes is absent on product page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
index 7e8a9bce012..7bc07b5c990 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert form data equals duplicate product configurable data.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
index e0fd148d126..0cf25ed3ed8 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertConfigurableProductInCart
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
index d96b2f6eb8c..2b27a259c1e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
 use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertConfigurableProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
index 729f19f2a76..5b7a08c049a 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
 
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
 use Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertConfigurableProductInItemsOrderedGrid
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
index 0b45b5dbed3..5a3965dca39 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
@@ -11,7 +11,7 @@ use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Conf
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductAttributeAbsenceInVariationsSearch
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
index a8c49f6f177..402b06c7ab2 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config as TabVariation;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert check whether the attribute is used to create a configurable products.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
index 29b62650fa4..80aa5bd293b 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
 namespace Magento\ConfigurableProduct\Test\Fixture\Cart;
 
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
index 1be0737898b..8dedc818972 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Fixture;
 use Magento\Catalog\Test\Fixture\Product;
 use Magento\Catalog\Test\Fixture\ProductAttribute;
 use Magento\ConfigurableProduct\Test\Repository\ConfigurableProduct as Repository;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
 
 /**
  * Class ConfigurableProduct
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
index b2db8a8a3d8..99f2309d0d8 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
@@ -6,12 +6,12 @@
 
 namespace Magento\ConfigurableProduct\Test\Fixture;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Configurable product fixture.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
index 4a9959eaec9..17e00b49ce7 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
@@ -8,9 +8,9 @@ namespace Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class ConfigurableAttributesData
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
index df17a44e65f..ac4eed63d16 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface ConfigurableProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
index 9532613a342..2a354d1e6d4 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
index 4f96c8c35f7..8b584d3b549 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
@@ -8,12 +8,12 @@
 namespace Magento\ConfigurableProduct\Test\Handler\Curl;
 
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Create Configurable Product
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
index 6de4962e991..aab0344ffb6 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class ConfigurableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
index 20dc365fb54..95a0ed331c1 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\ConfigurableProduct\Test\TestCase;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Coverage for CreateConfigurableProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
index 971ca6fc17d..d2b92908b86 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
@@ -7,8 +7,8 @@
 namespace Magento\ConfigurableProduct\Test\TestCase;
 
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateConfigurableTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
index c273b8db9f6..6d3a0ebdd9d 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\TestCase;
 use Magento\Catalog\Test\Fixture\Product;
 use Magento\Catalog\Test\Fixture\ProductAttribute;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateWithAttributeTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
index 3cf47fcf6e0..568fce2a32a 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Test\TestCase;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class EditConfigurableTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
index 707dca5ee81..e42c08cd992 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Test\TestCase;
 
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\TestCase\Scenario;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
index 46edf723603..d750752c960 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\TestStep;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Update configurable product step.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
index 5736b9ae666..b53a78e864b 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="UpdateConfigurableProductEntityTest" module="Magento_ConfigurableProduct">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
index 7b7fc193e4b..719bbdc16f0 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
@@ -7,7 +7,7 @@
 namespace Magento\Core\Test\Block\Adminhtml\System\Variable;
 
 use Magento\Backend\Test\Block\FormPageActions as AbstractFormPageActions;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
index 0295051a8a4..c90426413c9 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Core\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Global messages block
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
index b8fe842e075..331d1d31584 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
@@ -10,7 +10,7 @@ use Magento\Core\Test\Fixture\SystemVariable;
 use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
 use Magento\Core\Test\Page\Adminhtml\SystemVariableNew;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertCustomVariableForm
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
index 4a1ea3bf6f1..399d1cf6579 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
 
 use Magento\Core\Test\Fixture\SystemVariable;
 use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomVariableInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
index 4ceeed0a49d..ea924d0c9bb 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
@@ -9,9 +9,9 @@ namespace Magento\Core\Test\Constraint;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Core\Test\Fixture\SystemVariable;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertCustomVariableInPage
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
index e3909d23062..ba47a15cbc3 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
 
 use Magento\Cms\Test\Page\Adminhtml\CmsNew;
 use Magento\Core\Test\Fixture\SystemVariable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomVariableNotInCmsPageForm
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
index ba1bf51c401..1f7b0a5f6e9 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
 
 use Magento\Core\Test\Fixture\SystemVariable;
 use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomVariableNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
index ea831007434..f25ff181eb1 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Core\Test\Constraint;
 
 use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomVariableSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
index 56ca2bf0661..a6107f10dd3 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Core\Test\Constraint;
 
 use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomVariableSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
index ef5afdf6641..0dd119e2d36 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Core\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class ConfigData
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
index 8671a384d5f..5dc92e19efb 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Core\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class SystemVariable
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
index 46e280e3a7b..7189e812293 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Core\Test\Handler\ConfigData;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface ConfigDataInterface
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
index 3f17403f0c0..f2168174fcc 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Core\Test\Handler\ConfigData;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
index 43eaa3b5902..696d8aca6f0 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Core\Test\Handler\SystemVariable;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
index 03b49763dd3..342213d9c61 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Core\Test\Handler\SystemVariable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface SystemVariableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
index 330590dcb95..4135d0431d5 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Core\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class SystemVariable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
index 8c0bebfe2b5..36c96877890 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Block\Account;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class AddressesAdditional
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
index 6a534d3675c..61b9e79d94d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Customer\Test\Block\Account;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Addresses default block
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
index d64bd7ec75b..d9210fe4c9d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Block\Account\Dashboard;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
index 80775eacd60..752cf03df70 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Block\Account\Dashboard;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
index e9e9dc79c43..2f3745944d4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\Block\Account;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
index 0a0aacd1edb..d5278db123f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Block\Address;
 
 use Magento\Customer\Test\Fixture\Address;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 0be09cdef87..cdf70642bbd 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Block\Adminhtml\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CustomerForm
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
index d74ee4a9d5d..864fbb11f81 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -8,10 +8,10 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Addresses
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
index 259a8e0d8e0..21b2410a615 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Block\Form;
 
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
index 14ea91e4b61..b8a9dc7afbd 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Block\Form;
 
 use Magento\Customer\Test\Fixture\Customer;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
index 1e6aeeab180..2b009be5719 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Block\Form;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
index 6b7d906bafc..d5de5868dba 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Block\Form;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Register
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
index ab8cdd7a09d..6259e116b41 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAddressDeletedBackend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
index 59d7c65a957..c6cbb07fb13 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAddressDeletedFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
index 78d026849c1..8c27d596f97 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertChangePasswordFailMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
index 1c20d0279f4..ab7ac43f795 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerAddressSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index e5797656006..3fb0c59976d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerDefaultAddresses
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
index c628151dc76..36fe9c355c1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountCreate;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerFailRegisterMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
index de31e2f323f..0c55f3cd04a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerForm
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
index 16c8aae67ba..8307c220fe2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupAlreadyExists
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
index f868758d3ec..6cc186ea9e5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\Constraint;
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
index 6d51e076e38..1d938173f9e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
index 93e5357f6f9..cabf657058a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
index 784167e2aea..10d3c750d07 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertCustomerGroupOnCustomerForm
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
index 469bb37c53f..311a8e0bafb 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
index 4876b0d1bd3..6c32ceb281d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerGroupSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
index 56c20f0a97e..569e949e917 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
index 068def78da9..6f9d6d9c144 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerInfoSuccessSavedMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
index 83cc134fe2a..63c178507c6 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerInvalidEmail
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
index 9e8c1e10099..f309e6ac9db 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerMassDeleteInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
index 163ffab9417..c2bbd18879b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerMassDeleteNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
index 0ca26366253..77e7ada0042 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerMassDeleteSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
index 42ed108c63b..69104a54536 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
index 07ce3870907..67e2021c36e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
@@ -8,8 +8,8 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Check that login again to frontend with new password was success.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
index c77502129d6..80a41da9d27 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check that after clicking to "Create account" button customer redirected to Dashboard.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
index 4bc212dc9c1..c1880977187 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
index 4f3646e6d4a..3ad80d98d85 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\CustomerAccountCreate;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerSuccessRegisterMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
index c6939cb4d1a..198d824e705 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
index 9ac88c66c54..cdd9c6c2cd2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertMassActionSuccessUpdateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
index 3deee0d1f81..341c4befe32 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check that conformation message is present.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
index 4d141c5eb60..3419fc5b42e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
index f1e15852d1c..9ef1a4ea240 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
@@ -9,10 +9,10 @@ namespace Magento\Customer\Test\Fixture;
 /**
  * Address of registered customer
  */
-class AddressBook extends \Mtf\Fixture\DataFixture
+class AddressBook extends \Magento\Mtf\Fixture\DataFixture
 {
     /**
-     * @var \Mtf\Fixture\DataFixture
+     * @var \Magento\Mtf\Fixture\DataFixture
      */
     protected $_addressFixture;
 
@@ -26,9 +26,9 @@ class AddressBook extends \Mtf\Fixture\DataFixture
     /**
      * Set address fixture
      *
-     * @param \Mtf\Fixture\DataFixture $address
+     * @param \Magento\Mtf\Fixture\DataFixture $address
      */
-    public function setAddress(\Mtf\Fixture\DataFixture $address)
+    public function setAddress(\Magento\Mtf\Fixture\DataFixture $address)
     {
         $this->_addressFixture = $address;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
index c021f8acfa4..be272903dde 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AddressInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
index 01e4950e494..52bd27ee085 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class Customer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
index 1d51c93d08a..274b3d8c81f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Customer in Backend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
index 5b461b44136..f905b2dca67 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class Customer Group Fixture
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
index 08b310d5c17..db297d43bb3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Fixture\CustomerGroup;
 
 use Magento\Tax\Test\Fixture\TaxClass;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class TaxClassIds
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
index 8367374caf1..067628370b1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CustomerGroupInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
index 6a662d177f2..aa935e1a85c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class CustomerInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
index e1157be1a9f..7a5d580c6b4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Fixture\CustomerInjectable;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
index 91b7c0bdb73..1c728b16ec4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
@@ -7,8 +7,8 @@
 namespace Magento\Customer\Test\Fixture\CustomerInjectable;
 
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class GroupId
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
index b51d232c2e6..03e09cebf8e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
@@ -7,10 +7,10 @@
 
 namespace Magento\Customer\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * Class CreateCustomer.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
index 8c9535e677a..f2ef96f3636 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
@@ -7,12 +7,12 @@
 
 namespace Magento\Customer\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Curl handler for creating customer in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
index 02140bcc661..4c14cc43113 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Customer\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Curl handler for creating customer group in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
index 5e2662520ba..945abc71934 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Customer\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * Curl handler for saving customer address in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
index 83b7d6086ad..bcc05fc5209 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
 
 use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
index a21630e2009..c9388a4daf9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CustomerGroupInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
index c102f9aac7e..52b1c48dfbf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\Customer\Test\Handler\CustomerInjectable;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
index 9c0215484c9..a97cbe97367 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Handler\CustomerInjectable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface CustomerInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
index 24a066b4d3a..adc3d2d2731 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
@@ -7,13 +7,13 @@
 
 namespace Magento\Customer\Test\Handler\Ui;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * UI handler for creating customer address.
  */
-class CreateAddress extends \Mtf\Handler\Ui
+class CreateAddress extends \Magento\Mtf\Handler\Ui
 {
     /**
      * Execute handler
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
index 64444bdfa34..5d3e2251705 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Customer\Test\Handler\Webapi;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Webapi;
-use Mtf\Util\Protocol\SoapTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Webapi;
+use Magento\Mtf\Util\Protocol\SoapTransport;
 
 /**
  * Class CreateCustomer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
index 6f67a22bce3..54b9775dbec 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Customer\Test\Page\Address;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class DefaultAddress
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
index 07ecc049911..ff129b94eb1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Page;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
index 0bf0bea1b74..9c34d17af3c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Customer\Test\Page;
 
-use Mtf\Page\Page;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class CustomerAccountLogout
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
index c08ee05a0fa..91fbd97193b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Customer\Test\Page;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Customer Address Edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
index 17560e76c41..6012db8cdd1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Address Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
index ea198cb5e26..e980970452a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class AddressInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
index a65111b1185..c0d1a738940 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Customer Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
index 08199c67c04..a54e62a838b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Customer Group Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
index 6b50700abd5..f9ef35f9a95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CustomerGroupInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
index 13fcff343ea..8154cf0f218 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class CustomerInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
index e3733a3423f..c979cd41c25 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\TestCase;
 
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 class BackendCustomerCreateTest extends Functional
 {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
index 617ee04eaf9..ec75d23b104 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Coverage for CreateCustomerBackendEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
index 82d2fa120f6..8ba1a89d841 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateCustomerGroupEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
index 56253f8b97f..6ab2dd30c72 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
@@ -10,7 +10,7 @@ use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateExistingCustomerFrontendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
index 42ff1a7f39d..22d2be27760 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
@@ -10,7 +10,7 @@ use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteCustomerAddress
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
index f847ee0f4be..d6fe3981534 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test creation for DeleteCustomerBackendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
index 1946240cdd9..dda7cbc0c85 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteCustomerGroupEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
index 9294155fe0b..b07f1dd1a03 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\TestCase;
 
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Reset password on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
index eee60e547ff..fa1782e8a4d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test creation for MassAssignCustomerGroup
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
index cb0213e5e54..99efcb8300d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test creation for MassDeleteCustomerBackendEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
index 377641038f2..586084a5fa7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
index f3a9a814d18..ed3e94fc950 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateCustomerBackendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
index e95db553f49..9c1822ed88b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -14,8 +14,8 @@ use Magento\Customer\Test\Page\CustomerAccountEdit;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAddressEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
index ded609bad23..1b544914dce 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update Customer Group Entity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
index 75564372ab8..e3c28182eef 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\TestStep;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class CreateCustomerStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
index b226fbfbf71..21d3291f649 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\TestStep;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class CreateOrderFromCustomerAccountStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
index 12902e16cf9..4cc77cfa414 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestStep;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Login customer on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
index b49ea09db7b..57fb8c5d952 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Customer\Test\TestStep;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class LogoutCustomerOnFrontendStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
index d63e0ba60d9..5182c34ee7c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\TestStep;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class OpenCustomerOnBackendStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
index 1d0c77e04be..1ffe25557c9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="CreateOrderFromCustomerPageTest" module="Magento_Customer">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 69fcd34d3a7..9bb1f70601c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Downloadable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
index aeae55fd0ec..3cdd191ec08 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class LinkRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 8b0e372cccd..cd799e849f6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
index 6574b462fe2..32e504efe5a 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class SampleRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index d51106239e1..5678ebd679f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class SampleRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
index ec98b6311bc..db10ef66ce1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Downloadable\Test\Block\Adminhtml\Product\Composite;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
index 32865198f72..c15b0acc3ee 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
@@ -7,8 +7,8 @@
 namespace Magento\Downloadable\Test\Block\Catalog\Product;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index a3f1d093957..fdd0aee5c6c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
index c50daf9add2..2adfcbf4382 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Samples
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
index c9efe872c45..ae55ff3b18f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Downloadable\Test\Block\Customer\Products;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ListProducts
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
index 75093a3f6a1..4fc2eadf8a9 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
@@ -9,7 +9,7 @@ namespace Magento\Downloadable\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductDuplicateForm;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertDownloadableDuplicateForm
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index 4a82a3f0be1..376b7af496f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -8,8 +8,8 @@ namespace Magento\Downloadable\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertDownloadableLinksData
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
index 3b2d61a5554..e1be5aba24b 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Downloadable\Test\Constraint;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
 use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertDownloadableProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
index 71a64c214d4..17c1132ce71 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
@@ -8,8 +8,8 @@ namespace Magento\Downloadable\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertDownloadableSamplesData
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
index c33a55a4e2d..6962509496d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
 namespace Magento\Downloadable\Test\Fixture\Cart;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
index f4d38073111..96407f349a1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
@@ -6,7 +6,7 @@
 namespace Magento\Downloadable\Test\Fixture;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class DownloadableProduct
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
index c51edf7d793..cc71d919ab8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Downloadable\Test\Fixture\DownloadableProduct;
 
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class LinksNotPurchasedSeparately
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
index c9013f0375e..0151c23348f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
@@ -6,7 +6,7 @@
 namespace Magento\Downloadable\Test\Fixture\DownloadableProduct;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProduct;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class LinksPurchasedSeparately
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
index ae72fdb25a2..cc798b15469 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class DownloadableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
index 54db055d0c8..89189d993b2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
index 31ace5f0429..e7e7a3a1bc8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Samples
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
index 36c4d0570d1..34466591d86 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Downloadable\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 class CreateDownloadable extends Curl
 {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
index 2c34a5381e8..fc45d141f13 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
@@ -7,11 +7,11 @@
 namespace Magento\Downloadable\Test\Handler\DownloadableProductInjectable;
 
 use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
index af455199b7d..04c50ffa5be 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Downloadable\Test\Handler\DownloadableProductInjectable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface DownloadableProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index de7dda22fc1..422267066a6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Downloadable\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class DownloadableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
index d32fc67d140..3d92e2ab47b 100755
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Downloadable\Test\TestCase\Create;
 
 use Magento\Downloadable\Test\Fixture\DownloadableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class LinksPurchasedSeparatelyTest
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
index 8f7fa66882f..5256ad90ced 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create DownloadableProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
index e53607eecbc..cdc9b994600 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update DownloadableProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
index 61e5435814d..7c70250f22a 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
@@ -20,7 +20,7 @@
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
-            <product class="Mtf\Fixture\FixtureInterface" />
+            <product class="Magento\Mtf\Fixture\FixtureInterface" />
         </require>
     </assertDownloadableDuplicateForm>
     <assertDownloadableProductInCustomerWishlistOnBackendGrid module="Magento_Downloadable">
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
index 7b10f6f4eb3..874fcf8b3aa 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
@@ -6,9 +6,9 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
 
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as ParentForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
index 18c8184ddcc..dc4cd183092 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
@@ -10,7 +10,7 @@ namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
  * Class GiftOptions
  * Backend GiftMessage for order form.
  */
-class GiftOptions extends \Mtf\Block\Form
+class GiftOptions extends \Magento\Mtf\Block\Form
 {
     //
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
index b6c6b6c1c39..8a607e2a365 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,8 +7,8 @@
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
 
 use Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items\ItemProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 2c37fb50893..3627d161b35 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
index da81852927d..48ce7e6ad17 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
 
-use Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Block\Form as ParentForm;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
index f2343fe5361..79e0184c7d5 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
@@ -10,7 +10,7 @@ namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
  * Class GiftOptions
  * Backend GiftMessage for order from.
  */
-class GiftOptions extends \Mtf\Block\Form
+class GiftOptions extends \Magento\Mtf\Block\Form
 {
     //
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
index e56a5ec339f..f6df838ca03 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
@@ -7,8 +7,8 @@
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
 
 use Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items\ItemProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
index 1f0b389d719..46440c49f3c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
index 3a15dbbf8cf..0c41872447b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
@@ -7,8 +7,8 @@
 namespace Magento\GiftMessage\Test\Block\Message;
 
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Inline
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
index 704799a725d..2c1a696e692 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Block\Message\Inline;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class GiftMessageForm
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 5856ce8df42..b3c29e22520 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -6,8 +6,8 @@
 
 namespace Magento\GiftMessage\Test\Block\Message\Order\Items;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Gift message block for order's items on order view page.
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
index bd5d809d0af..fe543f8c3bd 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
@@ -9,7 +9,7 @@ namespace Magento\GiftMessage\Test\Constraint;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertGiftMessageInBackendOrder
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
index 9e4204a5e4e..9a2946618d8 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 use Magento\Sales\Test\Page\OrderHistory;
 use Magento\Sales\Test\Page\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGiftMessageInFrontendOrder
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index 693e0fa8924..09c931ac7a3 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 use Magento\Sales\Test\Page\OrderHistory;
 use Magento\Sales\Test\Page\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGiftMessageInFrontendOrderItems
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
index 6e65e3ae4fe..d5857c0b99c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class GiftMessage
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
index bff6852923d..d53cc719374 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
@@ -6,8 +6,8 @@
 
 namespace Magento\GiftMessage\Test\Fixture\GiftMessage;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
index 436fee4c6bc..c0aae33db52 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GiftMessage\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class GiftMessage
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
index 793ac9f616e..18848d9e75d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
@@ -8,7 +8,7 @@ namespace Magento\GiftMessage\Test\TestStep;
 
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class AddGiftMessageBackendStep
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
index 2e1cabbb654..190de05c9ee 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
@@ -8,7 +8,7 @@ namespace Magento\GiftMessage\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class AddGiftMessageStep
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
index 27b48d7e39f..71282278e78 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="CheckoutWithGiftMessagesTest" module="Magento_GiftMessage">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
index 4f6ad63cd64..dcf5ad4f512 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
@@ -6,9 +6,9 @@
 
 namespace Magento\GoogleShopping\Test\Block\Adminhtml\Types\Edit;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class GoogleShoppingForm
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
index 37ce5a91a8c..7177cd74856 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
@@ -9,8 +9,8 @@ namespace Magento\GoogleShopping\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
 use Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesIndex;
 use Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertProductAttributeAbsenceForAttributeMapping
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
index dcfa2ffe5ff..88734fe6eb2 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GoogleShopping\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class GoogleShoppingAttribute
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
index 2cb95ff70cc..cfaf1d46249 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
@@ -7,8 +7,8 @@
 namespace Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute;
 
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AttributeSetId
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
index a7977ac9b2c..cbf687a0740 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GoogleShopping\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class GoogleShoppingAttribute
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
index df8cf85c629..11da495acee 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
 
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Composite;
 
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 275601b0631..037331074bd 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -7,9 +7,9 @@
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class AssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 7a9ea7cc85d..1151e76c032 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,8 @@
 
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 34dd3ac6333..f7a644f9d93 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts\ListAssociatedProducts;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Product
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
index 710eb38c9e7..fd8184a473a 100755
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
@@ -7,7 +7,7 @@
 namespace Magento\GroupedProduct\Test\Block\Catalog\Product;
 
 use Magento\Catalog\Test\Block\Product\View as ParentView;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
index da2a7c39827..0cacb9adcf1 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
@@ -9,10 +9,10 @@ namespace Magento\GroupedProduct\Test\Block\Catalog\Product\View\Type;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Grouped
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
index 3a6e060af80..3826d9a341e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
@@ -7,7 +7,7 @@
 namespace Magento\GroupedProduct\Test\Block\Checkout;
 
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
index 12a4b0299f8..5627b7785a3 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Constraint\AssertPriceOnProductPageInterface;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that displayed grouped price on product page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
index 718c845554c..d471c60f1ee 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertGroupedPriceOnGroupedProductPage
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
index 974ba950e37..fe78ef841ca 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductForm;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertGroupedProductForm
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
index 44be1c0072b..4128f39dede 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
 use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertGroupedProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
index 122ee4e04d1..c91d1af7add 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertGroupedProductInItemsOrderedGrid
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
index b359d695dd0..0ec0c06eff5 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
@@ -8,8 +8,8 @@ namespace Magento\GroupedProduct\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertGroupedProductsDefaultQty
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
index fbfa0a532bb..0fd5cdd5b92 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertSpecialPriceOnGroupedProductPage
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
index 26fd4f5fac0..c640d5b6aa2 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
 use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
 
 /**
  * Class AssertTierPriceOnGroupedProductPage
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
index 5b6988cfa0e..3e91ccb2578 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
 namespace Magento\GroupedProduct\Test\Fixture\Cart;
 
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
index e53b8efd410..1a9779e6044 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
@@ -7,8 +7,8 @@
 namespace Magento\GroupedProduct\Test\Fixture;
 
 use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
 
 /**
  * Class GroupedProduct
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
index 8cdbacd0153..3f1d1d5f4dc 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
@@ -6,12 +6,12 @@
 
 namespace Magento\GroupedProduct\Test\Fixture;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Class GroupedProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
index 416c89c7287..4065bfa0221 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
@@ -6,9 +6,9 @@
 
 namespace Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Associated
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
index 017b60e5a8d..b6811384f49 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
@@ -7,7 +7,7 @@
 namespace Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple\Price as ParentPrice;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Price
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
index fe470516ed1..1880721ab7e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
@@ -7,7 +7,7 @@
 namespace Magento\GroupedProduct\Test\Handler\GroupedProductInjectable;
 
 use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as AbstractCurl;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
index a3fdc3388de..59a19e47ffd 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GroupedProduct\Test\Handler\GroupedProductInjectable;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface GroupedProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
index 4d70d99c53e..54f00cd5e1f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GroupedProduct\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class GroupedProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
index 7644612df2d..72203425740 100755
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateGroupedProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
index 4acbf23ba51..0c59909268d 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
@@ -7,8 +7,8 @@
 namespace Magento\GroupedProduct\Test\TestCase;
 
 use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 /**
  * Class CreateGroupedTest
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
index 5628179fcbc..a437d49447b 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\TestCase;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update GroupedProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
index 3a6c6f623ff..7073a781039 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ImportExport\Test\Block\Adminhtml\Export\Edit;
 
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
index 2ad78d38fe5..db5002a3950 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -9,7 +9,7 @@ namespace Magento\ImportExport\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\ImportExport\Test\Fixture\ImportExport;
 use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAbsenceProductAttributeForExport
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
index c825aff87c6..e45bd649867 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ImportExport\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class ImportExport
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
index d26fac6fda9..549d7d2b9b3 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Create Admin Account block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
index 79f8707e5e7..c6f992c5dfb 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Customize Your Store block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
index 9a936c1a192..e1efe0955d5 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Database form.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index 4cacd3fa33b..40ae967bfd5 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Install block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
index 03bee11834a..8f3ddadef7e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Landing block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
index 1d0d7f93c4e..08f7f40dbff 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * License block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
index d6c1a2f9abb..0e9a566b0d2 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Readiness block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
index 865917e1212..654dd1ffc8f 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Web configuration block.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
index 31fdded30b0..1b19c8a0ade 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -7,7 +7,7 @@
 namespace Magento\Install\Test\Constraint;
 
 use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check that agreement text present on Terms & Agreement page during install.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
index a7cea54acdc..01f6a6e8341 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -7,7 +7,7 @@
 namespace Magento\Install\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that selected currency symbol displays in admin.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
index a18bfb1e9a9..45805d80ab3 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Install\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Install\Test\Page\Install;
 use Magento\Install\Test\Fixture\Install as InstallConfig;
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
index 99225403378..06a8eacf21b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
@@ -7,7 +7,7 @@
 namespace Magento\Install\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that selected language currently displays on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index f4ee1907018..3248e930e92 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -7,8 +7,8 @@
 namespace Magento\Install\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
 use Magento\Catalog\Test\Fixture\Category;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index 6fda9aa601d..d42cc5a9fb5 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Install\Test\Constraint;
 
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index 3a10bdc4cc1..9c8df14af25 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -8,7 +8,7 @@ namespace Magento\Install\Test\Constraint;
 
 use Magento\User\Test\Fixture\User;
 use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Install\Test\Fixture\Install as InstallConfig;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 32d69a4f443..ef42ae9ac9f 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -7,7 +7,7 @@
 namespace Magento\Install\Test\Constraint;
 
 use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Check that PHP Version, PHP Extensions and File Permission are ok.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index fe297aeb0d9..6a436e82d54 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Install\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Install
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 943943cf5e9..9231f84c679 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -10,9 +10,9 @@ use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Install\Test\Page\Install;
 use Magento\Install\Test\Fixture\Install as InstallConfig;
 use Magento\User\Test\Fixture\User;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
-use Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\System\Config;
 use Magento\Install\Test\Constraint\AssertAgreementTextPresent;
 use Magento\Install\Test\Constraint\AssertSuccessfulReadinessCheck;
 
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
index 5c141cf0e1d..734d91c4264 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Block\Adminhtml\Integration;
 use Magento\Backend\Test\Block\Widget\Grid;
 use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\ResourcesPopup;
 use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\TokensPopup;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class IntegrationGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
index e5a7bf047bc..c3ef042b1c1 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class DeleteDialog
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
index d4b21f3362a..6720168dc4f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class ResourcesPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
index 43651e1d78b..2c7c33b1db8 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class TokensPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
index af2f9851261..d32789af9ba 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Constraint;
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertIntegrationForm
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
index b770b325e65..81c5c22bab0 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
index 78468647fd0..3b2705ee799 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
index 7613e5c9728..f301fc6c00f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationResourcesPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
index 7bc79c61f2e..fa8edc4ae44 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationSuccessActivationMessage
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
index 044e26d231e..6ee3320e396 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
index fc5543afdc2..7abfeb28dac 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationSuccessReauthorizeMessage
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
index bfbf57ef093..c143ae8f0f2 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
index d3643f0a469..f0d6b850672 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Constraint;
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationTokensAfterReauthorize
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
index 2bc2fe80c51..79af964f4ec 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
@@ -7,7 +7,7 @@
 namespace Magento\Integration\Test\Constraint;
 
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertIntegrationTokensPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
index f914c3d507d..71a9b860f2f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Integration\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Integration
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
index a96f9123ac2..0550185ae18 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Integration\Test\Handler\Integration;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
index f5abf4c7f2c..4bfdf4efe2d 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Integration\Test\Handler\Integration;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface IntegrationInterface
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
index af4e955fca7..78c01f185fc 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Integration\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Integration Repository
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
index 43db84b40c5..caf67686a36 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\TestCase;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Activate Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
index 31c234c3c04..2056ea6a9c7 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\TestCase;
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
index efdef5324b6..d1cbf03eaec 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\TestCase;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
index 36c1743dccd..8519bb70812 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Integration\Test\TestCase;
 
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Reauthorize tokens for the Integration Entity.
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
index 6fd90e31c2c..987c3c68b52 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\TestCase;
 use Magento\Integration\Test\Fixture\Integration;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
 use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
index 3207f23c71f..972317cb5c7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
index 495d107de26..3de754dffa9 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Newsletter template preview.
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
index a6fcb89baaf..7e41b346d1d 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Newsletter\Test\Page\Adminhtml\SubscriberIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCustomerIsSubscribedToNewsletter
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
index eee0651315b..fe8a56af636 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\Constraint;
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertNewsletterForm
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
index 182f10bc13c..b5d1a1c72b4 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNewsletterInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index 5258ef9ba3c..aa0946c684d 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -8,8 +8,8 @@ namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplatePreview;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNewsletterPreview
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
index e1903f8ccc5..b9dbcdceb67 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueue;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertNewsletterQueue
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
index 21c32980f81..0a71b2cc8ae 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Newsletter\Test\Constraint;
 
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNewsletterSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
index 44f92cc2b6f..da668a8e4a7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Newsletter\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Template
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
index 759a6177fb2..0cb1f61c745 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Newsletter\Test\Handler\Template;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
index cc4848f0dbe..9b262839826 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Newsletter\Test\Handler\Template;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface TemplateInterface
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
index 00f90b9ced3..83669e31b84 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Newsletter\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
index 7f761fb67ab..1bffdfc6e1a 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\TestCase;
 
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Action for Newsletter Template (Preview and Queue)
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
index b2c733f77bc..81a7e1a9949 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\TestCase;
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateNewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create Newsletter Template
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
index c6396641141..9442ee96d8e 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\TestCase;
 use Magento\Newsletter\Test\Fixture\Template;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit;
 use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateNewsletterTemplate
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
index 10965d8e330..90eebe23e89 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml;
 
-use Mtf\Block\Form;
-use Mtf\ObjectManager;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Abstract Class Filter
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
index 05310a8a653..0780cf35898 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml\Customer;
 
-use Mtf\Client\Locator;
-use Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class AccountsGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
index b28a8183017..3bf9e419499 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml\Customer\Totals;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
index bb69c6ffb4c..b36221e8fe0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Refresh\Statistics;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
index 87fa4046f70..3eaae41b7e2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Block\Adminhtml\Review\Customer;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
index 85349a92d39..7c253b7b2f2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Review\Products;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
index 731907233dc..e8f44efdbaa 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ProductGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
index fd972d74391..e3a36a9553e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class FilterGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
index 9ffd58b15b6..2186b442e74 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Block\Adminhtml\Shopcart\Product;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
index deecca39c43..82e4fe1f4b0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AbstractAssertCustomerOrderReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
index 16c1fbcf29d..df6e3fb9662 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
@@ -8,8 +8,8 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class AbstractAssertInvoiceReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
index 55fa321d281..16af632c450 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Page\BackendPage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Page\BackendPage;
 
 /**
  * Class AbstractAssertSalesReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
index 7c38e4dfaa3..346f78a1c74 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Reports\Test\Page\Adminhtml\AbandonedCarts;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAbandonedCartCustomerInfoResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
index 726d18a3aad..350a81904f4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Reports\Test\Page\Adminhtml\Bestsellers;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert bestseller info in report: date, product name and qty.
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
index 685624924c9..da229325e70 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\SalesCouponReportView;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCouponReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
index 97f486de8c0..c77ecc0cfb6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\DownloadsReport;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertDownloadsReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
index 8b1b7e8a777..bbdee1a27da 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Reports\Test\Page\Adminhtml\ProductLowStock;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertLowStockProductInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
index 8baf8d23c27..c3c05154509 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\CustomerAccounts;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNewAccountsReportTotalResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
index 1cb398a2d6d..dc72afc3bd7 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Reports\Test\Page\Adminhtml\OrderedProductsReport;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderedProductResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
index 37a3af3ddaf..5bf977eb479 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Reports\Test\Page\Adminhtml\ShopCartProductReport;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductInCartResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
index 53f509fd465..d537838adef 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
@@ -12,7 +12,7 @@ use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
 use Magento\Review\Test\Constraint\AssertProductReviewInGrid;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReportByCustomerInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
index 0a3d13e4d0a..76116fee9c8 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
@@ -12,7 +12,7 @@ use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
 use Magento\Review\Test\Constraint\AssertProductReviewNotInGrid;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReportByCustomerNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
index 20e1610df69..f3ce68ad8d1 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
@@ -10,7 +10,7 @@ use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
 use Magento\Review\Test\Constraint\AssertProductReviewInGrid;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewIsVisibleInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
index 61b45d29f0d..0d4604ec440 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewReportIsVisibleInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
index d0d9400cf79..1ae6670b974 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewsQtyByCustomer
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
index 0afd5c6c600..152cd5aa4ee 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductViewsReportTotalResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
index 004c3ad4f58..d1e75cff6ac 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
 
 use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
 use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertSearchTermReportForm
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
index ac622368eda..cbb20b5cb97 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSearchTermsInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
index 2443521f269..bf5d8478e6a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
 use Magento\Reports\Test\Page\Adminhtml\SalesTaxReport;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxReportInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
index 2e429dc13cd..b7090947f14 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
 use Magento\Reports\Test\Page\Adminhtml\SalesTaxReport;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxReportNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index 5a66fc06baf..bc27cf23ec8 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\TestCase;
 
-use Mtf\TestCase\Injectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
index 2bb0dafc671..28a4f7204b4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
@@ -15,9 +15,9 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CustomerReviewReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
index 557482ee225..a81da13dd13 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\TestCase;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for LowStockProductsReportEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
index 5a75c804d4b..62a4231bca0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\TestCase;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Reports\Test\Page\Adminhtml\CustomerAccounts;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
index a26acb68c4e..92b8ee33316 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Reports\Test\TestCase;
 
 use Magento\Review\Test\Fixture\Review;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ProductReviewReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
index 30fc809072d..59fcbb7b335 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
@@ -12,8 +12,8 @@ use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ProductsInCartReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
index b670f8024b2..eba901312b7 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Reports\Test\TestCase;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
index ca0670a0a06..7ed40fc54cd 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\TestCase;
 
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
index 91b7aa7b0a3..4d51eea65d2 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Review\Test\Block\Adminhtml\Edit;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class RatingElement
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
index 5773e897d7d..76f821b010e 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Block\Adminhtml;
 
 use Magento\Backend\Test\Block\Widget\Form;
 use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
index 3e4188baa6c..449bc91419b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Review\Test\Block;
 
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
 
 /**
  * Review form on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
index 802a9be4592..ca08c912dec 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Review\Test\Block\Product;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
index 3874ae7a843..c193a6af97a 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Review\Test\Block\Product\View;
 
-use Mtf\Block\Block;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Reviews frontend block.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
index 9f0d60cf1a0..ffc1ab0c766 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
index 054bf4de673..2f1ab78b298 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingInProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
index db3fdb0c528..9ec15f8d144 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
index dff6d03fc53..11a01165df1 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
@@ -9,8 +9,8 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Rating;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingNotInProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
index 0c256884589..a5db756a503 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
@@ -9,7 +9,7 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertProductRatingOnReviewPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
index 95da16862d9..4c9e6e5aab2 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
index 6168f31cbe8..36987feabff 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductRatingSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
index 8d1752909c0..a7f527e20dd 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewBackendSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
index 2b8ce7fe0fe..eb6cb92c40c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Constraint;
 
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
index 90485e15850..355bcd41fae 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductReviewInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
index 07071d97637..1208bd72e4d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
 use Magento\Review\Test\Block\Adminhtml\Product\Grid as ReviewsGrid;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewInGridOnCustomerPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
index 14eddfbb268..b4852e19d6e 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
index a20ebe47231..cf57f87ba42 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewMassActionSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
index 67d9c66a3ed..3f8d9c4c43c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewMassActionSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
index 70f0a5fa4a2..6776c3a651d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductReviewNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
index f856cb08aa1..4146c9519cc 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
@@ -9,8 +9,8 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertProductReviewNotOnProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
index 463a239dcea..2e15e514566 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
@@ -9,9 +9,9 @@ namespace Magento\Review\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\AdminCache;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert that product review available on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
index d421c2af7af..7ecf84f3dc1 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertReviewCreationSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
index 6feba8a2740..e2aa568ff99 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Review\Test\Constraint;
 
-use Mtf\Client\Browser;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Browser;
+use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that add and view review links are present on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
index 947790e85ec..3c41e413e45 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Test\Constraint;
 
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertReviewSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
index e30f7358209..1e627941bd7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
 use Magento\Backend\Test\Page\Adminhtml\AdminCache;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
index efa7bb2458a..6991179a370 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
index 84226b39f9d..9c7c3175936 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Product review fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
index 9cc4e25754d..6dd94f98ea9 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Review\Test\Fixture\Review;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class EntityId
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
index 473bcb90ad3..c19487164c8 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Review\Test\Fixture\Review;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Review\Test\Fixture\Rating;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
index d5f15eee9ff..8d81761803b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\Review\Test\Handler\Rating;
 
 use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
index 68b0397aaeb..b39248c7a5c 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Handler\Rating;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface RatingInterface
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
index 39825844350..c99cac15199 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
@@ -6,15 +6,15 @@
 
 namespace Magento\Review\Test\Handler\Review;
 
-use Mtf\System\Config;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Backend\Test\Handler\Extractor;
 use Magento\Review\Test\Fixture\Review;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
-use Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
index 7b5d19a5990..e8fadacfe34 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Handler\Review;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface ReviewInterface
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
index e3422aa73d4..218bf96d0fb 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
index bd4fc2a8bbd..537245718b6 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Review\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Review
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
index d3e7a3cefca..aff4c995ddb 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\RatingNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create Backend Product Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
index 81c648ac66c..d2042d8a837 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
@@ -12,7 +12,7 @@ use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create ProductReviewEntity Backend
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
index 2a9e3b10c32..4345551308d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Review\Test\Constraint\AssertProductReviewIsAbsentOnProductPage;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
index 9a7495de291..129b383ffe2 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\TestCase;
 use Magento\Review\Test\Fixture\Rating;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteProductRatingEntity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index 3b6c394227a..52f5bbe692b 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -17,8 +17,8 @@ use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ManageProductReviewFromCustomerPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
index b0e43e961e4..9152f68dcf0 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test creation for MassActions ProductReviewEntity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
index 58a3a59ff25..a37ab005cfe 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Review\Test\TestCase;
 use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Moderate ProductReview Entity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
index f92480f74c7..08f69793f6f 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
@@ -13,8 +13,8 @@ use Magento\Review\Test\Fixture\Review;
 use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateProductReviewEntity on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
index a204a9db016..9d422a2a49a 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Review\Test\Page\Adminhtml\RatingEdit;
 use Magento\Review\Test\Page\Adminhtml\RatingIndex;
 use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
 use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update Frontend Product Review
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index 7038e02eb5d..5e703ad9afd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
index 9c0993bfbe1..0c1435a6609 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Product
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
index 93fbf1cda2d..88af288c29c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class AbstractItems
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
index dfa7aecce9a..907992a7e2c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Product;
-use Mtf\Block\Block;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AbstractItemsNewBlock
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 3465ec7e6ca..4d5bf937f8f 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
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Actions
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 dceab16c969..cfeedc7b326 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
@@ -6,10 +6,10 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Create
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
index 85c6027cc62..2b5688f592c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class BillingAddress
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 da0f65be72e..6397d53754a 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
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
index f077e90672c..ba5f99b4e70 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
@@ -8,7 +8,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Customer
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
index 1d6a9157f90..d475f5d0e97 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
@@ -12,8 +12,8 @@ use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\R
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedItems;
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedProducts;
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\ShoppingCartItems;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class CustomerActivities
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
index 59020e2f277..f9c089f1a25 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Sidebar block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
index 2acc032e58c..81c03a86225 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class RecentlyViewedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index 1fbc751f9d3..7d2aec9dd17 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Backend\Test\Block\Template;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 9b5037f67a7..03ec6f8187c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
index 1c96edbe76e..73e951594ff 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class ShippingAddress
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index cf99504145f..4f9877eeca5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
index 26676720186..f48f0cbd9e3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
@@ -8,9 +8,9 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Store\Test\Fixture\Store as StoreFixture;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
 
 /**
  * Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
index fe25005b4c4..39adad4c9f1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index a740f6dcc21..38bbc88695c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
 use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Grid
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 9ded1b6918e..17d1dd67238 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
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
index 073a019ea8c..ed9f86ca74f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\AbstractItemsNewBlock;
 use Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items\Product;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
index 218fa8ee641..8b43fc9c27b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
@@ -60,7 +60,7 @@ class Grid extends GridInterface
     }
 
     /**
-     * @return mixed|\Mtf\Client\Element
+     * @return mixed|\Magento\Mtf\Client\Element
      */
     private function getInvoiceAmountElement()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 59ba8ff2333..09306ef33f7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
index 802c0fd06e6..b2ae1df8954 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Shipment;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
index abd4fe06e23..aa776f8bb30 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Status\Assign;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class AssignForm
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 7e1a293ba76..32f230e485f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
index dde14fefa34..cf49d099f2a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Block for information about customer on order page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index 4eec62d00bf..58c36127d4c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
 
 use Magento\Catalog\Test\Fixture\Product;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
index 1c43e826c8f..aac809e587d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
index 1808ad03c64..b93056743ec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Test\Block\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class History
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
index 84e7b1ada31..9b7fc959836 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
index 362696afc04..d044f994ac5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Items block on order's view page
@@ -31,7 +31,7 @@ class Items extends Block
     /**
      * Check if item is visible in print order page.
      *
-     * @param \Mtf\Fixture\InjectableFixture $product
+     * @param \Magento\Mtf\Fixture\InjectableFixture $product
      * @return bool
      */
     public function isItemVisible($product)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index 41b73a9a29e..7f022785d59 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class View
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
index 8211997f28a..4c5756fecff 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Block\Order\View;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Order view block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
index e40173a7ed1..041e7d7d586 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AbstractAssertArchiveItems
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
index cd09e9e27e1..3ebe97e8f48 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
@@ -9,8 +9,8 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Abstract Class AbstractAssertOrderOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
index 73cd390792a..16edae04654 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertCreditMemoButton
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
index 6232e4c3698..8c5e6da9076 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\InvoiceIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertInvoiceInInvoicesGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
index 9aa105083f3..bee91127373 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices\Grid;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertInvoiceInInvoicesTab
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
index ab9529606e3..9faaaece512 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertInvoiceSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
index dee20ee6e3f..15582ebab75 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertInvoiceWithShipmentSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
index 1830982dc35..27168972b06 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNoCreditMemoButton
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
index faf9c3848f7..448ec5ef796 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNoInvoiceButton
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
index f4fea87c5ea..4e28fce3ab6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\SalesOrder;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderButtonsAvailable
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
index 2642586da0b..1a2171ee10c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderButtonsUnavailable
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index c466e7bb75c..890c0724d7d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderCancelMassActionFailMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
index 3471a9bc349..2714f10fbb2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderCancelMassActionSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
index b8859fad542..5c164d1aee7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderCancelSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
index 002ae82bde4..317e93fbb00 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderGrandTotal
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
index a02eacd05f2..691173f3cc2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderInOrdersGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
index be39a398072..8b4dd2454da 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\OrderHistory;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class AssertOrderInOrdersGridOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
index 57cf7ce184f..1f1508c0c42 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderMassOnHoldSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
index 7960d579a4f..c89d729ef6e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderNotInOrdersGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
index 3ea3556f69d..595a9428eda 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\OrderHistory;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class AssertOrderNotVisibleOnMyAccount
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
index 828155468a5..2c7a6342539 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderOnHoldFailMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
index 0ac614fd935..38d9ff38c11 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderOnHoldSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
index 425e708fea9..a672710661d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderReleaseFailMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
index 6844fa76977..2fd559d9a3c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderReleaseSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
index 401787f3347..4e6788febec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusDuplicateStatus
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
index c9cab376d3b..de3cd7e0311 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderStatus;
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 9c9179d9949..dc5d15ca4eb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusIsCorrect
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
index 494b6f7fa8a..5fa8631ae83 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderStatus;
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusNotAssigned
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
index a68f4baa558..e75979c4823 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusSuccessAssignMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
index 760d8e0bae3..486b801dbed 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
index 1f6465ab0ae..bc30beb1c1e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderStatusSuccessUnassignMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
index d5a501662a8..11582827fd8 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrderSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
index 36067368dd8..5f6e0e6dc22 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertOrdersInOrdersGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
index 078aaaac153..ac10f702107 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Assert product was added to Items Ordered grid in customer account on Order creation page backend.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
index a821193e2b1..21e33cea1ef 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\CreditMemos\Grid;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRefundInCreditMemoTab
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
index ffdaf05743f..9583a712ade 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\CreditMemoIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRefundInRefundsGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
index fd74aa59a15..d619f949f4e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRefundSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
index 0d3aad30ad1..46e188fe74d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertReorderStatusIsCorrect
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
index 01e8c1ca908..8c6c78230ea 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that BillingAddress printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
index 362a43cd644..586d9925e8a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that Grand Total price was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
index f50ada3b171..dab302d4283 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that payment method was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
index bc359b7f343..05940cb7bc5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Test\Constraint;
 
 use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Assert that products printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
index fa07944b9ed..dc9aab4a6a6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUnholdButton
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
index 16b7520120f..352f7527840 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Test\Page;
 
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
 
 /**
  * Class SalesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
index 7106416ff98..ed71060eb94 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class AddProductsStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
index 3955d13be00..d995a2c7829 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Add Recently Viewed Products to cart.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
index 887a578b216..af0c71dbfcd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Configure products options on backend order.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
index c0c320d6257..72b6789e700 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class CreateNewOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
index 21519711065..a5931b05e83 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
 
 use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Fill Sales Data.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
index 6deab5e8fe9..1be4db95171 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class OpenSalesOrdersStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
index f191f322df9..a810a3ca608 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\SalesGuestView;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Click on "Print Order" button.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
index b3f7eaa7a0d..8485a0831ba 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class ReorderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
index a88e41d3bfb..8c1d84dd8ea 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
 
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectCustomerOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
index 9c523d6db89..73b774cb7c3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectPaymentMethodForOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
index 96dffd305c8..8b9a8d370cf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectShippingMethodForOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
index d3945c15ad7..d8e82f4e2bc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class SelectStoreStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
index 0623946e4c2..f9195c37875 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Submit Order step.
@@ -46,7 +46,7 @@ class SubmitOrderStep implements TestStepInterface
      * @param FixtureFactory $fixtureFactory
      * @param CustomerInjectable $customer
      * @param AddressInjectable $billingAddress
-     * @param \Mtf\Fixture\FixtureInterface[] $products
+     * @param \Magento\Mtf\Fixture\FixtureInterface[] $products
      */
     public function __construct(
         OrderCreateIndex $orderCreateIndex,
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
index 8302240bdd7..525b5b430ed 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
@@ -7,7 +7,7 @@
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class UpdateProductsDataStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
index a6d5580a481..fb2d6e3eb72 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
     <scenario name="ReorderOrderEntityTest" module="Magento_Sales">
         <methods>
             <method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
index 0a66291ccb3..9b4b3aa98ac 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
@@ -7,8 +7,8 @@
 namespace Magento\Shipping\Test\Block\Adminhtml\Order;
 
 use Magento\Shipping\Test\Block\Adminhtml\Order\Tracking\Item;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Tracking
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
index dd3d4c01703..df2c3cc1a8e 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Shipping\Test\Block\Adminhtml\Order\Tracking;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
index 35fa2ad6ba3..b5ca395ff72 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Shipping\Test\Block\Order;
 
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
index ab83982457a..49622968407 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
@@ -7,8 +7,8 @@
 namespace Magento\Shipping\Test\Block\Order;
 
 use Magento\Shipping\Test\Block\Order\Shipment\Items;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Shipment
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
index 69b2eb4e618..463f84b7f87 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Shipping\Test\Block\Order\Shipment;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
index 8a0b406fee8..ae61d24ecd1 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
@@ -9,7 +9,7 @@ namespace Magento\Shipping\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertNoShipButton
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
index ee51687746f..144fab6e4b9 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Shipping\Test\Constraint;
 
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertShipmentInShipmentsGrid
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
index abb101e24fa..76997e744f7 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
@@ -9,7 +9,7 @@ namespace Magento\Shipping\Test\Constraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertShipmentInShipmentsTab
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
index 68a79182af9..84d5d5ff797 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Constraint\AbstractAssertItems;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Shipping\Test\Page\Adminhtml\SalesShipmentView;
 use Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex;
-use Mtf\ObjectManager;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Class AssertShipmentItems
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
index adffababcc3..ce32f38f424 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Shipping\Test\Constraint;
 
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertShipmentSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
index ca2bce698bb..2caba99cd14 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
@@ -7,7 +7,7 @@
 namespace Magento\Shipping\Test\Constraint;
 
 use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Assert that shipping method was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
index 00d76e69013..9c4d0378312 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Shipping\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
index 7bb948e124e..6f13fc81e55 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Shipping\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Method Repository
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
index 5201105d7b0..2781dec51ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
@@ -7,7 +7,7 @@
 namespace Magento\Sitemap\Test\Block\Adminhtml;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class SitemapGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
index a193569f961..d476d23c66c 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Cms\Test\Fixture\CmsPage;
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapContent
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
index 96efcf67f95..3dbdc67069c 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapFailFolderSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
index 75aadae7fed..62beed7801a 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapFailPathSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
index c39dfeb0baa..4e0ed7081b8 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
index 8aa3253d769..3b9c67aba37 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
index d3665d2124b..ea5001caa1f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
index c9939c74e8d..77e58ce48e1 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapSuccessGenerateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
index cd540c0045e..4cd76f6839c 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapSuccessSaveAndGenerateMessages
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
index 0d78b7b7b58..d2c8eec1793 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Sitemap\Test\Constraint;
 
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSitemapSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
index 2984eaf8436..d2d40bd3713 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sitemap\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Sitemap
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
index 839745e0da0..103986e35d0 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
@@ -8,12 +8,12 @@ namespace Magento\Sitemap\Test\Handler\Sitemap;
 
 use Magento\Backend\Test\Handler\Extractor;
 use Magento\Sitemap\Test\Handler\Sitemap;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
index 87c9938c46f..97246710c6e 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sitemap\Test\Handler\Sitemap;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface SitemapInterface
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
index 80077b4fead..a2f28611e98 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sitemap\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Sitemap
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
index 0f0ffb725bf..9a6cec214f0 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Sitemap\Test\TestCase;
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Cover creating SitemapEntity
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
index b2532e34c27..56371fb69ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Sitemap\Test\TestCase;
 use Magento\Sitemap\Test\Fixture\Sitemap;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapEdit;
 use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Cover deleting Sitemap Entity
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
index b720f842307..5883250551f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
@@ -8,8 +8,8 @@
 namespace Magento\Store\Test\Block;
 
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Switcher
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
index b23de9b65c6..feb77c84296 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\SystemConfig;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreBackend
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
index 07ab89295c4..be32892ca3d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreNew;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertStoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
index 1c3fba6f7b4..3691c6d21e1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
index 969adc59fa1..59c77b4e2be 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\EditGroup;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertStoreGroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
index d402b84f8a7..51e0cd19cf5 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
index 1e7a5cbc7d0..c17267d296e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
index d82b5c9636e..e36072fade0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreNew;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupOnStoreViewForm
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
index 2dd98986320..b68b514a232 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupSuccessDeleteAndBackupMessages
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
index 899edb2064a..b69285e49ba 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
index 73cf65fd967..1f78d946c06 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreGroupSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
index f1532c19a5d..b5078cc68bb 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
index 8868f0e5a2f..a83a6a1954c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
index df68a3e6765..ab89a1a07bf 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreNotOnFrontend
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
index 4301b9f84ad..c91f10875d0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreSuccessDeleteAndBackupMessages
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
index 69f628c67ba..4f5f9edf213 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
index 5ab2242d983..9d12f218708 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertStoreSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
index c3f541646f3..757658db8bf 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
  * Class AssertWebsiteForm
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
index 157d0630bc0..0656425f75e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
index 721b12c5b91..9c5dd627e30 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
index 8db25588f26..c7d76580c26 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
 use Magento\Backend\Test\Page\Adminhtml\NewGroupIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteOnStoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
index 5e925097b06..eee0dd61344 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteSuccessDeleteAndBackupMessages
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
index 8f8dd74ea79..c0e0f791c68 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
index eb1f08c3640..11bc68e2fc2 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Store\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWebsiteSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
index 081711218f0..5762f119fe3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
index da70439f612..9ec18c42b26 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
@@ -7,8 +7,8 @@
 namespace Magento\Store\Test\Fixture\Store;
 
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class GroupId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
index b19288b37e0..04dd14411c3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class StoreGroup
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
index 7b3c07070f1..ca4f11663f3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
@@ -7,8 +7,8 @@
 namespace Magento\Store\Test\Fixture\StoreGroup;
 
 use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class CategoryId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
index 47d8dabac75..36e20106ce0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
@@ -7,8 +7,8 @@
 namespace Magento\Store\Test\Fixture\StoreGroup;
 
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class WebsiteId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
index 0dc41b477a6..c680e52135c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class Website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
index 421b937acd4..7e21102b92f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Store\Test\Handler\Store;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
index 034b22d0ba9..87670c64cc8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Handler\Store;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface StoreInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
index 3aa9a6ce920..2b0c1abbdde 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Store\Test\Handler\StoreGroup;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
index 6b57419e518..9af46f18ae9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Handler\StoreGroup;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface StoreGroupInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
index 671d46f4a8d..9eb58a1be26 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Store\Test\Handler\Website;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
index c3f167b26d4..2f808d76077 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Handler\Website;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface WebsiteInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
index b839bb08082..472aa3028cb 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
index a51aaba9daf..fa01d8b222c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class StoreGroup
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
index 97cef07a17e..7e0fce6fd06 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
index 599af73acab..3e796d62655 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreNew;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateStoreEntity (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
index 1e6bd58ef9e..6edc800dfea 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\NewGroupIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Create New StoreGroup (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
index 3a38433e089..59b40358b13 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\NewWebsiteIndex;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Create Website (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
index 27a058334a5..debf3cb6b6e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\StoreDelete;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteStoreEntity
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
index b6eab430a1f..94f044c26e0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\EditGroup;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Delete StoreGroup (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 0fc93a94ef4..b540e04277f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Delete Website (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
index 5f316bdd793..ab189ce3530 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Store\Test\TestCase;
 
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
 
 class StoreTest extends Functional
 {
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
index 9ac015f936d..9ead46a3f63 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\EditStore;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateStoreEntity (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
index 555e6a7a054..5ec7ac7473b 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\EditGroup;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Update StoreGroup (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
index 7feb6fa8811..d1760123b0a 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Store\Test\TestCase;
 use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Website;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Update Website (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
index 8dfbf12c72c..e488aa8dc20 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Block\Adminhtml\Rate\Edit;
 
-use Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Block\Form as ParentForm;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
index d18b7e47876..41e9135fcad 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
 
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as FormInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as FormInterface;
 
 /**
  * Form for tax rule creation.
@@ -276,7 +276,7 @@ class Form extends FormInterface
                 return $element->isVisible() ? true : null;
             }
         );
-        /** @var \Mtf\Client\Element\MultiselectlistElement $taxRates */
+        /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRates */
         $taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
 
         return $taxRates->getAllValues();
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
index ea3b07e2e79..30ee5301714 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
 
-use Mtf\Block\Form as FormInterface;
+use Magento\Mtf\Block\Form as FormInterface;
 
 /**
  * Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
index 03aeedefc59..86a0ded5cc9 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AbstractAssertTaxWithCrossBorderApplying
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
index b2cc6ea218b..9be4aa155fa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\Constraint;
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateForm
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
index ab8fb7c249a..b29f483f1ed 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
index 68698ac0e0e..c7e8b1e65fb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateInTaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
index 1dee8e83326..e8b8e96f9c1 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateIsInCorrectRange
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
index 6e2b75e92db..27269fc071a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
index cec93f5e32d..40a294d79d3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateNotInTaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
index e986b9afc8a..5a2eeb5608e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
index c463dd61c07..daa156986bb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRateSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
index 9102196b166..d8000e08d4a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
@@ -14,9 +14,9 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertTaxRuleApplying
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
index 06364e1cad8..2ec54cbe497 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\Constraint;
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRuleForm
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
index 257db7b916a..fea85573792 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRuleInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
index 55704a8de1e..bfefccb25c4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
@@ -12,8 +12,8 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Class AssertTaxRuleIsAppliedToAllPrice
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
index b7cb74fc33b..0d5d85d1bcc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRuleNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
index 590f9a435e0..6649a25316e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertTaxRuleSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
index 9dec5c65b37..1507e373dc2 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Tax\Test\Constraint;
 
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertSuccessSavedMessageTaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
index 8f161b790ab..1c81488b1fc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
index e61fc1352cf..daea91ae303 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
index e14f3fb7b54..9655754d1fa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class TaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
index a6c807c364a..997d0600cc7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Tax\Test\Fixture\TaxRule;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
index 0bda05d9e92..aacc3a65e7a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Tax\Test\Fixture\TaxRule;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
index f55a0fe687d..4493f800006 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Curl handler remove all tax rules
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
index e9cb9e4883d..636a0e8a686 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Handler\TaxClass;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
index 21f7342dd3a..499654912d7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Handler\TaxClass;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface TaxClassInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
index 2c820b1c6df..99287a49795 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Handler\TaxRate;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
index 3c39b84398b..470de7e57fa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Handler\TaxRate;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface TaxRateInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
index 97f9abc6dbc..e14120345eb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Handler\TaxRule;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
index b48837992af..417b74b1cf7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Handler\TaxRule;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface TaxRuleInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
index 6c09d879535..071b74555d1 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class TaxClass Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
index 4303c1aaa7d..e5a571dc1d5 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class TaxRate Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
index 7da39b35c7d..782ec7e2406 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class TaxRule Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
index 733572d4fe3..ae00c783d68 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
index 5749a777173..b4faef417a7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Tax\Test\TestCase;
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
index fb4cc703df2..4bbdfbe5204 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
index 1cb87a55275..aa0fac22b2b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete TaxRuleEntity
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
index bed89060ce1..c11e2e5ae85 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
 use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
index 053dd03da67..8cd7b7abe08 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
@@ -9,9 +9,9 @@ namespace Magento\Tax\Test\TestCase;
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
index 1fe46431402..69b0cb8e487 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\TestStep;
 
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class DeleteAllTaxRulesStep
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
index 89562f81596..f670da230ee 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Theme\Test\Block\Html;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 use Magento\Store\Test\Fixture\Store;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
index 0bf70a50cb0..2217609ad80 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Theme\Test\Block\Html;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Page title block
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
index 20b864164a5..0326a8150a6 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Theme\Test\Block\Html;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Topmenu
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
index e88d98aafda..0fd091a16ce 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Theme\Test\Block;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Page Top Links block.
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
index 7b7b7a376cc..b5e8f775ea0 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
@@ -7,8 +7,8 @@
 namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category;
 
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 use Magento\Catalog\Test\Fixture\Category;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
index 3c7a45c1471..dcae5848887 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
@@ -7,9 +7,9 @@
 namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Edit;
 
 use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class UrlRewriteForm
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
index b0102de16b5..f46e09fdf49 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
@@ -7,8 +7,8 @@
 
 namespace Magento\UrlRewrite\Test\Block\Adminhtml;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Selector
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
index 4c60ef26a37..389f511e379 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertPageByUrlRewriteIsNotFound
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
index 1bfbe4ee65e..c1ce42c3f3f 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteCategoryInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
index 0eb7cfed02d..18184d03e7c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteCategoryNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
index 5be6d6eec52..ea1f0370eef 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteCategoryRedirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
index 833fce22b43..2241c4fe128 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteCustomRedirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
index 9e98064bcb4..c00e367145d 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteCustomSearchRedirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
index b10cb73dff2..6b0d9e838dd 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteDeletedMessage
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
index 4b346f2be4f..8235b955751 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
index c8b3fbce318..7f2431c0462 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
index 1c149b95920..720dc2915b9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
@@ -8,9 +8,9 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertUrlRewriteProductRedirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
index ee74a710c22..6507dd11cdf 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
index e0b56003bab..60d1fdfc8fa 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
@@ -7,8 +7,8 @@
 namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteSuccessOutsideRedirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
index 2f7fec91332..a54513d48cf 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUrlRewriteUpdatedProductInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
index 8d8459e15ba..ace141782b5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
@@ -6,7 +6,7 @@
 
 namespace Magento\UrlRewrite\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
index 8d4cfb7965d..5d234bfab71 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
@@ -7,8 +7,8 @@
 namespace Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 
 use Magento\Store\Test\Fixture\Store;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class StoreId
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
index af5e022660c..44614ad5832 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
@@ -6,8 +6,8 @@
 
 namespace Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class TargetPath
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
index b556d3cf36a..d99f658b73c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
@@ -6,12 +6,12 @@
 
 namespace Magento\UrlRewrite\Test\Handler\UrlRewrite;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
index a566d766b43..0651b1c0430 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\UrlRewrite\Test\Handler\UrlRewrite;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface UrlRewriteInterface
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
index 4c830610af1..0e1b7a3421d 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
@@ -6,7 +6,7 @@
 
 namespace Magento\UrlRewrite\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
index 6041d62ee58..636a64f31e5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Create Category Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
index 093391036ec..f4e8d5d46f8 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Product URL Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
index 7462cf0db53..75365689598 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Delete Category URL Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
index 34b68473758..f5592e87abe 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteCustomUrlRewriteEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
index 2fbcc64c07e..c668f0512ea 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteProductUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
index f5825167cbb..25a5f58638c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateCategoryUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
index 909577d62f6..c5652832a32 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateCustomUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
index a6988a459b4..3b7562540e6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\UrlRewrite\Test\TestCase;
 use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
 use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for Update Product URL Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
index df293a41289..9578f490e7f 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
@@ -24,8 +24,8 @@
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
-            <product class="Mtf\Fixture\FixtureInterface"/>
-            <browser class="Mtf\Client\Browser"/>
+            <product class="Magento\Mtf\Fixture\FixtureInterface"/>
+            <browser class="Magento\Mtf\Client\Browser"/>
         </require>
     </assertUrlRewriteProductRedirect>
     <assertUrlRewriteDeletedMessage module="Magento_UrlRewrite">
@@ -46,7 +46,7 @@
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
             <productRedirect class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
-            <browser class="Mtf\Client\Browser"/>
+            <browser class="Magento\Mtf\Client\Browser"/>
         </require>
     </assertPageByUrlRewriteIsNotFound>
     <assertUrlRewriteCustomRedirect module="Magento_UrlRewrite">
@@ -56,14 +56,14 @@
         <severity>low</severity>
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
-            <browser class="Mtf\Client\Browser"/>
+            <browser class="Magento\Mtf\Client\Browser"/>
         </require>
     </assertUrlRewriteSuccessOutsideRedirect>
     <assertUrlRewriteCustomSearchRedirect module="Magento_UrlRewrite">
         <severity>low</severity>
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
-            <browser class="Mtf\Client\Browser"/>
+            <browser class="Magento\Mtf\Client\Browser"/>
             <categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView"/>
         </require>
     </assertUrlRewriteCustomSearchRedirect>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
index 004cbac8bac..dd79a2b7b3c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Block\Adminhtml\Role\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Role
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
index 8618a91179f..6f55faf944b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
@@ -8,8 +8,8 @@ namespace Magento\User\Test\Block\Adminhtml\User\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\User\Test\Block\Adminhtml\User\Edit\Tab\Roles;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Form
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
index 8ab5d10db8f..bcf2bebf558 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Block\Adminhtml\User\Edit\Tab;
 
 use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
 
 /**
  * Class Roles
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
index cd5bcb1cca3..4b05852ef8d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Block\Adminhtml\User\Tab;
 
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Backend\Test\Block\Widget\Tab;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
index 81b5df0b0dc..787b7e390d6 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertAccessTokensErrorRevokeMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
index a9797795c84..8f6d0505517 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertImpossibleDeleteYourOwnAccount
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
index fd69fc3cee7..d44d53f21ca 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRoleSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
index 7e8a3a35e0c..49e9f3fb36f 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Fixture\AdminUserRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRoleInGrid
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
index ec7b5ba0e72..cb67bc0a80e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Fixture\AdminUserRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRoleNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
index 2033e0c303a..38f74ad1ead 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRoleSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
index dc4d32653ab..0436e6c60cf 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertRoleSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
index 568cbd551d0..c0a9c0c7155 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserDuplicateMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
index 6f2bf4e896f..1369fa1591d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserInGrid
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
index aa8877c54bd..431b9f13c71 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserInvalidEmailMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
index 08832e25f67..909f581f767 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserNotInGrid
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
index ebd351e0454..04f22b59e61 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserRoleSalesRestrictedAccess
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
index 72ed5cb755a..c6f7e9e6949 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserSuccessDeleteMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
index 5b46a44f3fb..9ec6841c6f9 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserSuccessLogOut
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index aa4862434fd..4544f7b69da 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -9,7 +9,7 @@ namespace Magento\User\Test\Constraint;
 use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\User\Test\Fixture\User;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserSuccessLogin
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
index 9804e38b77b..d401448522e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
index 156672a6329..7c2be591562 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
 
 use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\User\Test\Fixture\User;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertUserWrongCredentialsMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
index bd67f84b2de..a0ee8cf951c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
@@ -6,10 +6,10 @@
 
 namespace Magento\User\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\ObjectManager;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Config;
 
 /**
  * Fixture with all necessary data for user creation on backend
@@ -47,8 +47,8 @@ class AdminUser extends DataFixture
      */
     protected function _initData()
     {
-        /** @var \Mtf\System\Config $systemConfig */
-        $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+        /** @var \Magento\Mtf\System\Config $systemConfig */
+        $systemConfig = ObjectManager::getInstance()->create('Magento\Mtf\System\Config');
         $superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password');
         $this->_data = [
             'fields' => [
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
index f88d9fa29c0..88180cf31cb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Fixture;
 
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AdminUserRole
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
index 80908c4f372..eb1f27ccdc8 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
@@ -7,8 +7,8 @@
 namespace Magento\User\Test\Fixture\AdminUserRole;
 
 use Magento\User\Test\Fixture\User;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class InRoleUsers
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
index d4cb9f01539..d9e1c4638ee 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\User\Test\Fixture;
 
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * ACL resources fixture
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
index ab50e9843b5..acb266f5d6c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
@@ -6,8 +6,8 @@
 
 namespace Magento\User\Test\Fixture;
 
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
 
 /**
  * Class Role
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
index 298cac0e659..78053ea189c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
@@ -6,12 +6,12 @@
 
 namespace Magento\User\Test\Fixture;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
 
 /**
  * Class User
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
index 641f36f34b5..6ee9c5eb5ed 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
@@ -7,8 +7,8 @@
 namespace Magento\User\Test\Fixture\User;
 
 use Magento\User\Test\Fixture\AdminUserRole;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class RoleId
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
index 7e2b3c353ef..a7d0408abdb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Handler\AdminUserRole;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface AdminUserRoleInterface
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
index cbad1e0fbbf..1162d727958 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\User\Test\Handler\AdminUserRole;
 
 use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
index a5d600af529..df5f11c9a29 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
@@ -7,12 +7,12 @@
 
 namespace Magento\User\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class CreateCategory.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
index cfbd54c09a3..e3598d51730 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
@@ -6,12 +6,12 @@
 
 namespace Magento\User\Test\Handler\Curl;
 
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Curl handler for persisting Magento user
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
index 703441ca08b..23e8ae32230 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
@@ -7,12 +7,12 @@
 namespace Magento\User\Test\Handler\User;
 
 use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
 /**
  * Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
index 887313ad2b9..b18cd5603c8 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Handler\User;
 
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
 
 /**
  * Interface UserInterface
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
index cdb7260a837..9046699e1a4 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Admin User Repository
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
index 334fda5055b..5a94b249e72 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
@@ -6,7 +6,7 @@
 
 namespace Magento\User\Test\Repository;
 
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class AdminUserRole
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
index 8c533100329..08eb926a06a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
@@ -6,8 +6,8 @@
 
 namespace Magento\User\Test\Repository;
 
-use Mtf\Factory\Factory;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class Abstract Repository
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
index 16ef63904a2..a8098084f2b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
@@ -6,8 +6,8 @@
 
 namespace Magento\User\Test\Repository;
 
-use Mtf\ObjectManager;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Repository\AbstractRepository;
 
 /**
  * Class User
@@ -24,8 +24,8 @@ class User extends AbstractRepository
      */
     public function __construct(array $defaultConfig = [], array $defaultData = [])
     {
-        /** @var \Mtf\System\Config $systemConfig */
-        $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+        /** @var \Magento\Mtf\System\Config $systemConfig */
+        $systemConfig = ObjectManager::getInstance()->create('Magento\Mtf\System\Config');
         $superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password');
         $this->_data['default'] = [
             'username' => 'admin',
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
index b5ea8fd027a..c77bc0c762a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\User\Test\TestCase;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateAdminUserEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
index 30918f5c1ca..57ae388e1a3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\User\Test\TestCase;
 use Magento\User\Test\Fixture\AdminUserRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for CreateAdminUserRolesEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
index 1d29e314eee..d6d4c9f9deb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteAdminUserEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
index 3e52e0369e7..161917c3b54 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
@@ -12,8 +12,8 @@ use Magento\User\Test\Fixture\AdminUserRole;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for DeleteUserRoleEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
index 7de13a4d502..bdac1186edc 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
@@ -9,7 +9,7 @@ namespace Magento\User\Test\TestCase;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Revoke all access tokens for admin without tokens.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
index 1bbe6addc15..cad7c857bfb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateAdminUserEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index 108bafa3026..06a396c982c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -12,7 +12,7 @@ use Magento\User\Test\Fixture\AdminUserRole;
 use Magento\User\Test\Fixture\User;
 use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for UpdateAdminUserRoleEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
index cf96f02228f..003e6640bdf 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
@@ -13,8 +13,8 @@ use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
 use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
 use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test that user can login from the first attempt just after his permissions were changed.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
index c2b55ba69e8..e147152e204 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab;
 
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
 
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index 665b8871c81..fd2a372a444 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist;
 
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
index baae2751167..a85bd45da92 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Block\Customer;
 
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
 
 /**
  * Class Sharing
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
index f3f8ac49c79..30e6dcd8dcc 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Block\Customer;
 
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
 
 /**
  * Class Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
index 8763e24ee8e..153f40522c7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
@@ -7,9 +7,9 @@
 namespace Magento\Wishlist\Test\Block\Customer\Wishlist;
 
 use Magento\Wishlist\Test\Block\Customer\Wishlist\Items\Product;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index 26f836e44d9..5f427ca5531 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
 
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Class Product
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
index 05eada0d084..0e616a4d881 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertAddProductToWishlistSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
index 371cce58db2..3bfdd344eb6 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
@@ -7,8 +7,8 @@
 namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertAddProductToWishlistSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
index accea31efaf..791b72d28a9 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
@@ -8,9 +8,9 @@ namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertBundleProductDetailsInWishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
index d8ed443bf80..afa3f5eb3db 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
@@ -8,8 +8,8 @@ namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
 use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Class AssertProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
index 6f59d50f1d1..8370fbd4a30 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -9,8 +9,8 @@ namespace Magento\Wishlist\Test\Constraint;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertProductIsPresentInCustomerBackendWishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
index f0fee57f93b..88f0192ade2 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
@@ -9,8 +9,8 @@ namespace Magento\Wishlist\Test\Constraint;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertProductIsPresentInWishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
index dbd869d0a09..661cfac7c9b 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
@@ -12,8 +12,8 @@ use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class AssertProductsIsAbsentInWishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
index 502839a7715..794e8b46076 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
@@ -8,7 +8,7 @@ namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWishlistIsEmpty
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
index cd96a7d6117..302e994568d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
@@ -7,7 +7,7 @@
 namespace Magento\Wishlist\Test\Constraint;
 
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
  * Class AssertWishlistShareMessage
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
index 643858b155e..b69fa2218ad 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
@@ -10,9 +10,9 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Class AbstractWishlistTest
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
index 0e9bd4f9b69..342066c81cd 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
@@ -15,8 +15,8 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Customer\Test\Page\CustomerAccountLogout;
 use Magento\Wishlist\Test\Page\WishlistIndex;
 use Magento\Wishlist\Test\Page\WishlistShare;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
 
 /**
  * Test Creation for ShareWishlistEntity
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
index 738db597b3a..615da8212ef 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
@@ -7,8 +7,8 @@
 namespace Magento\Wishlist\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Class AddProductsToWishlistStep
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
similarity index 98%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
index 415b2955215..69eea437e7e 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\TestSuite;
+namespace Magento\Mtf\TestSuite;
 
 /**
  * Test suite prepared for Github Publication
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
similarity index 82%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 30d57ac5a5f..1ba2a9bb886 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Mtf\TestSuite;
+namespace Magento\Mtf\TestSuite;
 
-use Mtf\ObjectManager;
-use Mtf\ObjectManagerFactory;
-use Mtf\TestRunner\Configuration;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\ObjectManagerFactory;
+use Magento\Mtf\TestRunner\Configuration;
 
 /**
  * Class InjectableTests
@@ -70,12 +70,12 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
     /**
      * Prepare test suite and apply application state
      *
-     * @return \Mtf\TestSuite\AppState
+     * @return \Magento\Mtf\TestSuite\AppState
      */
     public function prepareSuite()
     {
         $this->init();
-        return $this->objectManager->create('Mtf\TestSuite\AppState');
+        return $this->objectManager->create('Magento\Mtf\TestSuite\AppState');
     }
 
     /**
@@ -99,12 +99,12 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
             $confFilePath = realpath(
                 MTF_BP . '/testsuites/' . $_ENV['testsuite_rule_path']  . '/' . $configurationFileName . '.xml'
             );
-            /** @var \Mtf\TestRunner\Configuration $testRunnerConfiguration */
-            $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Mtf\TestRunner\Configuration');
+            /** @var \Magento\Mtf\TestRunner\Configuration $testRunnerConfiguration */
+            $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Magento\Mtf\TestRunner\Configuration');
             $testRunnerConfiguration->load($confFilePath);
             $testRunnerConfiguration->loadEnvConfig();
 
-            $shared = ['Mtf\TestRunner\Configuration' => $testRunnerConfiguration];
+            $shared = ['Magento\Mtf\TestRunner\Configuration' => $testRunnerConfiguration];
             $this->objectManager = $objectManagerFactory->create($shared);
         }
     }
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
similarity index 82%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
index 7fc208a5ffe..1f74e74f5ee 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testcase">
         <allow>
             <tag group="test_type" value="acceptance_test" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
similarity index 75%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
index 60f1dab5513..a63d9da454d 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testsuite">
         <allow>
             <namespace value="Magento" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
similarity index 91%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
index 91356680902..e875401e6e8 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testsuite">
         <allow>
             <!--Products-->
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
index eb0fd76bdba..621c5d1e068 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testcase">
         <allow>
             <tag group="domain" value="CS" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
index c6d1305ff3d..12891acd39b 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testcase">
         <allow>
             <tag group="domain" value="MX" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
index 2790fcf7ce3..fbbe25a9216 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testcase">
         <allow>
             <tag group="domain" value="PS" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
similarity index 95%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
index a4b021b3317..9c14458282a 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testsuite">
         <allow>
             <!--Product search-->
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
index e90f7639de2..262d254fe4c 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testsuite">
         <allow>
             <module value="Magento_Install"/>
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
index c3efd1454f1..220478d47ef 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
     <rule scope="testcase">
         <allow>
             <tag group="mvp" value="yes" />
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index ec750f54b43..b2a8e0792a0 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -14,5 +14,5 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
 require $appRoot . '/app/bootstrap.php';
 require __DIR__ . '/../vendor/autoload.php';
 
-$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
-\Mtf\ObjectManagerFactory::configure($objectManager);
+$objectManager = \Magento\Mtf\ObjectManagerFactory::getObjectManager();
+\Magento\Mtf\ObjectManagerFactory::configure($objectManager);
diff --git a/dev/tests/functional/utils/generate.php b/dev/tests/functional/utils/generate.php
index 2e63dcb82aa..7aa9b91f0f9 100644
--- a/dev/tests/functional/utils/generate.php
+++ b/dev/tests/functional/utils/generate.php
@@ -5,13 +5,13 @@
  */
 require_once dirname(__FILE__) . '/' . 'bootstrap.php';
 
-$objectManager->create('Mtf\Util\Generate\TestCase')->launch();
-$objectManager->create('Mtf\Util\Generate\Page')->launch();
-$objectManager->create('Mtf\Util\Generate\Fixture')->launch();
-$objectManager->create('Mtf\Util\Generate\Constraint')->launch();
-$objectManager->create('Mtf\Util\Generate\Handler')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\TestCase')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Page')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Constraint')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Handler')->launch();
 
 $objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend');
-$objectManager->create('Mtf\Util\Generate\Repository')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch();
 
-\Mtf\Util\Generate\GenerateResult::displayResults();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/constraint.php b/dev/tests/functional/utils/generate/constraint.php
index 70b6d73d413..5dfd019f6c1 100644
--- a/dev/tests/functional/utils/generate/constraint.php
+++ b/dev/tests/functional/utils/generate/constraint.php
@@ -5,5 +5,5 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$objectManager->create('Mtf\Util\Generate\Constraint')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Constraint')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php
index e2bfb6ce2df..05c38495a2d 100644
--- a/dev/tests/functional/utils/generate/factory.php
+++ b/dev/tests/functional/utils/generate/factory.php
@@ -15,7 +15,7 @@ require MTF_BP . '/vendor/autoload.php';
 $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER);
 
 $om = $bootstrap->getObjectManager();
-/** @var \Mtf\Util\Generate\Factory $generator */
-$generator = $om->create('Mtf\Util\Generate\Factory');
+/** @var \Magento\Mtf\Util\Generate\Factory $generator */
+$generator = $om->create('Magento\Mtf\Util\Generate\Factory');
 $generator->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/fixture.php b/dev/tests/functional/utils/generate/fixture.php
index 9d1581309cd..d2e13c07ba6 100644
--- a/dev/tests/functional/utils/generate/fixture.php
+++ b/dev/tests/functional/utils/generate/fixture.php
@@ -5,5 +5,5 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$objectManager->create('Mtf\Util\Generate\Fixture')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/handler.php b/dev/tests/functional/utils/generate/handler.php
index 147aae10f99..2e1b1bc7ef1 100644
--- a/dev/tests/functional/utils/generate/handler.php
+++ b/dev/tests/functional/utils/generate/handler.php
@@ -5,5 +5,5 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$objectManager->create('Mtf\Util\Generate\Handler')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Handler')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/page.php b/dev/tests/functional/utils/generate/page.php
index c4cc602d289..f15e030c24c 100644
--- a/dev/tests/functional/utils/generate/page.php
+++ b/dev/tests/functional/utils/generate/page.php
@@ -4,5 +4,5 @@
  * See COPYING.txt for license details.
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\Page')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Page')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/repository.php b/dev/tests/functional/utils/generate/repository.php
index 0179cab18c4..5355cf45e75 100644
--- a/dev/tests/functional/utils/generate/repository.php
+++ b/dev/tests/functional/utils/generate/repository.php
@@ -6,5 +6,5 @@
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
 $objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend');
-$objectManager->create('Mtf\Util\Generate\Repository')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
-- 
GitLab


From e6825632def67e1e5c1ea9c6912385efd95f3244 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 16:00:57 +0200
Subject: [PATCH 082/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 dev/tests/functional/lib/Mtf/Client/Element/Tree.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 77d9808e689..499a7d645fd 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -45,6 +45,7 @@ abstract class Tree extends SimpleElement
      *
      * @param ElementInterface $target
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function dragAndDrop(ElementInterface $target)
     {
-- 
GitLab


From 7f1da89c6d9a07e668b0ff468e0637aea27f7d5b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 08:50:02 -0600
Subject: [PATCH 083/101] MAGETWO-29705: Fixed confusing Filesystem Read/Write
 Interfaces

---
 .../Magento/Downloadable/Helper/Download.php  |  2 +-
 .../Filesystem/File/ReadFactoryTest.php       |  2 +-
 .../Filesystem/File/WriteFactoryTest.php      |  2 +-
 lib/internal/Magento/Framework/Filesystem.php | 12 ++++++-----
 .../Framework/Filesystem/File/ReadFactory.php | 19 +++++-------------
 .../Filesystem/File/WriteFactory.php          | 20 +++++--------------
 6 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index a83b739b5f5..d54c436b781 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -168,7 +168,7 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
                     // Strip down protocol from path
                     $path = preg_replace('#.+://#', '', $path);
                 }
-                $this->_handle = $this->fileReadFactory->createWithDriverCode($path, $protocol);
+                $this->_handle = $this->fileReadFactory->create($path, $protocol);
             } elseif ($this->_linkType == self::LINK_TYPE_FILE) {
                 $this->_workingDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
                 $fileExists = $this->_downloadableFile->ensureFileInFilesystem($this->_resourceFile);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
index ce7d66e4bac..41f52ea7983 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
@@ -30,7 +30,7 @@ class ReadFactoryTest extends \PHPUnit_Framework_TestCase
         $driverMock->expects($this->any())->method('isExists')->willReturn(true);
         $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
         $factory = new ReadFactory($driverPool);
-        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $result = $factory->create('path', 'driverCode');
         $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
index 579cc9766ae..bd9c483346e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
@@ -28,7 +28,7 @@ class WriteFactoryTest extends \PHPUnit_Framework_TestCase
         $driverMock->expects($this->any())->method('isExists')->willReturn(true);
         $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
         $factory = new WriteFactory($driverPool);
-        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $result = $factory->create('path', 'driverCode');
         $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
     }
 
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index 9429da43b59..6c4e7de35c2 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -52,21 +52,23 @@ class Filesystem
     }
 
     /**
-     * Create an instance of directory with write permissions
+     * Create an instance of directory with read permissions
      *
-     * @param string $code
+     * @param string $directoryCode
+     * @param string $driverCode
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
      */
-    public function getDirectoryRead($code)
+    public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
     {
+        $code = $directoryCode . '_' . $driverCode;
         if (!array_key_exists($code, $this->readInstances)) {
-            $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($code));
+            $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($directoryCode), $driverCode);
         }
         return $this->readInstances[$code];
     }
 
     /**
-     * Create an instance of directory with read permissions
+     * Create an instance of directory with write permissions
      *
      * @param string $directoryCode
      * @param string $driverCode
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index 1dccce253ac..0c758ce471d 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -31,23 +31,14 @@ class ReadFactory
      * Create a readable file
      *
      * @param string $path
-     * @param DriverInterface $driver
+     * @param DriverInterface|string $driver Driver or driver code
      * @return \Magento\Framework\Filesystem\File\ReadInterface
      */
-    public function create($path, DriverInterface $driver = null)
+    public function create($path, $driver)
     {
+        if (is_string($driver)) {
+            return new Read($path, $this->driverPool->getDriver($driver));
+        }
         return new Read($path, $driver);
     }
-
-    /**
-     * Create a readable file
-     *
-     * @param string $path
-     * @param string|null $driverCode
-     * @return \Magento\Framework\Filesystem\File\ReadInterface
-     */
-    public function createWithDriverCode($path, $driverCode)
-    {
-        return new Read($path, $this->driverPool->getDriver($driverCode));
-    }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 1a309eb0274..1f0fe8066c5 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -31,25 +31,15 @@ class WriteFactory
      * Create a readable file.
      *
      * @param string $path
-     * @param DriverInterface $driver
+     * @param DriverInterface|string $driver Driver or driver code
      * @param string $mode [optional]
      * @return Write
      */
-    public function create($path, DriverInterface $driver, $mode = 'r')
+    public function create($path, $driver, $mode = 'r')
     {
+        if (is_string($driver)) {
+            return new Write($path, $this->driverPool->getDriver($driver), $mode);
+        }
         return new Write($path, $driver, $mode);
     }
-
-    /**
-     * Create a readable file.
-     *
-     * @param string $path
-     * @param string $driverCode
-     * @param string $mode [optional]
-     * @return Write
-     */
-    public function createWithDriverCode($path, $driverCode, $mode = 'r')
-    {
-        return new Write($path, $this->driverPool->getDriver($driverCode), $mode);
-    }
 }
-- 
GitLab


From ad2be679779f90cfc5184a8c7c811e6785517cef Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 09:01:53 -0600
Subject: [PATCH 084/101] MAGETWO-29705: Fixed confusing Filesystem Read/Write
 Interfaces

---
 .../unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
index 0165294a2fd..a80e3f57e3a 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
@@ -226,7 +226,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase
         $this->fileReadFactory->expects(
             $this->once()
         )->method(
-            'createWithDriverCode'
+            'create'
         )->will(
             $this->returnValue($this->_handleMock)
         );
-- 
GitLab


From 45549012036e7dde1b7e7ea5852236cf55f8ec4e Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 17:31:38 +0200
Subject: [PATCH 085/101] MAGETWO-31363: [MPI] Unit and Integration tests
 coverage

---
 .../Block/Form/AbstractInstruction.php        | 32 +++++++++++
 .../Block/Form/Banktransfer.php               | 22 +------
 .../Block/Form/Cashondelivery.php             | 22 +------
 .../OfflinePayments/Model/Banktransfer.php    | 10 ----
 .../OfflinePayments/Model/Observer.php        | 10 +++-
 .../Payment/Block/Info/Instructions.php       |  2 +-
 ...erTest.php => AbstractInstructionTest.php} | 17 +++---
 .../Block/Form/Cashondelivery.php             | 37 ------------
 .../Block/Info/CheckmoTest.php                | 50 +++++++---------
 .../Model/BanktransferTest.php                | 10 ----
 .../Model/CashondeliveryTest.php              | 10 ----
 .../OfflinePayments/Model/ObserverTest.php    | 29 +++++++++-
 .../Payment/Block/Info/InstructionsTest.php   | 57 +++++++++++--------
 13 files changed, 135 insertions(+), 173 deletions(-)
 create mode 100644 app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
 rename dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/{BanktransferTest.php => AbstractInstructionTest.php} (52%)
 delete mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php

diff --git a/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
new file mode 100644
index 00000000000..4ad7357cfda
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+/**
+ * Abstract class for Cash On Delivery and Bank Transfer payment method form
+ */
+abstract class AbstractInstruction extends \Magento\Payment\Block\Form
+{
+    /**
+     * Instructions text
+     *
+     * @var string
+     */
+    protected $_instructions;
+
+    /**
+     * Get instructions text from config
+     *
+     * @return string
+     */
+    public function getInstructions()
+    {
+        if (is_null($this->_instructions)) {
+            $this->_instructions = $this->getMethod()->getInstructions();
+        }
+        return $this->_instructions;
+    }
+}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index 1693929cdaa..d71654418a3 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -8,32 +8,12 @@ namespace Magento\OfflinePayments\Block\Form;
 /**
  * Block for Bank Transfer payment method form
  */
-class Banktransfer extends \Magento\Payment\Block\Form
+class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Bank transfer template
      *
      * @var string
      */
     protected $_template = 'form/banktransfer.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index af0850e5860..1e14cabb9ba 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -8,32 +8,12 @@ namespace Magento\OfflinePayments\Block\Form;
 /**
  * Block for Cash On Delivery payment method form
  */
-class Cashondelivery extends \Magento\Payment\Block\Form
+class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Cash on delivery template
      *
      * @var string
      */
     protected $_template = 'form/cashondelivery.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Model/Banktransfer.php b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
index 044dd3301ba..4cc48a57527 100644
--- a/app/code/Magento/OfflinePayments/Model/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
@@ -39,14 +39,4 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * @var bool
      */
     protected $_isOffline = true;
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        return trim($this->getConfigData('instructions'));
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Model/Observer.php b/app/code/Magento/OfflinePayments/Model/Observer.php
index 61fc00d5389..bafe632349c 100644
--- a/app/code/Magento/OfflinePayments/Model/Observer.php
+++ b/app/code/Magento/OfflinePayments/Model/Observer.php
@@ -21,9 +21,13 @@ class Observer
     {
         /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $observer->getEvent()->getPayment();
-        $banktransfer = \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE;
-        if ($payment->getMethod() === $banktransfer) {
-            $payment->setAdditionalInformation('instructions', $payment->getMethodInstance()->getInstructions());
+        if ($payment->getMethod() ===
+            \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE
+        ) {
+            $payment->setAdditionalInformation(
+                'instructions',
+                $payment->getMethodInstance()->getConfigData('instructions')
+            );
         }
     }
 }
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index 2caeeb5f2f9..55ffee89fa1 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -33,7 +33,7 @@ class Instructions extends \Magento\Payment\Block\Info
         if (is_null($this->_instructions)) {
             $this->_instructions = $this->getInfo()->getAdditionalInformation(
                 'instructions'
-            ) ?: $this->getMethod()->getInstructions();
+            ) ?: $this->getMethod()->getConfigData('instructions');
         }
         return $this->_instructions;
     }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
similarity index 52%
rename from dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
rename to dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
index 80eb7a7ac3e..a6ef83d4f0e 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
@@ -5,17 +5,20 @@
  */
 namespace Magento\OfflinePayments\Block\Form;
 
-class BanktransferTest extends \PHPUnit_Framework_TestCase
+class AbstractInstructionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\OfflinePayments\Block\Form\Banktransfer
+     * @var \Magento\OfflinePayments\Block\Form\AbstractInstruction
      */
-    protected $_object;
+    protected $_model;
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Banktransfer');
+        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->_model = $this->getMockForAbstractClass(
+            'Magento\OfflinePayments\Block\Form\AbstractInstruction',
+            ['context' => $context]
+        );
     }
 
     public function testGetInstructions()
@@ -30,8 +33,8 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
         $method->expects($this->once())
             ->method('getInstructions')
             ->willReturn('instructions');
-        $this->_object->setData('method', $method);
+        $this->_model->setData('method', $method);
 
-        $this->assertEquals('instructions', $this->_object->getInstructions());
+        $this->assertEquals('instructions', $this->_model->getInstructions());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
deleted file mode 100644
index ba0a899bb48..00000000000
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\OfflinePayments\Block\Form;
-
-class CashondeliveryTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \Magento\OfflinePayments\Block\Form\Cashondelivery
-     */
-    protected $_object;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Cashondelivery');
-    }
-
-    public function testGetInstructions()
-    {
-        $method = $this->getMock(
-            'Magento\Payment\Model\MethodInterface',
-            ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
-            [],
-            '',
-            false
-        );
-        $method->expects($this->once())
-            ->method('getInstructions')
-            ->willReturn('instructions');
-        $this->_object->setData('method', $method);
-
-        $this->assertEquals('instructions', $this->_object->getInstructions());
-    }
-}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
index 88314b0b1af..04748038a9c 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
@@ -10,33 +10,12 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\OfflinePayments\Block\Info\Checkmo
      */
-    protected $_object;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_scopeConfig;
+    protected $_model;
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
-        $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
-        $this->_scopeConfig = $this->getMock(
-            'Magento\Framework\App\Config\ScopeConfigInterface',
-            ['getValue', 'isSetFlag'],
-            [],
-            '',
-            false
-        );
-        $this->_object = $objectManagerHelper->getObject(
-            'Magento\OfflinePayments\Block\Info\Checkmo',
-            [
-                'eventManager' => $eventManager,
-                'paymentData' => $paymentDataMock,
-                'scopeConfig' => $this->_scopeConfig,
-            ]
-        );
+        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->_model = new \Magento\OfflinePayments\Block\Info\Checkmo($context);
     }
 
     /**
@@ -48,9 +27,9 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
         $info->expects($this->once())
             ->method('getAdditionalData')
             ->willReturn(serialize($details));
-        $this->_object->setData('info', $info);
+        $this->_model->setData('info', $info);
 
-        $this->assertEquals($expected, $this->_object->getPayableTo());
+        $this->assertEquals($expected, $this->_model->getPayableTo());
     }
 
     /**
@@ -73,9 +52,9 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
         $info->expects($this->once())
             ->method('getAdditionalData')
             ->willReturn(serialize($details));
-        $this->_object->setData('info', $info);
+        $this->_model->setData('info', $info);
 
-        $this->assertEquals($expected, $this->_object->getMailingAddress());
+        $this->assertEquals($expected, $this->_model->getMailingAddress());
     }
 
     /**
@@ -88,4 +67,19 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
             ['', '']
         ];
     }
+
+    public function testConvertAdditionalDataIsNeverCalled()
+    {
+        $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+        $info->expects($this->once())
+            ->method('getAdditionalData')
+            ->willReturn(serialize(['mailing_address' => 'blah@blah.com']));
+        $this->_model->setData('info', $info);
+
+        // First we set the property $this->_mailingAddress
+        $this->_model->getMailingAddress();
+
+        // And now we get already setted property $this->_mailingAddress
+        $this->assertEquals('blah@blah.com', $this->_model->getMailingAddress());
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
index a8705a4dc8f..18fb24e1ae8 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -37,14 +37,4 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
-
-    public function testGetInstructions()
-    {
-        $this->_object->setStore(1);
-        $this->_scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('payment/banktransfer/instructions', 'store', 1)
-            ->willReturn('payment configuration');
-        $this->assertEquals('payment configuration', $this->_object->getInstructions());
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
index 97bdf1127e5..cd4d60d2753 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -39,14 +39,4 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
-
-    public function testGetInstructions()
-    {
-        $this->_object->setStore(1);
-        $this->_scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('payment/cashondelivery/instructions', 'store', 1)
-            ->willReturn('payment configuration');
-        $this->assertEquals('payment configuration', $this->_object->getInstructions());
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
index 34f9c0da865..708b25093f5 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
@@ -37,13 +37,13 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
             ->with('instructions', 'payment configuration');
         $method = $this->getMock(
             'Magento\Payment\Model\MethodInterface',
-            ['getInstructions', 'getFormBlockType', 'getTitle', 'getCode'],
+            ['getConfigData', 'getFormBlockType', 'getTitle', 'getCode'],
             [],
             '',
             false
         );
         $method->expects($this->once())
-            ->method('getInstructions')
+            ->method('getConfigData')
             ->willReturn('payment configuration');
         $payment->expects($this->once())
             ->method('getMethodInstance')
@@ -56,4 +56,29 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
             ->willReturn($event);
         $this->_model->beforeOrderPaymentSave($observer);
     }
+
+    public function testBeforeOrderPaymentSaveNoBanktransfer()
+    {
+        $observer = $this->getMock('Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
+        $event = $this->getMock('Magento\Framework\Event', ['getPayment'], [], '', false);
+        $payment = $this->getMock(
+            'Magento\Sales\Model\Order\Payment',
+            ['getMethod', 'setAdditionalInformation', 'getMethodInstance'],
+            [],
+            '',
+            false
+        );
+        $payment->expects($this->once())
+            ->method('getMethod')
+            ->willReturn('somepaymentmethod');
+        $payment->expects($this->never())
+            ->method('setAdditionalInformation');
+        $event->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($payment);
+        $observer->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($event);
+        $this->_model->beforeOrderPaymentSave($observer);
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
index 43528a3ce39..7c035de52c8 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
@@ -12,12 +12,7 @@ namespace Magento\Payment\Block\Info;
 class InstructionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Object
-     */
-    protected $_method;
-
-    /**
-     * @var \Magento\Payment\Model\Info
+     * @var \Magento\Payment\Model\Info|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_info;
 
@@ -28,28 +23,44 @@ class InstructionsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_method = new \Magento\Framework\Object();
-        $this->_info = $objectManagerHelper->getObject('Magento\Payment\Model\Info');
-        $this->_instructions = $objectManagerHelper->getObject('Magento\Payment\Block\Info\Instructions');
-
-        $this->_info->setMethodInstance($this->_method);
-        $this->_instructions->setInfo($this->_info);
+        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->_instructions = new \Magento\Payment\Block\Info\Instructions($context);
+        $this->_info = $this->getMock('Magento\Payment\Model\Info', [], [], '', false);
+        $this->_instructions->setData('info', $this->_info);
     }
 
-    public function testGetInstructionsSetInstructions()
+    public function testGetInstructionAdditionalInformation()
     {
-        $this->assertNull($this->_instructions->getInstructions());
-        $testInstruction = 'first test';
-        $this->_method->setInstructions($testInstruction);
-        $this->assertEquals($testInstruction, $this->_instructions->getInstructions());
+        $this->_info->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('instructions')
+            ->willReturn('get the instruction here');
+        $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
+
+        // And we get the already setted param $this->_instructions
+        $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
     }
 
-    public function testGetInstructionsSetInformation()
+    public function testGetInstruction()
     {
-        $this->assertNull($this->_instructions->getInstructions());
-        $testInstruction = 'second test';
-        $this->_info->setAdditionalInformation('instructions', $testInstruction);
-        $this->assertEquals($testInstruction, $this->_instructions->getInstructions());
+        $methodInstance = $this->getMock(
+            'Magento\Payment\Model\MethodInterface',
+            ['getConfigData', 'getCode', 'getFormBlockType', 'getTitle'],
+            [],
+            '',
+            false
+        );
+        $methodInstance->expects($this->once())
+            ->method('getConfigData')
+            ->with('instructions')
+            ->willReturn('get the instruction here');
+        $this->_info->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('instructions')
+            ->willReturn(false);
+        $this->_info->expects($this->once())
+            ->method('getMethodInstance')
+            ->willReturn($methodInstance);
+        $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
     }
 }
-- 
GitLab


From e0b8d87f56ff1e6df26ca81eafb11578aa7ffb70 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 09:33:40 -0600
Subject: [PATCH 086/101] MAGETWO-29705: Fixed confusing Filesystem Read/Write
 Interfaces

---
 .../Magento/Framework/Less/File/Collector/LibraryTest.php | 4 ++--
 .../Magento/Framework/View/Asset/MinifiedTest.php         | 5 +++--
 .../testsuite/Magento/Framework/View/Asset/SourceTest.php | 7 ++++---
 .../Magento/Framework/View/Element/TemplateTest.php       | 8 +++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
index f5d9ef63f16..396fad99d70 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
@@ -72,8 +72,8 @@ class LibraryTest extends \PHPUnit_Framework_TestCase
             ->will(
                 $this->returnValueMap(
                     [
-                        [DirectoryList::LIB_WEB, $this->libraryDirectoryMock],
-                        [DirectoryList::THEMES, $this->themesDirectoryMock],
+                        [DirectoryList::LIB_WEB, Filesystem\DriverPool::FILE, $this->libraryDirectoryMock],
+                        [DirectoryList::THEMES, Filesystem\DriverPool::FILE, $this->themesDirectoryMock],
                     ]
                 )
             );
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
index 7b501992bca..50e39edc08a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\View\Asset;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 class MinifiedTest extends \PHPUnit_Framework_TestCase
 {
@@ -62,8 +63,8 @@ class MinifiedTest extends \PHPUnit_Framework_TestCase
         $this->_filesystem->expects($this->any())
             ->method('getDirectoryRead')
             ->will($this->returnValueMap([
-                [DirectoryList::STATIC_VIEW, $this->_staticViewDir],
-                [DirectoryList::ROOT, $this->_rootDir],
+                [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->_staticViewDir],
+                [DirectoryList::ROOT, DriverPool::FILE, $this->_rootDir],
             ]));
         $this->_filesystem->expects($this->any())
             ->method('getDirectoryWrite')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
index 09c0ac59216..15862f74256 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Framework\View\Asset;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -245,9 +246,9 @@ class SourceTest extends \PHPUnit_Framework_TestCase
         $this->varDir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
 
         $readDirMap = [
-            [DirectoryList::ROOT, $this->rootDirRead],
-            [DirectoryList::STATIC_VIEW, $this->staticDirRead],
-            [DirectoryList::VAR_DIR, $this->varDir],
+            [DirectoryList::ROOT, DriverPool::FILE, $this->rootDirRead],
+            [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->staticDirRead],
+            [DirectoryList::VAR_DIR, DriverPool::FILE, $this->varDir],
         ];
 
         $this->filesystem->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
index 3a3fd0e8709..59f6568e91e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\View\Element;
 
+use Magento\Framework\Filesystem\DriverPool;
+
 class TemplateTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -50,9 +52,9 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
         $this->_filesystem->expects($this->any())
             ->method('getDirectoryRead')
             ->will($this->returnValueMap([
-                [\Magento\Framework\App\Filesystem\DirectoryList::THEMES, $themesDirMock],
-                [\Magento\Framework\App\Filesystem\DirectoryList::APP, $appDirMock],
-                [\Magento\Framework\App\Filesystem\DirectoryList::ROOT, $this->rootDirMock],
+                [\Magento\Framework\App\Filesystem\DirectoryList::THEMES, DriverPool::FILE, $themesDirMock],
+                [\Magento\Framework\App\Filesystem\DirectoryList::APP, DriverPool::FILE, $appDirMock],
+                [\Magento\Framework\App\Filesystem\DirectoryList::ROOT, DriverPool::FILE, $this->rootDirMock],
             ]));
 
         $this->_templateEngine = $this->getMock(
-- 
GitLab


From c95234e4c589853e905a7350d779f4a1f89126fe Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 17:59:47 +0200
Subject: [PATCH 087/101] MAGETWO-32592: MTF Alternative Web Driver pull
 request preparation

---
 .../functional/lib/Mtf/Client/Element/LiselectstoreElement.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
index 0308a312ea1..997a7bcf4fa 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
@@ -89,7 +89,7 @@ class LiselectstoreElement extends SimpleElement
     protected function getLiElements()
     {
         $this->driver->find($this->toggleSelector)->click();
-        $elements = $this->driver->getElements('li', Locator::SELECTOR_TAG_NAME);
+        $elements = $this->driver->getElements($this, 'li', Locator::SELECTOR_TAG_NAME);
         $dropdownData = [];
         foreach ($elements as $element) {
             $class = $element->getAttribute('class');
-- 
GitLab


From e34d73955028e7b73e012612dd4fccdd835b0d1e Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Tue, 20 Jan 2015 18:19:41 +0200
Subject: [PATCH 088/101] MAGETWO-15798: Some fields aren't disabled by default
 on the webiste scope in System configuration

---
 lib/web/mage/adminhtml/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index c6fed3aa5fc..e266ece372a 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -458,7 +458,7 @@ FormElementDependenceController.prototype = {
                 }
             } else {
                 $(idTo).show();
-                if (isAnInputOrSelect) {
+                if (isAnInputOrSelect && !isInheritCheckboxChecked) {
                     $(idTo).disabled = false;
                     jQuery('#' + idTo).removeClass('ignore-validate');
                 }
-- 
GitLab


From 8b90f638bee56a30dd8b9a52b059071111b71bb1 Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 19:59:22 +0200
Subject: [PATCH 089/101] MAGETWO-31363: [MPI] Unit and Integration tests
 coverage

---
 app/code/Magento/OfflinePayments/Model/Observer.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/OfflinePayments/Model/Observer.php b/app/code/Magento/OfflinePayments/Model/Observer.php
index bafe632349c..1cb45ac753f 100644
--- a/app/code/Magento/OfflinePayments/Model/Observer.php
+++ b/app/code/Magento/OfflinePayments/Model/Observer.php
@@ -21,9 +21,7 @@ class Observer
     {
         /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $observer->getEvent()->getPayment();
-        if ($payment->getMethod() ===
-            \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE
-        ) {
+        if ($payment->getMethod() === Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE) {
             $payment->setAdditionalInformation(
                 'instructions',
                 $payment->getMethodInstance()->getConfigData('instructions')
-- 
GitLab


From 4023239c7675f4bd6b82694464030ddb0f7ecde7 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 20:35:51 +0200
Subject: [PATCH 090/101] MAGETWO-32081: Magento vendor name is used as a home
 framework directory

---
 .../functional/lib/Magento/Mtf/App/State/AbstractState.php     | 3 ++-
 .../testsuites/Magento/Mtf/TestSuite/InjectableTests.php       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
index ad7353b2b53..ef8d88494f1 100644
--- a/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
@@ -39,7 +39,8 @@ abstract class AbstractState implements StateInterface
      */
     public function clearInstance()
     {
-        $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
+        $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()
+            ->get('Magento\Framework\Filesystem\DirectoryList');
         $deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
             new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
             []
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 1ba2a9bb886..1cc1259d981 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -100,7 +100,8 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
                 MTF_BP . '/testsuites/' . $_ENV['testsuite_rule_path']  . '/' . $configurationFileName . '.xml'
             );
             /** @var \Magento\Mtf\TestRunner\Configuration $testRunnerConfiguration */
-            $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Magento\Mtf\TestRunner\Configuration');
+            $testRunnerConfiguration = $objectManagerFactory->getObjectManager()
+                ->get('\Magento\Mtf\TestRunner\Configuration');
             $testRunnerConfiguration->load($confFilePath);
             $testRunnerConfiguration->loadEnvConfig();
 
-- 
GitLab


From 37d89b4e590c1e18699db0b5e702f36c6deb4cf0 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Tue, 20 Jan 2015 17:22:14 -0600
Subject: [PATCH 091/101] MAGETWO-29712: [QA] Automate downloadable with taxes
 test cases

 - fix functional test
---
 .../Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index 0a3ab3efe4c..7038e02eb5d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Mtf\Block\Form;
 
 /**
  * Class Form
-- 
GitLab


From 3185bfb05df6d0a2ce6a514b315dab998d3ff6a5 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Wed, 21 Jan 2015 10:52:00 +0200
Subject: [PATCH 092/101] MAGETWO-32081: Magento vendor name is used as a home
 framework directory

---
 .../Test/Integrity/_files/blacklist/reference.txt  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
index c6bac2ba9f3..29a6687221a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -51,3 +51,17 @@ Model3
 \Magento\TestModule2\Service\V1\Entity\ItemBuilder
 \Magento\TestModule4\Service\V1\Entity\DataObjectResponse
 \Magento\TestModule4\Service\V1\Entity\DataObjectRequest
+\Magento\Mtf\ObjectManager\Config\Mapper\Dom
+\Magento\Mtf\Data\Argument\Interpreter\Constant
+\Magento\Mtf\Data\Argument\Interpreter\Boolean
+\Magento\Mtf\Data\Argument\Interpreter\String
+\Magento\Mtf\Data\Argument\Interpreter\Number
+\Magento\Mtf\Data\Argument\Interpreter\NullType
+\Magento\Mtf\Data\Argument\Interpreter\Object
+\Magento\Mtf\Data\Argument\Interpreter\Argument
+\Magento\Mtf\Data\Argument\Interpreter\ArrayType
+\Magento\Mtf\Data\Argument\InterpreterInterface
+\Magento\Mtf\Util\Generate\GenerateResult
+\Magento\Mtf\Util\Generate\Repository\Resource
+\Magento\Mtf\Client\Element
+\Magento\Mtf\TestSuite\AppState
\ No newline at end of file
-- 
GitLab


From 4e769429bc4fb702d89633af112fe288a66012f2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 21 Jan 2015 11:05:22 +0200
Subject: [PATCH 093/101] MAGETWO-31967: Exception page instead of 404 when
 edit url for product with required configuration

---
 .../Magento/Checkout/Controller/Cart/ConfigureTest.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 4a49e870ac2..716661bd022 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -155,10 +155,10 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
     {
         $quoteId = 1;
         $actualProductId = 1;
-        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
             ->disableOriginalConstructor()
             ->getMock();
-        $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+        $quoteItemMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Item')
             ->disableOriginalConstructor()
             ->getMock();
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
@@ -222,10 +222,10 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
         $quotaId = 1;
         $productIdInQuota = 1;
         $productIdInRequest = null;
-        $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+        $quoteItemMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Item')
             ->disableOriginalConstructor()
             ->getMock();
-        $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
             ->disableOriginalConstructor()
             ->getMock();
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
-- 
GitLab


From 679197bd9019abf152f9c213e76cdd93d352c38e Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 21 Jan 2015 11:22:42 +0200
Subject: [PATCH 094/101] MAGETWO-25084: [GITHUB] About ByPercent.php under
 different currencies #581

---
 .../SalesRule/Model/Rule/Action/Discount/ToPercentTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
index 7163d2680c9..13bec6ff79e 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
@@ -209,7 +209,7 @@ class ToPercentTest extends \PHPUnit_Framework_TestCase
                     'amount' => 98,
                     'baseAmount' => 59.5,
                     'originalAmount' => 119,
-                    'baseOriginalAmount' => 108.5,
+                    'baseOriginalAmount' => 80.5,
                 ],
             ]
         ];
-- 
GitLab


From 63a866675bc447d2d162631e09b2bc3ebe00cbd8 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Wed, 21 Jan 2015 12:31:42 +0200
Subject: [PATCH 095/101] MAGETWO-32081: Magento vendor name is used as a home
 framework directory

---
 dev/tests/functional/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 4a3418c0ff5..0cd1467c6a9 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc13",
+        "magento/mtf": "1.0.0-rc14",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
-- 
GitLab


From 8d9563a7f49d04ccc53b688ac227d2033bf4289b Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 13:25:51 +0200
Subject: [PATCH 096/101] MAGETWO-31363: [MPI] Unit and Integration tests
 coverage

- fix static
---
 .../Block/Adminhtml/Carrier/Tablerate/GridTest.php       | 9 +++++----
 .../Model/Config/Backend/TablerateTest.php               | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
index f569f9515dd..09434687725 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -23,17 +23,17 @@ class GridTest extends \PHPUnit_Framework_TestCase
     protected $backendHelperMock;
 
     /**
-     * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $tablerateMock;
 
     /**
-     * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $context;
 
     /**
-     * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $collectionFactoryMock;
 
@@ -53,7 +53,8 @@ class GridTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->collectionFactoryMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
+        $this->collectionFactoryMock =
+            $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
index 869c408052d..16ff0b10765 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
@@ -19,7 +19,8 @@ class TablerateTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->tableateFactoryMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
+        $this->tableateFactoryMock =
+            $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-- 
GitLab


From 54e0c43e795f93dd5d6077bf9aa74934048e868d Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 13:36:45 +0200
Subject: [PATCH 097/101] MAGETWO-32782: [TD] Third party interfaces are not
 supported by single-tenant compiler

- fix static
---
 .../testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php | 2 +-
 dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php         | 4 +++-
 dev/tools/Magento/Tools/Di/Definition/Collection.php          | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index 5bfc5e0cc70..a4bb3a8ee73 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -106,7 +106,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
             ->willReturnMap($this->getPreferencesMap());
 
         $isConcreteMap = [];
-        foreach($definitionCollection->getInstancesNamesList() as $instanceType) {
+        foreach ($definitionCollection->getInstancesNamesList() as $instanceType) {
             $isConcreteMap[] = [$instanceType, strpos($instanceType, 'Interface') === false];
 
             $getResolvedConstructorArgumentsMap[] = [
diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 79ce889e6ff..f885f6fd12c 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -150,6 +149,9 @@ class Reader
      *
      * @param ConfigInterface $config
      * @param DefinitionsCollection $definitionsCollection
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     *
+     * @return void
      */
     private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
     {
diff --git a/dev/tools/Magento/Tools/Di/Definition/Collection.php b/dev/tools/Magento/Tools/Di/Definition/Collection.php
index 2fbde66b294..580f930d24c 100644
--- a/dev/tools/Magento/Tools/Di/Definition/Collection.php
+++ b/dev/tools/Magento/Tools/Di/Definition/Collection.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -63,7 +62,7 @@ class Collection
         $this->definitions[$instance] = $arguments;
     }
 
-    /**+
+    /**
      * Returns instance arguments
      *
      * @param string $instanceName
-- 
GitLab


From 7f4816b8082acc001d2691e76e16227f7d742c71 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 15:03:54 +0200
Subject: [PATCH 098/101] MAGETWO-32782: [TD] Third party interfaces are not
 supported by single-tenant compiler

- fix static
---
 .../testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index a4bb3a8ee73..0c2f708332f 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -216,7 +216,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
     private function getResolvedArguments($arguments)
     {
         return empty($arguments) ? null : array_map(
-            function($argument) {
+            function ($argument) {
                 return 'resolved_' . $argument;
             },
             $arguments
-- 
GitLab


From 19e01b8b24a5903c0daf8eee6c030c60b7d2821b Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Mon, 12 Jan 2015 17:42:46 -0600
Subject: [PATCH 099/101] MAGETWO-31732: Blacklisted ComposerTest

- fixed copyright
---
 .../static/testsuite/Magento/Test/Integrity/ComposerTest.php  | 4 ++--
 lib/internal/Magento/Framework/Composer/MagentoComponent.php  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 87ee01254e8..43e87f161c7 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
-
 namespace Magento\Test\Integrity;
 
 use Magento\Framework\Composer\MagentoComponent;
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
index b73b873e68d..5e2da7bfa55 100644
--- a/lib/internal/Magento/Framework/Composer/MagentoComponent.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Composer;
 
-- 
GitLab


From 235a6604e15afd5e718cf8796a4afdf6589ec111 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 15 Jan 2015 14:36:03 -0600
Subject: [PATCH 100/101] MAGETWO-31732: Blacklisted ComposerTest

- added readme for \Magento\Framework\Composer
---
 lib/internal/Magento/Framework/Composer/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/Composer/README.md

diff --git a/lib/internal/Magento/Framework/Composer/README.md b/lib/internal/Magento/Framework/Composer/README.md
new file mode 100644
index 00000000000..fc92f73c2db
--- /dev/null
+++ b/lib/internal/Magento/Framework/Composer/README.md
@@ -0,0 +1,2 @@
+**Magento\Framework\Composer** provides Magento-specific features for working with packages.
+ For example, ability to distinguish Magento package and any other package.
-- 
GitLab


From 8312d10d357639f0a3494b633ed2477c3fc284c2 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 16 Jan 2015 17:23:44 -0600
Subject: [PATCH 101/101] MAGETWO-31732: Blacklisted ComposerTest

- reduced complexity of a test
---
 .../Magento/Test/Integrity/ComposerTest.php   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 43e87f161c7..97039e89135 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -391,18 +391,7 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
             self::$rootJson,
             "If there are any component paths specified, then they must be reflected in 'replace' section"
         );
-        $flat = [];
-        foreach (self::$rootJson['extra']['component_paths'] as $key => $element) {
-            if (is_string($element)) {
-                $flat[] = [$key, $element];
-            } elseif (is_array($element)) {
-                foreach ($element as $path) {
-                    $flat[] = [$key, $path];
-                }
-            } else {
-                throw new \Exception("Unexpected element 'in extra->component_paths' section");
-            }
-        }
+        $flat = $this->getFlatPathsInfo(self::$rootJson['extra']['component_paths']);
         while (list(, list($component, $path)) = each($flat)) {
             $this->assertFileExists(
                 self::$root . '/' . $path,
@@ -424,4 +413,27 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
             }
         }
     }
+
+    /**
+     * @param array $info
+     * @return array
+     * @throws \Exception
+     */
+    private function getFlatPathsInfo(array $info)
+    {
+        $flat = [];
+        foreach ($info as $key => $element) {
+            if (is_string($element)) {
+                $flat[] = [$key, $element];
+            } elseif (is_array($element)) {
+                foreach ($element as $path) {
+                    $flat[] = [$key, $path];
+                }
+            } else {
+                throw new \Exception("Unexpected element 'in extra->component_paths' section");
+            }
+        }
+
+        return $flat;
+    }
 }
-- 
GitLab