diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
index 696120273cdbd2aaeded1dee977851cf5628ae41..87dad8b6edd4152ab5fba42b1ef5a06986c59e78 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
@@ -49,7 +49,7 @@ class MassactionKeyTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
+     * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
      *
      * @param $postData array|string
      * @param array $convertedData
@@ -84,7 +84,7 @@ class MassactionKeyTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
+     * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
      */
     public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists()
     {
diff --git a/app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php b/app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php
index af87476b315bccae72b57f5ce80edcbf0488d147..1414d0ec01d779f06fc766b5e33d98de2efcc157 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php
@@ -37,7 +37,7 @@ class NoRouteHandlerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Backend\App\Router\NoRouteHandler::process
+     * @covers \Magento\Backend\App\Router\NoRouteHandler::process
      */
     public function testProcessWithBackendAreaFrontName()
     {
@@ -86,7 +86,7 @@ class NoRouteHandlerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Backend\App\Router\NoRouteHandler::process
+     * @covers \Magento\Backend\App\Router\NoRouteHandler::process
      */
     public function testProcessWithoutAreaFrontName()
     {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
index b710fd40ffaf9821c130165d08c6224be9c3ecb7..1c39c59e762d5ce8518e631b869c21235deb622b 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
@@ -35,7 +35,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
+     * @covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
      */
     public function testGetRobotsDefaultCustomInstructions()
     {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
index f8b1f51ee95e08d27fac5811749ac36bade38dbe..08e12225518998f9811ea7d2852e07ef1a72f866 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
@@ -51,7 +51,7 @@ class ButtonTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
+     * @covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
      * @dataProvider getAttributesHtmlDataProvider
      */
     public function testGetAttributesHtml($data, $expect)
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
index d3c7b6f48ce8d04470a3c5caecafcef49cabf907..9f7571c5cb11378ac0fd9d906e5a11fecea8242e 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
@@ -109,7 +109,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
+     * @covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
      */
     public function testRenderWithDefaultCurrency()
     {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
index ac33a6a8c08272c5f17bab81adf1295ff3992080..26dfaeb4ed974443cd7ba20b34164a256743d7a8 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
@@ -97,8 +97,8 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
-     * covers \Magento\Backend\Block\Widget\Grid\Column::setFilterType
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::setFilterType
      */
     public function testGetFilterWithSetEmptyCustomFilterType()
     {
@@ -108,7 +108,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
      */
     public function testGetFilterWithInvalidFilterTypeWhenUseDefaultFilter()
     {
@@ -128,7 +128,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
      */
     public function testGetFilterWhenUseCustomFilter()
     {
@@ -149,8 +149,8 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
-     * covers \Magento\Backend\Block\Widget\Grid\Column::setFilter
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getFilter
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::setFilter
      */
     public function testGetFilterWhenFilterWasSetPreviously()
     {
@@ -213,7 +213,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
      */
     public function testGetRendererWheRendererSetFalse()
     {
@@ -235,8 +235,8 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
-     * covers \Magento\Backend\Block\Widget\Grid\Column::setRendererType
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::setRendererType
      */
     public function testGetRendererWhenUseCustomRenderer()
     {
@@ -259,8 +259,8 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
-     * covers \Magento\Backend\Block\Widget\Grid\Column::setRenderer
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::getRenderer
+     * @covers \Magento\Backend\Block\Widget\Grid\Column::setRenderer
      */
     public function testGetRendererWhenRendererWasSetPreviously()
     {
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
index 3afce6cc1c2417a3b185f21f1ac8033ea7b8020e..000c861f11d8eba4c098f8427df867287de61c2d 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
@@ -67,7 +67,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * @param string $locale
      * @dataProvider switchBackendInterfaceLocaleDataProvider
-     * covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
+     * @covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
      */
     public function testSwitchBackendInterfaceLocale($locale)
     {
@@ -81,7 +81,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
      */
     public function testGetUserInterfaceLocaleDefault()
     {
@@ -91,7 +91,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
      */
     public function testGetUserInterfaceLocale()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php b/app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php
index 41a19f62325b612620e0f3ec27bd5bb4d15674aa..78685f8da844d414d10f0d3410b06e37ca3e650f 100644
--- a/app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php
@@ -70,7 +70,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Bundle\Helper\Catalog\Product\Configuration::getSelectionFinalPrice
+     * @covers \Magento\Bundle\Helper\Catalog\Product\Configuration::getSelectionFinalPrice
      */
     public function testGetSelectionFinalPrice()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php
index b70c5fc5e730ecf9f83a7e9eb52e498b1d4f1182..a7595da535d5f9ac71bdad675f75a2ef4c47281b 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php
@@ -58,7 +58,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Bundle\Model\Option::addSelection
+     * @covers \Magento\Bundle\Model\Option::addSelection
      */
     public function testAddSelection()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php
index fef8d5b8006ed4f72c2aaca91fbde4af0e2bd33b..584eb71c4893e98a3a88f86c8e6ec1d8aef2acb6 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php
@@ -68,7 +68,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
+     * @covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
      */
     public function testGetOptionTextForExistLabel()
     {
@@ -78,7 +78,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
+     * @covers \Magento\Bundle\Model\Product\Attribute\Source\Price\View::getOptionText
      */
     public function testGetOptionTextForNotExistLabel()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
index b9655df8181cc90bb13470f413b8b83ee5eceefb..8db5283f5b38d2b0048695c64c0897b33b2316b6 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
@@ -95,8 +95,8 @@ class PriceTest extends \PHPUnit_Framework_TestCase
      * @param bool $dateInInterval
      * @param float $expected
      *
-     * covers \Magento\Bundle\Model\Product\Price::calculateSpecialPrice
-     * covers \Magento\Bundle\Model\Product\Price::__construct
+     * @covers \Magento\Bundle\Model\Product\Price::calculateSpecialPrice
+     * @covers \Magento\Bundle\Model\Product\Price::__construct
      * @dataProvider calculateSpecialPrice
      */
     public function testCalculateSpecialPrice($finalPrice, $specialPrice, $callsNumber, $dateInInterval, $expected)
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
index 9a438011c6404c901720b09a3b591174528db63c..f1cbd5196abe41a5ed67980146da518d2a517eb3 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -74,7 +74,7 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Bundle\Pricing\Price\TierPrice::isFirstPriceBetter
+     * @covers \Magento\Bundle\Pricing\Price\TierPrice::isFirstPriceBetter
      * @dataProvider providerForGetterTierPriceList
      */
     public function testGetterTierPriceList($tierPrices, $basePrice, $expectedResult)
diff --git a/app/code/Magento/Captcha/Test/Unit/Helper/Adminhtml/DataTest.php b/app/code/Magento/Captcha/Test/Unit/Helper/Adminhtml/DataTest.php
index a073c452954efdb249a3c6660614c7a19b10f95e..8385a018b79910bee97da9b3e5686628290843e8 100644
--- a/app/code/Magento/Captcha/Test/Unit/Helper/Adminhtml/DataTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Helper/Adminhtml/DataTest.php
@@ -47,7 +47,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Helper\Adminhtml\Data::_getWebsiteCode
+     * @covers \Magento\Captcha\Helper\Adminhtml\Data::_getWebsiteCode
      */
     public function testGetWebsiteId()
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php b/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
index 032907fed83b71e815fc416c10dcea390458a93f..2e4452bc096686830b57a14f9293c0e1aed4e092 100644
--- a/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
@@ -46,7 +46,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Helper\Data::getCaptcha
+     * @covers \Magento\Captcha\Helper\Data::getCaptcha
      */
     public function testGetCaptcha()
     {
@@ -81,7 +81,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Helper\Data::getConfig
+     * @covers \Magento\Captcha\Helper\Data::getConfig
      */
     public function testGetConfigNode()
     {
@@ -137,8 +137,8 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getImgDir
-     * covers \Magento\Captcha\Helper\Data::getImgDir
+     * @covers \Magento\Captcha\Model\DefaultModel::getImgDir
+     * @covers \Magento\Captcha\Helper\Data::getImgDir
      */
     public function testGetImgDir()
     {
@@ -177,8 +177,8 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getImgUrl
-     * covers \Magento\Captcha\Helper\Data::getImgUrl
+     * @covers \Magento\Captcha\Model\DefaultModel::getImgUrl
+     * @covers \Magento\Captcha\Helper\Data::getImgUrl
      */
     public function testGetImgUrl()
     {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index e1c2b07fad3404a0253cfc49c8d6143f663672f7..d195bd29bf24fd141af8b1ab3fa2fe4f1578c80d 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -136,7 +136,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getBlockName
+     * @covers \Magento\Captcha\Model\DefaultModel::getBlockName
      */
     public function testGetBlockName()
     {
@@ -144,7 +144,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::isRequired
+     * @covers \Magento\Captcha\Model\DefaultModel::isRequired
      */
     public function testIsRequired()
     {
@@ -152,7 +152,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::isCaseSensitive
+     * @covers \Magento\Captcha\Model\DefaultModel::isCaseSensitive
      */
     public function testIsCaseSensitive()
     {
@@ -163,7 +163,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getFont
+     * @covers \Magento\Captcha\Model\DefaultModel::getFont
      */
     public function testGetFont()
     {
@@ -171,8 +171,8 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getTimeout
-     * covers \Magento\Captcha\Model\DefaultModel::getExpiration
+     * @covers \Magento\Captcha\Model\DefaultModel::getTimeout
+     * @covers \Magento\Captcha\Model\DefaultModel::getExpiration
      */
     public function testGetTimeout()
     {
@@ -180,7 +180,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::isCorrect
+     * @covers \Magento\Captcha\Model\DefaultModel::isCorrect
      */
     public function testIsCorrect()
     {
@@ -193,7 +193,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getImgSrc
+     * @covers \Magento\Captcha\Model\DefaultModel::getImgSrc
      */
     public function testGetImgSrc()
     {
@@ -204,7 +204,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::logAttempt
+     * @covers \Magento\Captcha\Model\DefaultModel::logAttempt
      */
     public function testLogAttempt()
     {
@@ -221,7 +221,7 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Captcha\Model\DefaultModel::getWord
+     * @covers \Magento\Captcha\Model\DefaultModel::getWord
      */
     public function testGetWord()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
index f055d2ddad4fc32da1ea38876896fc51a78dc741..51ffc7e98d1be02fdcd1967fb027b3b79fe0010f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -94,8 +94,8 @@ class AbstractCategoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getStore
-     * covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getSaveUrl
+     * @covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getStore
+     * @covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getSaveUrl
      */
     public function testGetSaveUrl()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
index 36c0b45138afb9fb2655757292778725d635ee85..3ccc88ca231410e3c7140b9f87f9c604bdd9dd38 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
@@ -74,8 +74,8 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method getProductPrice
      *
-     * covers \Magento\Catalog\Block\Product\AbstractProduct::getProductPriceHtml
-     * covers \Magento\Catalog\Block\Product\AbstractProduct::getProductPrice
+     * @covers \Magento\Catalog\Block\Product\AbstractProduct::getProductPriceHtml
+     * @covers \Magento\Catalog\Block\Product\AbstractProduct::getProductPrice
      */
     public function testGetProductPrice()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
index 8c3396eb54daaf0915b886c944c8b6d1c0d800cf..78cd0113a6afd567261cbfd3df05a8db1ec16500 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -105,7 +105,7 @@ class HelperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::initialize
+     * @covers \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::initialize
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testInitialize()
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/StockDataFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/StockDataFilterTest.php
index c04da2b78aefee6db05fbd3578eebfa92bac422a..605749f143b72f65a47d10c0e31ca12c509ddb02 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/StockDataFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/StockDataFilterTest.php
@@ -51,7 +51,7 @@ class StockDataFilterTest extends \PHPUnit_Framework_TestCase
      * @param array $inputStockData
      * @param array $outputStockData
      *
-     * covers Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter::filter
+     * @covers \Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter::filter
      * @dataProvider filterDataProvider
      */
     public function testFilter(array $inputStockData, array $outputStockData)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ConfigTest.php
index ad9c4980fd9bd63257aaaf1b0bed92ab08021c49..a74f7fef63ea8e4a917f7d57c2cc65e393b776c9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ConfigTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Unit\Model;
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers Magento\Catalog\Model\Config::loadAttributeSets
+     * @covers \Magento\Catalog\Model\Config::loadAttributeSets
      * @return object
      */
     public function testLoadAttributeSets()
@@ -50,7 +50,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @depends testLoadAttributeSets
-     * covers Magento\Catalog\Model\Config::getAttributeSetName
+     * @covers \Magento\Catalog\Model\Config::getAttributeSetName
      */
     public function testGetAttributeSetName($model)
     {
@@ -59,7 +59,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
     /**
      * @depends testLoadAttributeSets
-     * covers Magento\Catalog\Model\Config::getAttributeSetId
+     * @covers \Magento\Catalog\Model\Config::getAttributeSetId
      */
     public function testGetAttributeSetId($model)
     {
@@ -68,7 +68,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::loadAttributeGroups
+     * @covers \Magento\Catalog\Model\Config::loadAttributeGroups
      * @return object
      */
     public function testLoadAttributeGroups()
@@ -112,7 +112,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @depends testLoadAttributeGroups
-     * covers Magento\Catalog\Model\Config::getAttributeGroupName
+     * @covers \Magento\Catalog\Model\Config::getAttributeGroupName
      */
     public function testGetAttributeGroupName($model)
     {
@@ -121,7 +121,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
     /**
      * @depends testLoadAttributeGroups
-     * covers Magento\Catalog\Model\Config::getAttributeGroupId
+     * @covers \Magento\Catalog\Model\Config::getAttributeGroupId
      */
     public function testGetAttributeGroupId($model)
     {
@@ -130,7 +130,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::loadProductTypes
+     * @covers \Magento\Catalog\Model\Config::loadProductTypes
      * @return object
      */
     public function testLoadProductTypes()
@@ -153,7 +153,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @depends testLoadProductTypes
-     * covers Magento\Catalog\Model\Config::getProductTypeId
+     * @covers \Magento\Catalog\Model\Config::getProductTypeId
      */
     public function testGetProductTypeId($model)
     {
@@ -163,7 +163,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @depends testLoadProductTypes
-     * covers Magento\Catalog\Model\Config::getProductTypeName
+     * @covers \Magento\Catalog\Model\Config::getProductTypeName
      */
     public function testGetProductTypeName($model)
     {
@@ -176,7 +176,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      * @param $data
      * @param $search
      *
-     * covers Magento\Catalog\Model\Config::getSourceOptionId
+     * @covers \Magento\Catalog\Model\Config::getSourceOptionId
      * @dataProvider getSourceOptionIdDataProvider
      */
     public function testGetSourceOptionId($expected, $data, $search)
@@ -263,7 +263,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::getAttributesUsedInProductListing
+     * @covers \Magento\Catalog\Model\Config::getAttributesUsedInProductListing
      * return object
      */
     public function testGetAttributesUsedInProductListing()
@@ -275,7 +275,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @depends testGetAttributesUsedInProductListing
-     * covers Magento\Catalog\Model\Config::getProductAttributes
+     * @covers \Magento\Catalog\Model\Config::getProductAttributes
      */
     public function testGetProductAttributes($model)
     {
@@ -283,7 +283,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::getAttributesUsedForSortBy
+     * @covers \Magento\Catalog\Model\Config::getAttributesUsedForSortBy
      */
     public function testGetAttributesUsedForSortBy()
     {
@@ -292,7 +292,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::getAttributeUsedForSortByArray
+     * @covers \Magento\Catalog\Model\Config::getAttributeUsedForSortByArray
      */
     public function testGetAttributeUsedForSortByArray()
     {
@@ -301,7 +301,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\Catalog\Model\Config::getProductListDefaultSortBy
+     * @covers \Magento\Catalog\Model\Config::getProductListDefaultSortBy
      */
     public function testGetProductListDefaultSortBy()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
index 2311783a0f141e231491b6e0a94a8b58f105e200..3871f40c01a21f9922229deccb683833c41b4015 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
@@ -54,8 +54,8 @@ class AvailabilityFlagTest extends \PHPUnit_Framework_TestCase
      * @param bool $expectedResult
      *
      * @dataProvider isEnabledDataProvider
-     * covers \Magento\Catalog\Model\Layer\Category\AvailabilityFlag::isEnabled
-     * covers \Magento\Catalog\Model\Layer\Category\AvailabilityFlag::canShowOptions
+     * @covers \Magento\Catalog\Model\Layer\Category\AvailabilityFlag::isEnabled
+     * @covers \Magento\Catalog\Model\Layer\Category\AvailabilityFlag::canShowOptions
      */
     public function testIsEnabled($itemsCount, $filters, $expectedResult)
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
index 20cb2395e6469f95cd444da69527ff746686020d..96d02813542880d863c5919261778aae4b6d7ca4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
@@ -37,8 +37,8 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Layer\Category\CollectionFilter::filter
-     * covers \Magento\Catalog\Model\Layer\Category\CollectionFilter::__construct
+     * @covers \Magento\Catalog\Model\Layer\Category\CollectionFilter::filter
+     * @covers \Magento\Catalog\Model\Layer\Category\CollectionFilter::__construct
      */
     public function testFilter()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
index 8a4018ef30ed4bf829c9b3976cedec7708c79131..58abff91ef06dae1938b4fabe5e89ffe7ec82d54 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
@@ -33,8 +33,8 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Layer\Category\StateKey::toString
-     * covers \Magento\Catalog\Model\Layer\Category\StateKey::__construct
+     * @covers \Magento\Catalog\Model\Layer\Category\StateKey::toString
+     * @covers \Magento\Catalog\Model\Layer\Category\StateKey::__construct
      */
     public function testToString()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
index af5ae499c331d8e909babee29a10f834b108d927..e962c36145330fe6ba482c250232a56ab80a5dcf 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
@@ -64,9 +64,9 @@ class FilterListTest extends \PHPUnit_Framework_TestCase
      * @param string $expectedClass
      * @dataProvider getFiltersDataProvider
      *
-     * covers \Magento\Catalog\Model\Layer\FilterList::getFilters
-     * covers \Magento\Catalog\Model\Layer\FilterList::createAttributeFilter
-     * covers \Magento\Catalog\Model\Layer\FilterList::__construct
+     * @covers \Magento\Catalog\Model\Layer\FilterList::getFilters
+     * @covers \Magento\Catalog\Model\Layer\FilterList::createAttributeFilter
+     * @covers \Magento\Catalog\Model\Layer\FilterList::__construct
      */
     public function testGetFilters($method, $value, $expectedClass)
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/CollectionFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/CollectionFilterTest.php
index ca0308fa8e077638d103a395514b025b1fe14fc8..1e9ac542cc1939d6c48d527aa3eed27616b8c024 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/CollectionFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/CollectionFilterTest.php
@@ -49,8 +49,8 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::filter
-     * covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::__construct
+     * @covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::filter
+     * @covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::__construct
      */
     public function testFilter()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
index 4919c1d22ba2b2fbd3bb0664890b0866d81ce37b..74dee9e602128a7ede3d30010cc2c70111c2403f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
@@ -61,7 +61,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Layer\Search\FilterableAttributeList::_prepareAttributeCollection()
+     * @covers \Magento\Catalog\Model\Layer\Search\FilterableAttributeList::_prepareAttributeCollection()
      */
     public function testGetList()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/StateKeyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/StateKeyTest.php
index c761c952c6ac46a112c0723f88398f3377615b13..bd90888a92adccef5e5e9d2fb7077496a500bdb7 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/StateKeyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/StateKeyTest.php
@@ -46,8 +46,8 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::toString
-     * covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::__construct
+     * @covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::toString
+     * @covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::__construct
      */
     public function testToString()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/LogTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/LogTest.php
index ecf31cfb88d256ab5ff8df7ace922686b2fd10b2..4c26baf8f9b745c9bd3c2f2ad3381c56135cbe87 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/LogTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/LogTest.php
@@ -42,7 +42,7 @@ class LogTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Plugin\Log::afterClean
+     * @covers \Magento\Catalog\Model\Plugin\Log::afterClean
      */
     public function testAfterClean()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
index 7fbfe0432f332c2aa428bb0711d2c6c50967b8d9..b173820dcff05e7d57b9fd9f9f89a4fbecfbcf59 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
@@ -20,7 +20,7 @@ class ReservedAttributeListTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Model\Product\ReservedAttributeList::isReservedAttribute
+     * @covers \Magento\Catalog\Model\Product\ReservedAttributeList::isReservedAttribute
      * @dataProvider dataProvider
      */
     public function testIsReservedAttribute($isUserDefined, $attributeCode, $expected)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
index 0f2c40e305d67c7496881ce3727c05ad888a37ef..473d3605648af8157546d6beb61c10127d52c331 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
@@ -103,9 +103,9 @@ class UrlTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider getUrlDataProvider
-     * covers Magento\Catalog\Model\Product\Url::getUrl
-     * covers Magento\Catalog\Model\Product\Url::getUrlInStore
-     * covers Magento\Catalog\Model\Product\Url::getProductUrl
+     * @covers \Magento\Catalog\Model\Product\Url::getUrl
+     * @covers \Magento\Catalog\Model\Product\Url::getUrlInStore
+     * @covers \Magento\Catalog\Model\Product\Url::getProductUrl
      *
      * @param $getUrlMethod
      * @param $routePath
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
index 0d37388ea0d8e7e59d5c662377a6b8844c520d79..bed320a21dc3c87a48fb29e9037c2a2ee8d62b96 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -110,10 +110,10 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
     /**
      * Test base initialization of tier price
      *
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getValue
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::canApplyTierPrice
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getValue
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::canApplyTierPrice
      * @dataProvider providerForBaseInitialization
      */
     public function testBaseInitialization($tierPrices, $expectedValue)
@@ -208,8 +208,8 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
     /**
      * Test getter stored tier prices from eav model
      *
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
      */
     public function testGetterStoredTierPrices()
     {
@@ -252,13 +252,13 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getTierPriceList
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::applyAdjustment
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getTierPriceCount
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::filterTierPrices
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getBasePrice
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getTierPriceList
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getStoredTierPrices
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::applyAdjustment
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getTierPriceCount
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::filterTierPrices
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getBasePrice
      * @dataProvider providerForGetterTierPriceList
      */
     public function testGetterTierPriceList($tierPrices, $basePrice, $expectedResult)
@@ -358,9 +358,9 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getSavePercent
-     * covers \Magento\Catalog\Pricing\Price\TierPrice::getBasePrice
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getSavePercent
+     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getBasePrice
      * @dataProvider dataProviderGetSavePercent
      */
     public function testGetSavePercent($basePrice, $tierPrice, $savedPercent)
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
index db437d612291d05474c6c714880dcc50bc66196e..57aa38a39d16721114a731920249284875dcb5cd 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
@@ -558,7 +558,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::getEntityTypeCode
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::getEntityTypeCode
      */
     public function testGetEntityTypeCode()
     {
@@ -566,15 +566,15 @@ class OptionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::importData
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_importData
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveOptions
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveTitles
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_savePrices
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypeValues
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypePrices
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypeTitles
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_updateProducts
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::importData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_importData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveOptions
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveTitles
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_savePrices
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypeValues
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypePrices
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveSpecificTypeTitles
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_updateProducts
      */
     public function testImportDataAppendBehavior()
     {
@@ -582,8 +582,8 @@ class OptionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_importData
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_deleteEntities
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_importData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_deleteEntities
      */
     public function testImportDataDeleteBehavior()
     {
@@ -632,7 +632,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for validation of row without custom option
      *
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isRowWithCustomOption
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isRowWithCustomOption
      */
     public function testValidateRowNoCustomOption()
     {
@@ -646,15 +646,15 @@ class OptionTest extends \PHPUnit_Framework_TestCase
      * @param array $rowData
      * @param array $errors
      *
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::validateRow
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isRowWithCustomOption
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isMainOptionRow
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isSecondaryOptionRow
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateMainRow
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateMainRowAdditionalData
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSecondaryRow
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSpecificTypeParameters
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSpecificParameterData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::validateRow
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isRowWithCustomOption
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isMainOptionRow
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_isSecondaryOptionRow
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateMainRow
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateMainRowAdditionalData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSecondaryRow
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSpecificTypeParameters
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_validateSpecificParameterData
      * @dataProvider validateRowDataProvider
      */
     public function testValidateRow(array $rowData, array $errors)
@@ -675,11 +675,11 @@ class OptionTest extends \PHPUnit_Framework_TestCase
      * @param string|null $behavior
      * @param int $numberOfValidations
      *
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::validateAmbiguousData
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findNewOptionsWithTheSameTitles
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findOldOptionsWithTheSameTitles
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findNewOldOptionsTypeMismatch
-     * covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveNewOptionData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::validateAmbiguousData
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findNewOptionsWithTheSameTitles
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findOldOptionsWithTheSameTitles
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_findNewOldOptionsTypeMismatch
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_saveNewOptionData
      * @dataProvider validateAmbiguousDataDataProvider
      */
     public function testValidateAmbiguousData(
diff --git a/app/code/Magento/Centinel/Test/Unit/Model/ServiceTest.php b/app/code/Magento/Centinel/Test/Unit/Model/ServiceTest.php
index 0d992a5643d7149dd601edd4faeef07446143c9a..e9b5237e16ead347fa64ebafda32d99533ba6392 100644
--- a/app/code/Magento/Centinel/Test/Unit/Model/ServiceTest.php
+++ b/app/code/Magento/Centinel/Test/Unit/Model/ServiceTest.php
@@ -12,8 +12,8 @@ namespace Magento\Centinel\Test\Unit\Model;
 class ServiceTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Centinel\Model\Service::getAuthenticationStartUrl
-     * covers \Magento\Centinel\Model\Service::_getUrl
+     * @covers \Magento\Centinel\Model\Service::getAuthenticationStartUrl
+     * @covers \Magento\Centinel\Model\Service::_getUrl
      */
     public function testGetAuthenticationStartUrl()
     {
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
index ea78661984115e725d71ff5f3153d51a093e688e..575eebc4188964d8eb8365f41068006d263e5e6f 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
@@ -114,8 +114,8 @@ class RendererTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Checkout\Block\Cart\Item\Renderer::getProductPriceHtml
-     * covers \Magento\Checkout\Block\Cart\Item\Renderer::getPriceRender
+     * @covers \Magento\Checkout\Block\Cart\Item\Renderer::getProductPriceHtml
+     * @covers \Magento\Checkout\Block\Cart\Item\Renderer::getPriceRender
      */
     public function testGetProductPriceHtml()
     {
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementTest.php
index b71c88d74d8c39378a6b1de98728fea18761a9dc..54c5119771cca6a4ede61a3f84360ad7f0440adf 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementTest.php
@@ -19,7 +19,7 @@ class AgreementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CheckoutAgreements\Model\Agreement::validateData
+     * @covers \Magento\CheckoutAgreements\Model\Agreement::validateData
      *
      * @dataProvider validateDataDataProvider
      * @param \Magento\Framework\Object $inputData
diff --git a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php
index 3b0d1837ed3b1dd99d33f5dc0bfe2bb7a3121e4d..4d6b28b79746db90ec65c329016cdc185f889b00 100644
--- a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Block\Adminhtml\Block;
 
 /**
- * covers \Magento\Cms\Block\Adminhtml\Block\Edit
+ * @covers \Magento\Cms\Block\Adminhtml\Block\Edit
  */
 class EditTest extends \PHPUnit_Framework_TestCase
 {
@@ -59,7 +59,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Block\Adminhtml\Block\Edit::getHeaderText
+     * @covers \Magento\Cms\Block\Adminhtml\Block\Edit::getHeaderText
      * @param integer|null $modelBlockId
      *
      * @dataProvider getHeaderTextDataProvider
diff --git a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
index d43a564165b9a5c91442b430ae381773e31f9453..0c075194e3330d099d7bb12b2427b971621f8a81 100644
--- a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Block\Adminhtml\Block\Widget;
 
 /**
- * covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser
+ * @covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser
  */
 class ChooserTest extends \PHPUnit_Framework_TestCase
 {
@@ -127,7 +127,7 @@ class ChooserTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser::prepareElementHtml
+     * @covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser::prepareElementHtml
      * @param string $elementValue
      * @param integer|null $modelBlockId
      *
@@ -231,7 +231,7 @@ class ChooserTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser::getGridUrl
+     * @covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser::getGridUrl
      */
     public function testGetGridUrl()
     {
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index feb1701022ff0619a8c61ee8ae8d385ab9d51adc..7d0ec584d46755e871a355c748937cccf94b2364 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -157,7 +157,7 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute
+     * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute
      */
     public function testExecute()
     {
@@ -193,7 +193,7 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute
+     * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute
      */
     public function testExecuteException()
     {
diff --git a/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php b/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
old mode 100755
new mode 100644
index d7c680fd689c462728719dddde67c65d6b9a53c7..4b7e6861eec6c399f4a4be17ee39f240d80b2caa
--- a/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Helper;
 
 /**
- * covers \Magento\Cms\Helper\Page
+ * @covers \Magento\Cms\Helper\Page
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -208,7 +208,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Helper\Page::prepareResultPage
+     * @covers \Magento\Cms\Helper\Page::prepareResultPage
      * @param integer|null $pageId
      * @param integer|null $internalPageId
      * @param integer $pageLoadResultIndex
@@ -422,7 +422,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Helper\Page::getPageUrl
+     * @covers \Magento\Cms\Helper\Page::getPageUrl
      * @param integer|null $pageId
      * @param integer|null $internalPageId
      * @param integer $pageLoadResultIndex
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Cms/Test/Unit/Model/ObserverTest.php
index 80950d4e02fb0638adaf04263715f5126b13eb9d..f18bd6c6d5d3fb4ccb53a834df8be66a16d93854 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ObserverTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Model;
 
 /**
- * covers \Magento\Cms\Model\Observer
+ * @covers \Magento\Cms\Model\Observer
  */
 class ObserverTest extends \PHPUnit_Framework_TestCase
 {
@@ -92,7 +92,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Observer::noRoute
+     * @covers \Magento\Cms\Model\Observer::noRoute
      */
     public function testNoRoute()
     {
@@ -129,7 +129,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Observer::noCookies
+     * @covers \Magento\Cms\Model\Observer::noCookies
      * @param string $pageUrl
      * @dataProvider noCookiesDataProvider
      */
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
index 6fd6dd57d8b9b647ae1d62fef1607fb14e16775f..8d08e7402b896f5dd655380a0d5a831389c30538 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Model;
 
 /**
- * covers \Magento\Cms\Model\Page
+ * @covers \Magento\Cms\Model\Page
  */
 class PageTest extends \PHPUnit_Framework_TestCase
 {
@@ -91,7 +91,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Page::noRoutePage
+     * @covers \Magento\Cms\Model\Page::noRoutePage
      */
     public function testNoRoutePage()
     {
@@ -99,7 +99,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Page::checkIdentifier
+     * @covers \Magento\Cms\Model\Page::checkIdentifier
      */
     public function testCheckIdentifier()
     {
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterProviderTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterProviderTest.php
index e43575d48ac3b92f2f4f92a8c7bdf62b67f00ce8..284b8e68874a89d1a7204b2fc3eb480276bc84ee 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterProviderTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterProviderTest.php
@@ -31,7 +31,7 @@ class FilterProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Template\FilterProvider::getBlockFilter
+     * @covers \Magento\Cms\Model\Template\FilterProvider::getBlockFilter
      */
     public function testGetBlockFilter()
     {
@@ -39,7 +39,7 @@ class FilterProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
+     * @covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
      */
     public function testGetPageFilter()
     {
@@ -47,7 +47,7 @@ class FilterProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
+     * @covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
      */
     public function testGetPageFilterInnerCache()
     {
@@ -57,7 +57,7 @@ class FilterProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
+     * @covers \Magento\Cms\Model\Template\FilterProvider::getPageFilter
      * @expectedException \Exception
      */
     public function testGetPageWrongInstance()
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
index 6ce36d5834508fb871e05d76aba012578c7bc45e..f5c4a7b15637e518d2f81c5b3f0dcce828be8ed3 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Model\Template;
 
 /**
- * covers \Magento\Cms\Model\Template\Filter
+ * @covers \Magento\Cms\Model\Template\Filter
  */
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -44,7 +44,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Template\Filter::mediaDirective
+     * @covers \Magento\Cms\Model\Template\Filter::mediaDirective
      */
     public function testMediaDirective()
     {
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
index bcaf1187a3d1453946c90cdf206e9413e3bfd691..f939b8dc6006a10d757183440589a0531a0daa88 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Test\Unit\Model\Wysiwyg;
 
 /**
- * covers \Magento\Cms\Model\Wysiwyg\Config
+ * @covers \Magento\Cms\Model\Wysiwyg\Config
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
@@ -116,7 +116,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Config::getConfig
+     * @covers \Magento\Cms\Model\Wysiwyg\Config::getConfig
      * @param array $data
      * @param boolean $isAuthorizationAllowed
      * @param array $expectedResults
@@ -187,7 +187,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Config::getSkinImagePlaceholderPath
+     * @covers \Magento\Cms\Model\Wysiwyg\Config::getSkinImagePlaceholderPath
      */
     public function testGetSkinImagePlaceholderPath()
     {
@@ -213,7 +213,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Config::isEnabled
+     * @covers \Magento\Cms\Model\Wysiwyg\Config::isEnabled
      * @param string $wysiwygState
      * @param boolean $expectedResult
      *
@@ -245,7 +245,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Config::isHidden
+     * @covers \Magento\Cms\Model\Wysiwyg\Config::isHidden
      * @param string $status
      * @param boolean $expectedResult
      *
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 2e890e13e92af72e8e69c137a56b7aeabc6c3a84..f06f1346e7b960dd8b3099ede27862ee4e9e3c3f 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -225,7 +225,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Images\Storage::getResizeWidth
+     * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::getResizeWidth
      */
     public function testGetResizeWidth()
     {
@@ -233,7 +233,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Images\Storage::getResizeHeight
+     * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::getResizeHeight
      */
     public function testGetResizeHeight()
     {
@@ -241,7 +241,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
      */
     public function testDeleteDirectoryOverRoot()
     {
@@ -253,7 +253,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
      */
     public function testDeleteRootDirectory()
     {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
index 7837c811df305141807f92c816cc06155298ee00..ec6f760539217ba90f229ed0728b77d6e6350460 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
@@ -172,7 +172,7 @@ class LoginPostTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Customer\Controller\Account::getAllowedActions
+     * @covers \Magento\Customer\Controller\Account::getAllowedActions
      * @return void
      */
     public function testGetAllowedActions()
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php
index 0ee06c93a5ee802dfdfd0fa4d582d72e7d59bccd..c65ced0ca675d39810394b2217b2fdc16fe02722 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php
@@ -247,7 +247,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method exportItem()
      *
-     * covers \Magento\CustomerImportExport\Model\Export\Address::exportItem
+     * @covers \Magento\CustomerImportExport\Model\Export\Address::exportItem
      */
     public function testExportItem()
     {
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php
index 1772c6d834613ed8bfd17822b1cbcd58b5e0e74c..69980ac8e37d86388070b7b01c9a4fbcead37225 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php
@@ -186,7 +186,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method exportItem()
      *
-     * covers \Magento\CustomerImportExport\Model\Export\Customer::exportItem
+     * @covers \Magento\CustomerImportExport\Model\Export\Customer::exportItem
      */
     public function testExportItem()
     {
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
index 0b6e24e1920e5179f14a31b03902552eee6bf58b..bcfdb86cdf64d6cd64b388e0ced47f1a27e2a006 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
@@ -565,8 +565,8 @@ class AddressTest extends \PHPUnit_Framework_TestCase
      * Test Address::validateRow()
      * with 2 rows with identical PKs in case when add/update behavior is performed
      *
-     * covers \Magento\CustomerImportExport\Model\Import\Address::validateRow
-     * covers \Magento\CustomerImportExport\Model\Import\Address::_validateRowForUpdate
+     * @covers \Magento\CustomerImportExport\Model\Import\Address::validateRow
+     * @covers \Magento\CustomerImportExport\Model\Import\Address::_validateRowForUpdate
      */
     public function testValidateRowForUpdateDuplicateRows()
     {
@@ -615,7 +615,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
     /**
      * Test Address::validateRow() with delete action
      *
-     * covers \Magento\CustomerImportExport\Model\Import\Address::validateRow
+     * @covers \Magento\CustomerImportExport\Model\Import\Address::validateRow
      * @dataProvider validateRowForDeleteDataProvider
      *
      * @param array $rowData
@@ -664,7 +664,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
     /**
      * Test if correct methods are invoked according to different custom behaviours
      *
-     * covers \Magento\CustomerImportExport\Model\Import\Address::_importData
+     * @covers \Magento\CustomerImportExport\Model\Import\Address::_importData
      */
     public function testImportDataWithCustomBehaviour()
     {
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Resource/Import/CustomerComposite/DataTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Resource/Import/CustomerComposite/DataTest.php
index f99869e4f20c4754a079e9b23c495746e20c8327..a6f971e272dce792bfa5e6a7a4f09ab723805221 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Resource/Import/CustomerComposite/DataTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Resource/Import/CustomerComposite/DataTest.php
@@ -82,9 +82,9 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::getNextBunch
-     * covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::_prepareRow
-     * covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::_prepareAddressRowData
+     * @covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::getNextBunch
+     * @covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::_prepareRow
+     * @covers \Magento\CustomerImportExport\Model\Resource\Import\CustomerComposite\Data::_prepareAddressRowData
      *
      * @dataProvider getNextBunchDataProvider
      * @param string $entityType
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/ContainerTest.php b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/ContainerTest.php
index 058d4d55ee52488e692d3fae61497bd898f55ac7..232781b829ad001fe8385ed6c25761cf903e8e90 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/ContainerTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/ContainerTest.php
@@ -37,8 +37,8 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::setFrameUrl
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::getFrameUrl
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::setFrameUrl
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::getFrameUrl
      */
     public function testGetSetFrameUrl()
     {
@@ -52,7 +52,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::_prepareLayout
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Container::_prepareLayout
      */
     public function testPrepareLayout()
     {
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/CustomTest.php b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
index f8538e3a5e63104270184075abee07abc5605d48..079eec5479836f6b5a5d00e3e595a9d7e6bac8fb 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
@@ -80,7 +80,7 @@ class CustomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Custom::getDownloadCustomCssUrl
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Custom::getDownloadCustomCssUrl
      */
     public function testGetDownloadCustomCssUrl()
     {
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/JsTest.php b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/JsTest.php
index 78af39c17b9799798221a35ba3ec1d6af39c46de..bc4862eb8c8941bb74e80ba0536c0c1d24c49640 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/JsTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/Editor/Tools/Code/JsTest.php
@@ -88,7 +88,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getJsUploadUrl
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getJsUploadUrl
      */
     public function testGetDownloadCustomCssUrl()
     {
@@ -108,7 +108,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getJsReorderUrl
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getJsReorderUrl
      */
     public function testGetJsReorderUrl()
     {
@@ -128,7 +128,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getTitle
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getTitle
      */
     public function testGetTitle()
     {
@@ -136,7 +136,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getFiles
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js::getFiles
      */
     public function testGetJsFiles()
     {
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/ThemeTest.php b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/ThemeTest.php
index 2c50ead0e4bdd2759d001d9d6fdd564ac2a2a04b..bd36831dc0ef319c1f9283b7c97409755adaddf0 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/ThemeTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Block/Adminhtml/ThemeTest.php
@@ -8,9 +8,9 @@ namespace Magento\DesignEditor\Test\Unit\Block\Adminhtml;
 class ThemeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\DesignEditor\Block\Adminhtml\Theme::addButton
-     * covers \Magento\DesignEditor\Block\Adminhtml\Theme::clearButtons
-     * covers \Magento\DesignEditor\Block\Adminhtml\Theme::getButtonsHtml
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Theme::addButton
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Theme::clearButtons
+     * @covers \Magento\DesignEditor\Block\Adminhtml\Theme::getButtonsHtml
      */
     public function testButtons()
     {
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/BackgroundImageTest.php b/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/BackgroundImageTest.php
index c7afc969bbfffab72a7c64de3ee137c0f38f674c..72f8a22da0ca8a75859a06f98b508fe1f7ec9e64 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/BackgroundImageTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/BackgroundImageTest.php
@@ -12,7 +12,7 @@ namespace Magento\DesignEditor\Test\Unit\Model\Editor\QuickStyles\Renderer;
 class BackgroundImageTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\BackgroundImage::toCss
+     * @covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\BackgroundImage::toCss
      * @dataProvider backgroundImageData
      */
     public function testToCss($expectedResult, $data)
@@ -30,7 +30,7 @@ class BackgroundImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\BackgroundImage::toCss
+     * @covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\BackgroundImage::toCss
      * @dataProvider backgroundImageDataClearDefault
      */
     public function testToCssClearDefault($expectedResult, $data)
diff --git a/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/DefaultTest.php b/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/DefaultTest.php
index 1d471ac5a59e1e290d308bb2695f326fc38bcfb6..26c8e109038b575879706e370f855cb5c4efaabd 100644
--- a/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/DefaultTest.php
+++ b/app/code/Magento/DesignEditor/Test/Unit/Model/Editor/QuickStyles/Renderer/DefaultTest.php
@@ -12,7 +12,7 @@ namespace Magento\DesignEditor\Test\Unit\Model\Editor\QuickStyles\Renderer;
 class DefaultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\DefaultRenderer::toCss
+     * @covers \Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer\DefaultRenderer::toCss
      * @dataProvider colorPickerData
      */
     public function testToCss($expectedResult, $data)
diff --git a/app/code/Magento/Eav/Test/Unit/Helper/DataTest.php b/app/code/Magento/Eav/Test/Unit/Helper/DataTest.php
index 85191d49f74409a1c1c002b5d6680ec9a80e089e..bfe1c345dc78cec4b2c81ab77b43f1bd3eb0032a 100644
--- a/app/code/Magento/Eav/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Helper/DataTest.php
@@ -67,8 +67,8 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Helper\Data::getFrontendClasses
-     * covers \Magento\Eav\Helper\Data::_getDefaultFrontendClasses
+     * @covers \Magento\Eav\Helper\Data::getFrontendClasses
+     * @covers \Magento\Eav\Helper\Data::_getDefaultFrontendClasses
      */
     public function testGetFrontendClasses()
     {
@@ -79,7 +79,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Helper\Data::getAttributeLockedFields
+     * @covers \Magento\Eav\Helper\Data::getAttributeLockedFields
      */
     public function testGetAttributeLockedFieldsNoEntityCode()
     {
@@ -88,7 +88,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Helper\Data::getAttributeLockedFields
+     * @covers \Magento\Eav\Helper\Data::getAttributeLockedFields
      */
     public function testGetAttributeLockedFieldsNonCachedLockedFiled()
     {
@@ -100,7 +100,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Helper\Data::getAttributeLockedFields
+     * @covers \Magento\Eav\Helper\Data::getAttributeLockedFields
      */
     public function testGetAttributeLockedFieldsCachedLockedFiled()
     {
@@ -114,7 +114,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Helper\Data::getAttributeLockedFields
+     * @covers \Magento\Eav\Helper\Data::getAttributeLockedFields
      */
     public function testGetAttributeLockedFieldsNoLockedFields()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/AbstractDataTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/AbstractDataTest.php
index 21107ccaf8d5066e1b942e50814108c4edeab97b..dea0ef0f1e430708d3763660532ed0a4086eb146 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/AbstractDataTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/AbstractDataTest.php
@@ -29,8 +29,8 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::getEntity
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::setEntity
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::getEntity
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::setEntity
      */
     public function testGetEntity()
     {
@@ -43,7 +43,7 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Entity object is undefined
      *
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::getEntity
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::getEntity
      */
     public function testGetEntityWhenEntityNotSet()
     {
@@ -51,8 +51,8 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::getExtractedData
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::setExtractedData
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::getExtractedData
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::setExtractedData
      *
      * @param string $index
      * @param mixed $expectedResult
@@ -88,7 +88,7 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\AbstractData::_getRequestValue
+     * @covers \Magento\Eav\Model\Attribute\Data\AbstractData::_getRequestValue
      *
      * @param string $requestScope
      * @param string $value
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/BooleanTest.php
index d5fbb948539950066a76a876e51bd675d7a8bf8a..0633716c029839c59d6794ae0aac565ac5a26995 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/BooleanTest.php
@@ -22,7 +22,7 @@ class BooleanTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Boolean::_getOptionText
+     * @covers \Magento\Eav\Model\Attribute\Data\Boolean::_getOptionText
      *
      * @param string $format
      * @param mixed $value
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/DateTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/DateTest.php
index 7bf65f0ba3e1edade9c346643e13375f6b5541a2..bef0db9bd32329b9a9d7ddb7e933f8901edf2c75 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/DateTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/DateTest.php
@@ -23,11 +23,15 @@ class DateTest extends \PHPUnit_Framework_TestCase
         $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
         $localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
 
-        $this->model = new \Magento\Eav\Model\Attribute\Data\Date($this->timezoneMock, $loggerMock, $localeResolverMock);
+        $this->model = new \Magento\Eav\Model\Attribute\Data\Date(
+            $this->timezoneMock,
+            $loggerMock,
+            $localeResolverMock
+        );
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Date::outputValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Date::outputValue
      *
      * @param string $format
      * @param mixed $value
@@ -70,7 +74,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Date::validateValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Date::validateValue
      *
      * @param mixed $value
      * @param array $rules
@@ -146,7 +150,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Date::compactValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Date::compactValue
      *
      * @param string $value
      * @param string $expectedResult
@@ -177,7 +181,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Date::compactValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Date::compactValue
      */
     public function testCompactValueWithFalseValue()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
index 1819870bcd0309321962ab7b72a33a5d8ab1408c..b7c7504fdd04fcaaca9da6ed70977720c430e243 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
@@ -43,7 +43,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\File::outputValue
+     * @covers \Magento\Eav\Model\Attribute\Data\File::outputValue
      *
      * @param string $format
      * @param mixed $value
@@ -94,8 +94,8 @@ class FileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\File::validateValue
-     * covers \Magento\Eav\Model\Attribute\Data\File::_validateByRules
+     * @covers \Magento\Eav\Model\Attribute\Data\File::validateValue
+     * @covers \Magento\Eav\Model\Attribute\Data\File::_validateByRules
      *
      * @param mixed $value
      * @param mixed $originalValue
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
index 1d57f9b066cb6e8a2b1d20f215c9bc95a1598066..44ec2364980d068a7751ffc98374360e0281744e 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
@@ -36,7 +36,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      * Attention: this test depends on mock of "is_uploaded_file" function in ./FileTest.php,
      * so validates method successfully in batch run of directory tests, separately will fail.
      *
-     * covers \Magento\Eav\Model\Attribute\Data\Image::_validateByRules
+     * @covers \Magento\Eav\Model\Attribute\Data\Image::_validateByRules
      *
      * @param mixed $value
      * @param mixed $originalValue
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
index 091293f4c97e23cbb02823d91f55912e9c3e7e7f..c4ec4af05058892035ae407bcc7a813c8e33d55f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
@@ -24,11 +24,16 @@ class MultilineTest extends \PHPUnit_Framework_TestCase
         $localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
         $this->stringMock = $this->getMock('\Magento\Framework\Stdlib\String', [], [], '', false);
 
-        $this->model = new \Magento\Eav\Model\Attribute\Data\Multiline($timezoneMock, $loggerMock, $localeResolverMock, $this->stringMock);
+        $this->model = new \Magento\Eav\Model\Attribute\Data\Multiline(
+            $timezoneMock,
+            $loggerMock,
+            $localeResolverMock,
+            $this->stringMock
+        );
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Multiline::extractValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::extractValue
      *
      * @param mixed $param
      * @param mixed $expectedResult
@@ -64,7 +69,7 @@ class MultilineTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Multiline::outputValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::outputValue
      *
      * @param string $format
      * @param mixed $expectedResult
@@ -108,8 +113,8 @@ class MultilineTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Multiline::validateValue
-     * covers \Magento\Eav\Model\Attribute\Data\Text::validateValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::validateValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Text::validateValue
      *
      * @param mixed $value
      * @param bool $isAttributeRequired
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultiselectTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultiselectTest.php
index 909ebe782e76272ea28ae1c07e5ad7af809a74fa..535343e60dccfac3925206395d04bb17ef922898 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultiselectTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultiselectTest.php
@@ -18,11 +18,15 @@ class MultiselectTest extends \PHPUnit_Framework_TestCase
         $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
         $localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
 
-        $this->model = new \Magento\Eav\Model\Attribute\Data\Multiselect($timezoneMock, $loggerMock, $localeResolverMock);
+        $this->model = new \Magento\Eav\Model\Attribute\Data\Multiselect(
+            $timezoneMock,
+            $loggerMock,
+            $localeResolverMock
+        );
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Multiselect::extractValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Multiselect::extractValue
      *
      * @param mixed $param
      * @param mixed $expectedResult
@@ -62,7 +66,7 @@ class MultiselectTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Multiselect::outputValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Multiselect::outputValue
      *
      * @param string $format
      * @param mixed $expectedResult
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/SelectTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/SelectTest.php
index 4ef6f7c615e30f11a60eb88428dc88e100be6434..47ebb1c766c7dd89649ef13e5861f016acaa8d1c 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/SelectTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/SelectTest.php
@@ -22,7 +22,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Select::outputValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Select::outputValue
      *
      * @param string $format
      * @param mixed $value
@@ -70,7 +70,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Select::validateValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Select::validateValue
      *
      * @param mixed $value
      * @param mixed $originalValue
@@ -132,7 +132,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Select::compactValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Select::compactValue
      */
     public function testCompactValue()
     {
@@ -148,7 +148,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Attribute\Data\Select::compactValue
+     * @covers \Magento\Eav\Model\Attribute\Data\Select::compactValue
      */
     public function testCompactValueWithFalseValue()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
index fb5a4048a73d2603ebc763e22d9d002d8fb3ebc3..bbb578c31492430cdc84a4e9eb5e0979e3d323f4 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
@@ -43,7 +43,7 @@ class AttributeFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\AttributeFactory::createAttribute
+     * @covers \Magento\Eav\Model\AttributeFactory::createAttribute
      */
     public function testCreateAttribute()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
index ed531b86d23ad759debeed1e59cc9064e5ea03e9..12ce30d94c25a3ee7a281e72b257a18f65ef5a52 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -53,7 +53,7 @@ class BooleanTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Entity\Attribute\Source\Boolean::addValueSortToCollection
+     * @covers \Magento\Eav\Model\Entity\Attribute\Source\Boolean::addValueSortToCollection
      *
      * @dataProvider addValueSortToCollectionDataProvider
      * @param string $direction
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Resource/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Resource/Entity/AttributeTest.php
index acd0d2ecfbf720b8952f20081e43d91d0fc44204..bcc3efc76a954fea06a3d936d833ce74b9daebb1 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Resource/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Resource/Entity/AttributeTest.php
@@ -11,7 +11,7 @@ namespace Magento\Eav\Test\Unit\Model\Resource\Entity;
 class AttributeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
+     * @covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
      */
     public function testSaveOptionSystemAttribute()
     {
@@ -80,7 +80,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
+     * @covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
      */
     public function testSaveOptionNewUserDefinedAttribute()
     {
@@ -174,7 +174,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
+     * @covers \Magento\Eav\Model\Resource\Entity\Attribute::_saveOption
      */
     public function testSaveOptionNoValue()
     {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
index c849b1de1789ed9101e1d2fdc139b7d5900fc5cb..caaa76db8362447af861b1cb9d91a357fc174595 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
@@ -63,7 +63,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getProduct
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getProduct
      */
     public function testGetProductPositive()
     {
@@ -86,7 +86,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getProduct
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getProduct
      */
     public function testGetProductNegative()
     {
@@ -130,7 +130,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getAssociatedProducts
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getAssociatedProducts
      */
     public function testGetAssociatedProducts()
     {
@@ -166,7 +166,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::setPreconfiguredValue
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::setPreconfiguredValue
      */
     public function testSetPreconfiguredValue()
     {
@@ -213,7 +213,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getCanShowProductPrice
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getCanShowProductPrice
      */
     public function testGetCanShowProductPrice()
     {
@@ -221,7 +221,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getIsLastFieldset
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getIsLastFieldset
      */
     public function testGetIsLastFieldsetPositive()
     {
@@ -236,7 +236,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
      * @param array|bool $options
      * @param bool $expectedResult
      *
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getIsLastFieldset
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getIsLastFieldset
      * @dataProvider getIsLastFieldsetDataProvider
      */
     public function testGetIsLastFieldsetNegative($options, $expectedResult)
@@ -274,7 +274,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getCurrencyPrice
+     * @covers \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped::getCurrencyPrice
      */
     public function testGetCurrencyPrice()
     {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProducts/ListAssociatedProductsTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProducts/ListAssociatedProductsTest.php
index 804cb62c857576b450747716d4fb6e1afc63b616..f03cf75237208d909dafd7d6a8670165656466d2 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProducts/ListAssociatedProductsTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProducts/ListAssociatedProductsTest.php
@@ -72,11 +72,15 @@ class ListAssociatedProductsTest extends \PHPUnit_Framework_TestCase
 
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
 
-        $this->block = new \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts($this->contextMock, $this->registryMock, $this->priceCurrency);
+        $this->block = new \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts(
+            $this->contextMock,
+            $this->registryMock,
+            $this->priceCurrency
+        );
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts
+     * @covers \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts
      *     ::getAssociatedProducts
      */
     public function testGetAssociatedProducts()
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProductsTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProductsTest.php
index 633b0025153e1889a5879990fc25d6611e93c72a..b32cded0747f95689d722fb37f9b34f5700a2fce 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProductsTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/Grouped/AssociatedProductsTest.php
@@ -24,7 +24,7 @@ class AssociatedProductsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts::getParentTab
+     * @covers \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts::getParentTab
      */
     public function testGetParentTab()
     {
@@ -32,7 +32,7 @@ class AssociatedProductsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts::getTabLabel
+     * @covers \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts::getTabLabel
      */
     public function testGetTabLabel()
     {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Helper/Product/Configuration/Plugin/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Helper/Product/Configuration/Plugin/GroupedTest.php
index 642b5345e23af33a8788f70e224d812383bed772..683477dfcec666667e9877c5c3b3c27e1c3feb84 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Helper/Product/Configuration/Plugin/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Helper/Product/Configuration/Plugin/GroupedTest.php
@@ -70,7 +70,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
+     * @covers \Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
      */
     public function testAroundGetOptionsGroupedProductWithAssociated()
     {
@@ -136,7 +136,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
+     * @covers \Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
      */
     public function testAroundGetOptionsGroupedProductWithoutAssociated()
     {
@@ -173,7 +173,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
+     * @covers \Magento\GroupedProduct\Helper\Product\Configuration\Plugin\Grouped::aroundGetOptions
      */
     public function testAroundGetOptionsAnotherProductType()
     {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
index fd02a7d501c8074cfa9e711da27377441dc892b7..3e9523d19787a4abd1fc652b1ed563e420603123 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
@@ -29,7 +29,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers Magento\GroupedProduct\Model\Product\Type\Grouped\Price::getFinalPrice
+     * @covers \Magento\GroupedProduct\Model\Product\Type\Grouped\Price::getFinalPrice
      */
     public function testGetFinalPriceIfQtyIsNullAndFinalPriceExist()
     {
@@ -55,7 +55,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase
      * @param $expectedFinalPrice
      *
      * @dataProvider getFinalPriceDataProvider
-     * covers Magento\GroupedProduct\Model\Product\Type\Grouped\Price::getFinalPrice
+     * @covers \Magento\GroupedProduct\Model\Product\Type\Grouped\Price::getFinalPrice
      */
     public function testGetFinalPrice(
         array $associatedProducts,
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
index 73170fc7371671b9ab5ec9bc3d9bb58951a6c547..036af4df99be1851f501c7ad1ab10936dfd642c0 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
@@ -50,7 +50,7 @@ class AbstractEavTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method _addAttributesToCollection()
      *
-     * covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_addAttributesToCollection
+     * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_addAttributesToCollection
      */
     public function testAddAttributesToCollection()
     {
@@ -70,8 +70,8 @@ class AbstractEavTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for methods _addAttributeValuesToRow()
      *
-     * covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_initAttributeValues
-     * covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_addAttributeValuesToRow
+     * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_initAttributeValues
+     * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_addAttributeValuesToRow
      */
     public function testAddAttributeValuesToRow()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/EntityAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/EntityAbstractTest.php
index 4d90c639ce39cdfdfab9dabe22e649729bb9e858..4899445316b8b44952b9b46dc8183995d5b6a1b3 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/EntityAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/EntityAbstractTest.php
@@ -14,8 +14,8 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for setter and getter of file name property
      *
-     * covers \Magento\ImportExport\Model\Export\AbstractEntity::getFileName
-     * covers \Magento\ImportExport\Model\Export\AbstractEntity::setFileName
+     * @covers \Magento\ImportExport\Model\Export\AbstractEntity::getFileName
+     * @covers \Magento\ImportExport\Model\Export\AbstractEntity::setFileName
      */
     public function testGetFileNameAndSetFileName()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
index 1ad7acd3a41803760bcc36a266bcdf8b90d898d4..915632e86021748869ee024f05cf1e6e1da9026e 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
@@ -67,7 +67,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Columns number: "1" have empty headers
      */
@@ -80,7 +80,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Columns number: "1" have empty headers
      */
@@ -93,7 +93,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Column names: "_test1" are invalid
      */
@@ -107,7 +107,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
      * Test for method isAttributeValid()
      *
      * @dataProvider isAttributeValidDataProvider
-     * covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::isAttributeValid
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::isAttributeValid
      *
      * @param string $attrCode
      * @param array $attrParams
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/EavAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/EavAbstractTest.php
index 5843560833a7283517a08f4ead58bbcfa1a54b6b..d3a43b4355b99990978cce3e7eb1acea4b001d40 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/EavAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/EavAbstractTest.php
@@ -136,7 +136,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test entity type id getter
      *
-     * covers \Magento\ImportExport\Model\Import\Entity\AbstractEav::getEntityTypeId
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEav::getEntityTypeId
      */
     public function testGetEntityTypeId()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
index e8d0bbdfc5603e4d4a818015e934cb19c545a34b..fbd4bfb1331d22b2cba6d1e3ff40d717eef80d15 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
@@ -82,7 +82,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method _prepareRowForDb()
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::_prepareRowForDb
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::_prepareRowForDb
      */
     public function testPrepareRowForDb()
     {
@@ -211,7 +211,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method getBehavior() with $rowData argument = null
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::getBehavior
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::getBehavior
      */
     public function testGetBehaviorWithoutRowData()
     {
@@ -375,7 +375,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method getBehavior() with $rowData argument = null
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::getBehavior
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::getBehavior
      *
      * @dataProvider dataProviderForTestGetBehaviorWithRowData
      * @param $inputBehavior
@@ -524,7 +524,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testValidateDataPermanentAttributes()
@@ -543,7 +543,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testValidateDataEmptyColumnName()
@@ -555,7 +555,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testValidateDataColumnNameWithWhitespaces()
@@ -567,7 +567,7 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for method validateData()
      *
-     * covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
+     * @covers \Magento\ImportExport\Model\Import\AbstractEntity::validateData
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testValidateDataAttributeNames()
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Resource/CollectionByPagesIteratorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Resource/CollectionByPagesIteratorTest.php
index ce3243ef5c97ba13c88931cf16cd5a03f23244e9..a39d5b55bd0e14bc709046e19d478765d87df42a 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Resource/CollectionByPagesIteratorTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Resource/CollectionByPagesIteratorTest.php
@@ -27,7 +27,7 @@ class CollectionByPagesIteratorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\ImportExport\Model\Resource\CollectionByPagesIterator::iterate
+     * @covers \Magento\ImportExport\Model\Resource\CollectionByPagesIterator::iterate
      */
     public function testIterate()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/BasicTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/BasicTest.php
index 460d2aa2ea6f6067a2ac07d9d40391c7b83a5b6c..1476d35fcf6e2745a4a60e31394b2691b980b406 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/BasicTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/BasicTest.php
@@ -38,7 +38,7 @@ class BasicTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abst
     /**
      * Test toArray method
      *
-     * covers \Magento\ImportExport\Model\Source\Import\Behavior\Basic::toArray
+     * @covers \Magento\ImportExport\Model\Source\Import\Behavior\Basic::toArray
      */
     public function testToArray()
     {
@@ -50,7 +50,7 @@ class BasicTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abst
     /**
      * Test behavior group code
      *
-     * covers \Magento\ImportExport\Model\Source\Import\Behavior\Basic::getCode
+     * @covers \Magento\ImportExport\Model\Source\Import\Behavior\Basic::getCode
      */
     public function testGetCode()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
index f27a5630c32e31b378aad4c1c115c044d1414c9a..e5be1a91ba14733c6d7122518d6ba742c65617b0 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
@@ -38,7 +38,7 @@ class CustomTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abs
     /**
      * Test toArray method
      *
-     * covers \Magento\ImportExport\Model\Source\Import\Behavior\Custom::toArray
+     * @covers \Magento\ImportExport\Model\Source\Import\Behavior\Custom::toArray
      */
     public function testToArray()
     {
@@ -50,7 +50,7 @@ class CustomTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abs
     /**
      * Test behavior group code
      *
-     * covers \Magento\ImportExport\Model\Source\Import\Behavior\Custom::getCode
+     * @covers \Magento\ImportExport\Model\Source\Import\Behavior\Custom::getCode
      */
     public function testGetCode()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/BehaviorAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/BehaviorAbstractTest.php
index 8e4d792650408cfe4b4499c4ccc3e203eee05c45..e2a1682eb3738a1833e552af36418c69c24ed972 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/BehaviorAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/BehaviorAbstractTest.php
@@ -49,7 +49,7 @@ class BehaviorAbstractTest extends \Magento\ImportExport\Test\Unit\Model\Source\
     /**
      * Test for toOptionArray method
      *
-     * covers \Magento\ImportExport\Model\Source\Import\AbstractBehavior::toOptionArray
+     * @covers \Magento\ImportExport\Model\Source\Import\AbstractBehavior::toOptionArray
      */
     public function testToOptionArray()
     {
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
index 6b2e8bb15b3dc2bf9e92d29da8fb9358229e1770..8bd548294cdb6cbbb80ba1fd2977526794fb9b55 100644
--- a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
+++ b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
@@ -85,9 +85,9 @@ class NavigationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\LayeredNavigation\Block\Navigation::getLayer()
-     * covers \Magento\LayeredNavigation\Block\Navigation::getFilters()
-     * covers \Magento\LayeredNavigation\Block\Navigation::canShowBlock()
+     * @covers \Magento\LayeredNavigation\Block\Navigation::getLayer()
+     * @covers \Magento\LayeredNavigation\Block\Navigation::getFilters()
+     * @covers \Magento\LayeredNavigation\Block\Navigation::canShowBlock()
      */
     public function testCanShowBlock()
     {
diff --git a/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php b/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
index 79592a636e61cbe6484222ea8a2c5c93c0547d8f..21bcec6253bf058de334d01ec83d0d4b3f667bfc 100644
--- a/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
@@ -6,7 +6,7 @@
 namespace Magento\PageCache\Test\Unit\Block;
 
 /**
- * covers \Magento\PageCache\Block\Javascript
+ * @covers \Magento\PageCache\Block\Javascript
  */
 class JavascriptTest extends \PHPUnit_Framework_TestCase
 {
@@ -80,7 +80,7 @@ class JavascriptTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\PageCache\Block\Javascript::getScriptOptions
+     * @covers \Magento\PageCache\Block\Javascript::getScriptOptions
      * @param bool $isSecure
      * @param string $url
      * @param string $expectedResult
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php b/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
index ce67d6803293f393199db3f93fe9a11e08b745be..cb7b3bb788c8e810856545c62220680abf7b16ab 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Form/ContainerTest.php
@@ -12,7 +12,7 @@ namespace Magento\Payment\Test\Unit\Block\Form;
 class ContainerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Payment\Block\Form\Container::getChildBlock
+     * @covers \Magento\Payment\Block\Form\Container::getChildBlock
      */
     public function testSetMethodFormTemplate()
     {
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/SessionTest.php b/app/code/Magento/Persistent/Test/Unit/Model/SessionTest.php
index 4df282618ee70c2364878e41cb36df1a3ccee2e6..604de5e71376620067f3473d6ee110bdcb376e8d 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/SessionTest.php
@@ -85,7 +85,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Persistent\Model\Session::removePersistentCookie
+     * @covers \Magento\Persistent\Model\Session::removePersistentCookie
      */
     public function testAfterDeleteCommit()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
index ac849a7e96c254a0bdb185daa03dd77535bd3bbb..94fa209c4f9f51da64e03acccc5b87027a46b998 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
@@ -28,7 +28,7 @@ class RelatedProductsTest extends \PHPUnit_Framework_TestCase
      * @param int|bool $productId
      * @param array $expectedResult
      *
-     * covers \Magento\Quote\Model\Quote\Item\RelatedProducts::getRelatedProductIds
+     * @covers \Magento\Quote\Model\Quote\Item\RelatedProducts::getRelatedProductIds
      * @dataProvider getRelatedProductIdsDataProvider
      */
     public function testGetRelatedProductIds($optionValue, $productId, $expectedResult)
@@ -75,7 +75,7 @@ class RelatedProductsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Quote\Model\Quote\Item\RelatedProducts::getRelatedProductIds
+     * @covers \Magento\Quote\Model\Quote\Item\RelatedProducts::getRelatedProductIds
      */
     public function testGetRelatedProductIdsNoOptions()
     {
diff --git a/app/code/Magento/Reports/Test/Unit/Model/Plugin/LogTest.php b/app/code/Magento/Reports/Test/Unit/Model/Plugin/LogTest.php
index 8fc58020e580eacefbfcb05b0338d2bf916b0e2e..a6585041528a549b1d69b10135614c1270f44937 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/Plugin/LogTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/Plugin/LogTest.php
@@ -66,7 +66,7 @@ class LogTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Reports\Model\Plugin\Log::afterClean
+     * @covers \Magento\Reports\Model\Plugin\Log::afterClean
      */
     public function testAfterClean()
     {
diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/CombineTest.php b/app/code/Magento/Rule/Test/Unit/Model/Condition/CombineTest.php
index ced46fa076b2e173a598db062802887ef7b91ec9..35fd9439db6f61269bf8c82bf77e8e13c8d333c2 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/Condition/CombineTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/Condition/CombineTest.php
@@ -62,7 +62,7 @@ class CombineTest extends \PHPUnit_Framework_TestCase
 
     /**
      *
-     * covers \Magento\Rule\Model\Condition\AbstractCondition::getValueName
+     * @covers \Magento\Rule\Model\Condition\AbstractCondition::getValueName
      *
      * @dataProvider optionValuesData
      *
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
index 0c948763c81bafcea06f1b8e2acd9679aa6f05e5..702ff9abb36b9d40025f4c14d64b57921841cfee 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -219,7 +219,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid::getItems
+     * @covers \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid::getItems
      */
     public function testGetItems()
     {
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
index 2d91015cfcdb62848486ff502ae6c6771286a091..d01b7c2cdcea0cc05721cc401512f290719caa2b 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
@@ -74,11 +74,15 @@ class CartFixedTest extends \PHPUnit_Framework_TestCase
         );
         $dataFactory->expects($this->any())->method('create')->will($this->returnValue($this->data));
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
-        $this->model = new \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed($this->validator, $dataFactory, $this->priceCurrency);
+        $this->model = new \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed(
+            $this->validator,
+            $dataFactory,
+            $this->priceCurrency
+        );
     }
 
     /**
-     * covers \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed::calculate
+     * @covers \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed::calculate
      */
     public function testCalculate()
     {
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
index 8d23a6c29774b45d53ba792783b38c893b49bfb2..d6f5bd813bcb526b736e417ee8ebd6d71cc528d2 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
@@ -61,7 +61,7 @@ class AbstractCarrierOnlineTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Shipping\Model\Shipping::composePackagesForCarrier
+     * @covers \Magento\Shipping\Model\Shipping::composePackagesForCarrier
      */
     public function testComposePackages()
     {
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
index 4fc368be080007d10b1288242efef8e16b485dc2..8c788228fbb5362c507a5ef72dcd2a728cbddf5c 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
@@ -64,7 +64,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Shipping\Model\Shipping::composePackagesForCarrier
+     * @covers \Magento\Shipping\Model\Shipping::composePackagesForCarrier
      */
     public function testComposePackages()
     {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/ReaderPoolTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/ReaderPoolTest.php
index 3e118eff97ef41692ca7e7a857c0619e409f7bdd..6beb4daceb0ab7971c75e43a38e38935bd00600f 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/ReaderPoolTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/ReaderPoolTest.php
@@ -50,7 +50,7 @@ class ReaderPoolTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\Config\Reader\ReaderPool::getReader
+     * @covers \Magento\Store\Model\Config\Reader\ReaderPool::getReader
      * @dataProvider getReaderDataProvider
      * @param string $scope
      * @param string $instanceType
diff --git a/app/code/Magento/Store/Test/Unit/Model/StorageFactoryTest.php b/app/code/Magento/Store/Test/Unit/Model/StorageFactoryTest.php
index 19b199bc54746bce23294bc885f1b2a2bc752cc8..31e5f8033705f1ff1ab629118bf255bb96dfca06 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StorageFactoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StorageFactoryTest.php
@@ -251,11 +251,11 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\StorageFactory::_reinitStores
-     * covers \Magento\Store\Model\StorageFactory::_getStoreByGroup
-     * covers \Magento\Store\Model\StorageFactory::_getStoreByWebsite
-     * covers \Magento\Store\Model\StorageFactory::_checkCookieStore
-     * covers \Magento\Store\Model\StorageFactory::_checkRequestStore
+     * @covers \Magento\Store\Model\StorageFactory::_reinitStores
+     * @covers \Magento\Store\Model\StorageFactory::_getStoreByGroup
+     * @covers \Magento\Store\Model\StorageFactory::_getStoreByWebsite
+     * @covers \Magento\Store\Model\StorageFactory::_checkCookieStore
+     * @covers \Magento\Store\Model\StorageFactory::_checkRequestStore
      *
      * @dataProvider getWithStoresReinitDataProvider
      *
@@ -313,9 +313,9 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\StorageFactory::_checkCookieStore
-     * covers \Magento\Store\Model\StorageFactory::getActiveStoreByCode
-     * covers \Magento\Store\Model\StorageFactory::setCurrentStore
+     * @covers \Magento\Store\Model\StorageFactory::_checkCookieStore
+     * @covers \Magento\Store\Model\StorageFactory::getActiveStoreByCode
+     * @covers \Magento\Store\Model\StorageFactory::setCurrentStore
      *
      * @dataProvider getFromCookieDataProvider
      */
@@ -352,9 +352,9 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\StorageFactory::_checkRequestStore
-     * covers \Magento\Store\Model\StorageFactory::getActiveStoreByCode
-     * covers \Magento\Store\Model\StorageFactory::setCurrentStore
+     * @covers \Magento\Store\Model\StorageFactory::_checkRequestStore
+     * @covers \Magento\Store\Model\StorageFactory::getActiveStoreByCode
+     * @covers \Magento\Store\Model\StorageFactory::setCurrentStore
      *
      * @dataProvider getFromRequestDataProvider
      *
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index 91ec0f1d8c1c2d6eb49ca5cc962308734660ad64..c43af1f004dfe6972d9521e3d49bd6474fb99a4b 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -185,10 +185,10 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider getBaseUrlDataProvider
      *
-     * covers \Magento\Store\Model\Store::getBaseUrl
-     * covers \Magento\Store\Model\Store::getCode
-     * covers \Magento\Store\Model\Store::_updatePathUseRewrites
-     * covers \Magento\Store\Model\Store::_getConfig
+     * @covers \Magento\Store\Model\Store::getBaseUrl
+     * @covers \Magento\Store\Model\Store::getCode
+     * @covers \Magento\Store\Model\Store::_updatePathUseRewrites
+     * @covers \Magento\Store\Model\Store::_getConfig
      *
      * @param string $type
      * @param boolean $secure
@@ -600,7 +600,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\Store::getBaseMediaDir
+     * @covers \Magento\Store\Model\Store::getBaseMediaDir
      */
     public function testGetBaseMediaDir()
     {
@@ -613,7 +613,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Store\Model\Store::getBaseStaticDir
+     * @covers \Magento\Store\Model\Store::getBaseStaticDir
      */
     public function testGetBaseStaticDir()
     {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Config/CustomizationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/CustomizationTest.php
index e03b5190560c14ceaf76348595a978d09b92890d..9b84e52a91233cb09ce5ddf639f015fce02310e0 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Config/CustomizationTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Config/CustomizationTest.php
@@ -66,8 +66,8 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Theme\Model\Config\Customization::getAssignedThemeCustomizations
-     * covers \Magento\Theme\Model\Config\Customization::hasThemeAssigned
+     * @covers \Magento\Theme\Model\Config\Customization::getAssignedThemeCustomizations
+     * @covers \Magento\Theme\Model\Config\Customization::hasThemeAssigned
      */
     public function testGetAssignedThemeCustomizations()
     {
@@ -90,7 +90,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Theme\Model\Config\Customization::getUnassignedThemeCustomizations
+     * @covers \Magento\Theme\Model\Config\Customization::getUnassignedThemeCustomizations
      */
     public function testGetUnassignedThemeCustomizations()
     {
@@ -112,7 +112,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Theme\Model\Config\Customization::getStoresByThemes
+     * @covers \Magento\Theme\Model\Config\Customization::getStoresByThemes
      */
     public function testGetStoresByThemes()
     {
@@ -129,7 +129,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Theme\Model\Config\Customization::isThemeAssignedToStore
+     * @covers \Magento\Theme\Model\Config\Customization::isThemeAssignedToStore
      */
     public function testIsThemeAssignedToDefaultStore()
     {
@@ -151,7 +151,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Theme\Model\Config\Customization::isThemeAssignedToStore
+     * @covers \Magento\Theme\Model\Config\Customization::isThemeAssignedToStore
      */
     public function testIsThemeAssignedToConcreteStore()
     {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
index 2f45ad6f18488aaeea9c22eec09370d3e6590209..5912fe622bb6e84606dbe36cfe0451c9e708e0e2 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
@@ -16,7 +16,7 @@ class ValidationTest extends \PHPUnit_Framework_TestCase
      * @param bool $result
      * @param array $messages
      *
-     * covers \Magento\Framework\View\Design\Theme\Validator::validate
+     * @covers \Magento\Framework\View\Design\Theme\Validator::validate
      * @dataProvider dataProviderValidate
      */
     public function testValidate(array $data, $result, array $messages)
diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
index 9f3b8e9f1524124fec08c973395b447fe9b165cd..fa3a5f0d45f7afcceae08acd4b6119ed720f11e3 100644
--- a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
@@ -43,7 +43,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
      * @param int $freeShippingSubtotal
      * @param int $requestSubtotal
      * @param int $expectedPrice
-     * covers Magento\Shipping\Model\Carrier\AbstractCarrierOnline::getMethodPrice
+     * @covers \Magento\Shipping\Model\Carrier\AbstractCarrierOnline::getMethodPrice
      */
     public function testGetMethodPrice(
         $cost,
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Resource/UrlRewriteCollectionTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Resource/UrlRewriteCollectionTest.php
index 56c97858d72ffe81a311b5a354bf6815fe7aeca1..70d57d2c4498da3efafd388801c6889c83506863 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Resource/UrlRewriteCollectionTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Resource/UrlRewriteCollectionTest.php
@@ -94,7 +94,7 @@ class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
      * @param bool $withAdmin
      * @param array $condition
      * @dataProvider dataProviderForTestAddStoreIfStoreIsArray
-     * covers \Magento\UrlRewrite\Model\Resource\UrlRewriteCollection
+     * @covers \Magento\UrlRewrite\Model\Resource\UrlRewriteCollection
      */
     public function testAddStoreFilterIfStoreIsArray($storeId, $withAdmin, $condition)
     {
@@ -121,7 +121,7 @@ class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
      * @param bool $withAdmin
      * @param array $condition
      * @dataProvider dataProviderForTestAddStoreFilterIfStoreIsInt
-     * covers \Magento\UrlRewrite\Model\Resource\UrlRewriteCollection
+     * @covers \Magento\UrlRewrite\Model\Resource\UrlRewriteCollection
      */
     public function testAddStoreFilterIfStoreIsInt($storeId, $withAdmin, $condition)
     {
diff --git a/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php b/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php
index 46f0740b94c84207a735c5ec17afc6217a791190..dec567c7c188affd3aa2d75c1b4ebf0335bb99dd 100644
--- a/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php
@@ -23,7 +23,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Usps\Helper\Data::displayGirthValue
+     * @covers \Magento\Usps\Helper\Data::displayGirthValue
      * @dataProvider shippingMethodDataProvider
      */
     public function testDisplayGirthValue($shippingMethod)
@@ -32,7 +32,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Usps\Helper\Data::displayGirthValue
+     * @covers \Magento\Usps\Helper\Data::displayGirthValue
      */
     public function testDisplayGirthValueFalse()
     {
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Link/CollectionTest.php b/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Link/CollectionTest.php
index 5dff2e4e507c158af16aa2b4eaab358bca4ddc78..7f9758212a5172c1d62acec7ea756f138b2750d9 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Link/CollectionTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Link/CollectionTest.php
@@ -77,7 +77,7 @@ class CollectionTest extends \Magento\Widget\Test\Unit\Model\Resource\Layout\Abs
     }
 
     /**
-     * covers \Magento\Widget\Model\Resource\Layout\Link\Collection::_joinWithUpdate
+     * @covers \Magento\Widget\Model\Resource\Layout\Link\Collection::_joinWithUpdate
      */
     public function testJoinWithUpdate()
     {
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Update/CollectionTest.php b/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Update/CollectionTest.php
index ad8ce91ec6df3fc2a59226308e518e1e005e9805..44d72494a04be86fcfe79536ab9d6a893a9f0e05 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Update/CollectionTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Resource/Layout/Update/CollectionTest.php
@@ -49,7 +49,7 @@ class CollectionTest extends \Magento\Widget\Test\Unit\Model\Resource\Layout\Abs
     }
 
     /**
-     * covers \Magento\Widget\Model\Resource\Layout\Update\Collection::_joinWithLink
+     * @covers \Magento\Widget\Model\Resource\Layout\Update\Collection::_joinWithLink
      */
     public function testJoinWithLink()
     {
diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
index 17e643a9f9a3b821ae529713ab5bbec84f250fb0..4af5600e9b7a7e0536acfbd3fb5e59bfa2e5bc04 100644
--- a/dev/tests/static/framework/autoload.php
+++ b/dev/tests/static/framework/autoload.php
@@ -9,5 +9,11 @@ require $baseDir . '/app/autoload.php';
 $testsBaseDir = $baseDir . '/dev/tests/static';
 $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
 $autoloadWrapper->addPsr4('Magento\\', $testsBaseDir . '/testsuite/Magento/');
-$autoloadWrapper->addPsr4('Magento\\TestFramework\\', $testsBaseDir . '/framework/Magento/TestFramework/');
+$autoloadWrapper->addPsr4(
+    'Magento\\TestFramework\\',
+    [
+        $testsBaseDir . '/framework/Magento/TestFramework/',
+        $testsBaseDir . '/../integration/framework/Magento/TestFramework/',
+    ]
+);
 $autoloadWrapper->addPsr4('Magento\\', $baseDir . '/var/generation/Magento/');
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 05d9b8c6b6fca1a96d32b142e3a755dbdd96e461..0d5d3848cfe6a4cc34ec66e67c47b5dbe432755f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -557,7 +557,9 @@ class ClassesTest extends \PHPUnit_Framework_TestCase
             }
         }
         if ($errors) {
-            $this->fail(implode(PHP_EOL, $errors));
+            $this->fail(
+                'Nonexistent classes/methods were found in @covers annotations: ' . PHP_EOL . implode(PHP_EOL, $errors)
+            );
         }
     }
 
@@ -567,8 +569,7 @@ class ClassesTest extends \PHPUnit_Framework_TestCase
      */
     private function isNonexistentEntityCovered($matches)
     {
-        return (!empty($matches[2]) && !class_exists($matches[2])
-            || !empty($matches[4]) && !method_exists($matches[2], $matches[4]))
-            && strpos($matches[2], 'Magento\TestFramework') === false; // not autoloaded currently
+        return !empty($matches[2]) && !class_exists($matches[2])
+            || !empty($matches[4]) && !method_exists($matches[2], $matches[4]);
     }
 }
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index 6d78cca2adb2c3d52978f9cf5a299e0bb9539ed0..da22efa001e62023edca737d21fce161a764a665 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -11,21 +11,27 @@
          bootstrap="./framework/bootstrap.php"
         >
     <testsuite name="Magento Unit Tests">
-        <directory suffix="Test.php">../../../setup/src/Magento/Setup/Test/Unit</directory>
         <directory suffix="Test.php">../../../app/code/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../dev/tools/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../dev/tools/*/*/*/Test/Unit</directory>
+        <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
+        <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
+        <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>
     </testsuite>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
     </php>
     <filter>
         <whitelist addUncoveredFilesFromWhiteList="true">
-            <directory suffix=".php">../../../app/code/Magento</directory>
+            <directory suffix=".php">../../../app/code/*</directory>
             <directory suffix=".php">../../../lib/internal/Magento</directory>
-            <directory suffix=".php">../../../setup/src/Magento</directory>
+            <directory suffix=".php">../../../setup/src/*</directory>
+            <exclude>
+                <directory>../../../app/code/*/*/Test</directory>
+                <directory>../../../lib/internal/*/*/Test</directory>
+                <directory>../../../lib/internal/*/*/*/Test</directory>
+                <directory>../../../setup/src/*/*/Test</directory>
+            </exclude>
         </whitelist>
     </filter>
     <logging>
diff --git a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Db/LoggerAbstractTest.php b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Db/LoggerAbstractTest.php
index 536cc07b5478beae3c5a9369e3741437f7c17d4f..fa35157631c5ed6db7d8af63471808c7406f8144 100644
--- a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Db/LoggerAbstractTest.php
+++ b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Db/LoggerAbstractTest.php
@@ -26,8 +26,8 @@ class LoggerAbstractTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Tools\Migration\Acl\Db\AbstractLogger::add()
-     * covers \Magento\Tools\Migration\Acl\Db\AbstractLogger::__toString()
+     * @covers \Magento\Tools\Migration\Acl\Db\AbstractLogger::add()
+     * @covers \Magento\Tools\Migration\Acl\Db\AbstractLogger::__toString()
      */
     public function testToString()
     {
diff --git a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/GeneratorTest.php b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/GeneratorTest.php
index a7c8aebbffd78c33b0bf1287c755c1e44132173d..a72bead91ea7ce4e6774a1141faa4f003bbe3af2 100644
--- a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/GeneratorTest.php
+++ b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/GeneratorTest.php
@@ -187,8 +187,8 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Tools\Migration\Acl\Generator::parseNode
-     * covers \Magento\Tools\Migration\Acl\Generator::generateId
+     * @covers \Magento\Tools\Migration\Acl\Generator::parseNode
+     * @covers \Magento\Tools\Migration\Acl\Generator::generateId
      */
     public function testParseNode()
     {
@@ -233,8 +233,8 @@ TEMPLATE;
     }
 
     /**
-     * covers \Magento\Tools\Migration\Acl\Generator::updateAclResourceIds()
-     * covers \Magento\Tools\Migration\Acl\Generator::updateChildAclNodes() (removing of xpath attribute)
+     * @covers \Magento\Tools\Migration\Acl\Generator::updateAclResourceIds()
+     * @covers \Magento\Tools\Migration\Acl\Generator::updateChildAclNodes() (removing of xpath attribute)
      */
     public function testUpdateAclResourceIds()
     {
diff --git a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Menu/GeneratorTest.php b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Menu/GeneratorTest.php
index dc28dac692c0c8a5266e6b65c2522b477d8863ee..25b3a871a862ee2fa86f18fe2dd4ce71abac719d 100644
--- a/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Menu/GeneratorTest.php
+++ b/dev/tools/Magento/Tools/Migration/Test/Unit/Acl/Menu/GeneratorTest.php
@@ -147,8 +147,8 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Tools\Migration\Acl\Menu\Generator::buildMenuItemsXPath
-     * covers \Magento\Tools\Migration\Acl\Menu\Generator::buildXPath
+     * @covers \Magento\Tools\Migration\Acl\Menu\Generator::buildMenuItemsXPath
+     * @covers \Magento\Tools\Migration\Acl\Menu\Generator::buildXPath
      */
     public function testBuildMenuItemsXPath()
     {
diff --git a/dev/tools/Magento/Tools/Migration/Test/Unit/System/Configuration/LoggerAbstractTest.php b/dev/tools/Magento/Tools/Migration/Test/Unit/System/Configuration/LoggerAbstractTest.php
index c6d4bcfb3f36bcb23797e84562374196e32b0431..a4bdcdc5c81ac01ea1cec8a489d294427cc5bcde 100644
--- a/dev/tools/Magento/Tools/Migration/Test/Unit/System/Configuration/LoggerAbstractTest.php
+++ b/dev/tools/Magento/Tools/Migration/Test/Unit/System/Configuration/LoggerAbstractTest.php
@@ -26,8 +26,8 @@ class LoggerAbstractTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Tools\Migration\System\Configuration\AbstractLogger::add()
-     * covers \Magento\Tools\Migration\System\Configuration\AbstractLogger::__toString()
+     * @covers \Magento\Tools\Migration\System\Configuration\AbstractLogger::add()
+     * @covers \Magento\Tools\Migration\System\Configuration\AbstractLogger::__toString()
      */
     public function testToString()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php
index 4edbfaa6d8f0d87e0bb3469a16fe1fd98997133e..2d15e0a290b338531cb4ff742fe18453df84f940 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php
@@ -69,7 +69,7 @@ class ForwardTest extends \PHPUnit_Framework_TestCase
      * Test for getRequest method
      *
      * @test
-     * covers \Magento\Framework\App\Action\AbstractAction::getRequest
+     * @covers \Magento\Framework\App\Action\AbstractAction::getRequest
      */
     public function testGetRequest()
     {
@@ -80,7 +80,7 @@ class ForwardTest extends \PHPUnit_Framework_TestCase
      * Test for getResponse method
      *
      * @test
-     * covers \Magento\Framework\App\Action\AbstractAction::getResponse
+     * @covers \Magento\Framework\App\Action\AbstractAction::getResponse
      */
     public function testGetResponse()
     {
@@ -91,7 +91,7 @@ class ForwardTest extends \PHPUnit_Framework_TestCase
      * Test for getResponse med. Checks that response headers are set correctly
      *
      * @test
-     * covers \Magento\Framework\App\Action\AbstractAction::getResponse
+     * @covers \Magento\Framework\App\Action\AbstractAction::getResponse
      */
     public function testResponseHeaders()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Data/ProcessorFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Data/ProcessorFactoryTest.php
index 57fd0ee41591c4434e98315b5d4ce20ba57b3de6..ad6a1d918ab8eb4edaff2a113950e4b3130ab68c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Data/ProcessorFactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Data/ProcessorFactoryTest.php
@@ -30,7 +30,7 @@ class ProcessorFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
+     * @covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
      */
     public function testGetModelWithCorrectInterface()
     {
@@ -51,7 +51,7 @@ class ProcessorFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
+     * @covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessageRegExp /\w+\\WrongBackendModel is not instance of \w+\\ProcessorInterface/
      */
@@ -73,7 +73,7 @@ class ProcessorFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
+     * @covers \Magento\Framework\App\Config\Data\ProcessorFactory::get
      */
     public function testGetMemoryCache()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
index 3a9f2ac7cb7f9c3244ec29578d07d005d89e4c38..f3d28802f4da3e182f290759198b01b75a69f142 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
@@ -66,7 +66,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\Config\Initial\Reader::read
+     * @covers \Magento\Framework\App\Config\Initial\Reader::read
      */
     public function testReadNoFiles()
     {
@@ -80,7 +80,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\Config\Initial\Reader::read
+     * @covers \Magento\Framework\App\Config\Initial\Reader::read
      */
     public function testReadValidConfig()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManagerFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManagerFactoryTest.php
index cf75953d4e19b00374317c73c5001089858a1b0f..c40dd4a1c0502eb7dc323f9a303f5cef1b3ee3ab 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManagerFactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManagerFactoryTest.php
@@ -8,7 +8,7 @@ namespace Magento\Framework\App\Test\Unit;
 use Magento\Framework\App\Bootstrap;
 
 /**
- * covers \Magento\Framework\App\ObjectManagerFactory
+ * @covers \Magento\Framework\App\ObjectManagerFactory
  */
 class ObjectManagerFactoryTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
index 580d803d52b6e7ffdba9f7bed22abef16ec31e4f..b1c7db53cb92a122492239cbf9ad4bc7a5671d1d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
@@ -26,8 +26,8 @@ class RequestFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\App\RequestFactory::__construct
-     * covers \Magento\Framework\App\RequestFactory::create
+     * @covers \Magento\Framework\App\RequestFactory::__construct
+     * @covers \Magento\Framework\App\RequestFactory::create
      */
     public function testCreate()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
index 26d126e7b5692febfe28dcad162c56fabd99d20b..182e7cfe65fab07449a7794cd68e766f28a4dec1 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -215,7 +215,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
     /**
      * Test for the magic method __wakeup
      *
-     * covers \Magento\Framework\App\Response\Http::__wakeup
+     * @covers \Magento\Framework\App\Response\Http::__wakeup
      */
     public function testWakeUpWith()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
index d2a4bb622cece795f9f7dd5b06ab793ab517df3b..91e1ebbd3fc0bfe2c37fe2ecd12f7858f9023e77 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
@@ -32,7 +32,7 @@ class ScopeResolverPoolTest extends \PHPUnit_Framework_TestCase
     /**
      * @param string $scope
      *
-     * covers \Magento\Framework\App\ScopeResolverPool::get()
+     * @covers \Magento\Framework\App\ScopeResolverPool::get()
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Invalid scope type
      * @dataProvider testGetExceptionDataProvider
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
index e26002e8029a0e6be56d668c0e1bfa7257a5a8c8..411a94edb0b1b4a8eca4a12767d18ea47ea36d35 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
@@ -80,9 +80,9 @@ class MongoDbTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingTags
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsNotMatchingTags
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingAnyTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsNotMatchingTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingAnyTags
      * @dataProvider getIdsMatchingTagsDataProvider
      */
     public function testGetIdsMatchingTags($method, $tags, $expectedInput)
@@ -139,9 +139,9 @@ class MongoDbTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingTags
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsNotMatchingTags
-     * covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingAnyTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsNotMatchingTags
+     * @covers \Magento\Framework\Cache\Backend\MongoDb::getIdsMatchingAnyTags
      */
     public function testGetIdsMatchingTagsNoInputTags()
     {
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index 642387cdfa0888e973850bfadaab57f0a7f53e89..8b11e9bc25eb556be344c223799b536e7efea49d 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -151,17 +151,17 @@ class EntityAbstractTest extends \PHPUnit_Framework_TestCase
      * @param bool $willWriteCode
      *
      * @dataProvider generateDataProvider
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::generate
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::getErrors
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_getSourceClassName
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_getResultClassName
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_getDefaultResultClassName
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_generateCode
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_addError
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_validateData
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_getClassDocBlock
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_getGeneratedCode
-     * covers \Magento\Framework\Code\Generator\EntityAbstract::_fixCodeStyle
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::generate
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getErrors
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getSourceClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getResultClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getDefaultResultClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_generateCode
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_addError
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_validateData
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getClassDocBlock
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getGeneratedCode
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_fixCodeStyle
      */
     public function testGenerate(
         $errors = [],
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/JsonTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/JsonTest.php
index d92164f181e41db5370575589aa4c8b28057da02..769a61c21ab09b87c6b22cf72f73e54c1e7a1e27 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/JsonTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/JsonTest.php
@@ -9,7 +9,7 @@ namespace Magento\Framework\Controller\Test\Unit\Result;
 /**
  * Class JsonTest
  *
- * covers Magento\Framework\Controller\Result\Json
+ * @covers \Magento\Framework\Controller\Result\Json
  */
 class JsonTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
index 607ff484331048e54d48e054575b7b5a9e37cb3f..9297ffad51e384ca70c200d1b42648125bd7555e 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
@@ -499,8 +499,8 @@ class MysqlTest extends \PHPUnit_Framework_TestCase
      * @param string $expectedQuery
      *
      * @dataProvider addColumnDataProvider
-     * covers \Magento\Framework\DB\Adapter\Pdo\Mysql::addColumn
-     * covers \Magento\Framework\DB\Adapter\Pdo\Mysql::_getColumnDefinition
+     * @covers \Magento\Framework\DB\Adapter\Pdo\Mysql::addColumn
+     * @covers \Magento\Framework\DB\Adapter\Pdo\Mysql::_getColumnDefinition
      */
     public function testAddColumn($options, $expectedQuery)
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
index 2217a390d6a7eb3f6f8b7358ad289150b2d98456..0d2336846b991e392cbb712907dceb041d1ae64c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
@@ -258,7 +258,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
      * Test that after cloning collection $this->_select in initial and cloned collections
      * do not reference the same object
      *
-     * covers \Magento\Framework\Data\Collection\Db::__clone
+     * @covers \Magento\Framework\Data\Collection\Db::__clone
      */
     public function testClone()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index 8ab511594eb446d52e3a6fef00f64f77d46fe6a1..15f30f19b442c0d93a7a6c5e23bf0e338cf11e5d 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -51,7 +51,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::addElement()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::addElement()
      */
     public function testAddElement()
     {
@@ -88,7 +88,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlId()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlId()
      */
     public function testGetHtmlId()
     {
@@ -112,7 +112,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getName()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getName()
      */
     public function testGetNameWithoutSuffix()
     {
@@ -134,7 +134,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getName()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getName()
      */
     public function testGetNameWithSuffix()
     {
@@ -160,7 +160,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::removeField()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::removeField()
      */
     public function testRemoveField()
     {
@@ -189,7 +189,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlAttributes()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlAttributes()
      */
     public function testGetHtmlAttributes()
     {
@@ -210,7 +210,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::addClass()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::addClass()
      */
     public function testAddClass()
     {
@@ -223,7 +223,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::removeClass()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::removeClass()
      */
     public function testRemoveClass()
     {
@@ -240,7 +240,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getEscapedValue()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getEscapedValue()
      */
     public function testGetEscapedValueWithoutFilter()
     {
@@ -251,7 +251,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getEscapedValue()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getEscapedValue()
      */
     public function testGetEscapedValueWithFilter()
     {
@@ -273,7 +273,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
      * @param array $initialData
      * @param string $expectedValue
      * @dataProvider getElementHtmlDataProvider
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getElementHtml()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getElementHtml()
      */
     public function testGetElementHtml(array $initialData, $expectedValue)
     {
@@ -289,7 +289,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
      * @param array $initialData
      * @param string $expectedValue
      * @dataProvider getLabelHtmlDataProvider
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getLabelHtml()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getLabelHtml()
      */
     public function testGetLabelHtml(array $initialData, $expectedValue)
     {
@@ -305,7 +305,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
      * @param array $initialData
      * @param string $expectedValue
      * @dataProvider testGetDefaultHtmlDataProvider
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getDefaultHtml()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getDefaultHtml()
      */
     public function testGetDefaultHtml(array $initialData, $expectedValue)
     {
@@ -317,7 +317,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtml()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtml()
      */
     public function testGetHtmlWithoutRenderer()
     {
@@ -333,7 +333,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtml()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtml()
      */
     public function testGetHtmlWithRenderer()
     {
@@ -358,7 +358,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
      * @param array $initialData
      * @param string $expectedValue
      * @dataProvider serializeDataProvider
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::serialize()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::serialize()
      */
     public function testSerialize(array $initialData, $expectedValue)
     {
@@ -372,7 +372,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
      */
     public function testGetHtmlContainerIdWithoutId()
     {
@@ -383,7 +383,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
      */
     public function testGetHtmlContainerIdWithContainerId()
     {
@@ -396,7 +396,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getHtmlContainerId()
      */
     public function testGetHtmlContainerIdWithFieldContainerIdPrefix()
     {
@@ -418,7 +418,7 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
      * @param array $initialData
      * @param string $expectedValue
      * @dataProvider addElementValuesDataProvider
-     * covers \Magento\Framework\Data\Form\Element\AbstractElement::addElementValues()
+     * @covers \Magento\Framework\Data\Form\Element\AbstractElement::addElementValues()
      */
     public function testAddElementValues(array $initialData, $expectedValue)
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ButtonTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ButtonTest.php
index b32e997f224e2fba03e49369259bbd8fd1ab1993..bcb5135b047e8b7ecf8a83a4a0629be66ec9094c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ButtonTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ButtonTest.php
@@ -44,7 +44,7 @@ class ButtonTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Button::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Button::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class ButtonTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Button::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Button::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CheckboxTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CheckboxTest.php
index 44d1141c88da08da561beabdc66608ef8aa69d0d..5f0fd55c03512c033cb1ee5f2a8ef9899331d81c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CheckboxTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CheckboxTest.php
@@ -44,7 +44,7 @@ class CheckboxTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Checkbox::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Checkbox::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class CheckboxTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Checkbox::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Checkbox::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
@@ -66,7 +66,7 @@ class CheckboxTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Checkbox::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Checkbox::getElementHtml
      */
     public function testGetElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CollectionFactoryTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CollectionFactoryTest.php
index 36c6d59d79b3cffc4ee106cda01e94ffbbbee72e..bdd29b4a70530dd14a74a70fac87e4fbb60bc710 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CollectionFactoryTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/CollectionFactoryTest.php
@@ -36,7 +36,7 @@ class CollectionFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\CollectionFactory::create
+     * @covers \Magento\Framework\Data\Form\Element\CollectionFactory::create
      */
     public function testCreate()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ColumnTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ColumnTest.php
index 2dc7218c9ab65c00215025a378ecf7c05f8f5c7a..e559055322cf6de1421cc3e1491ef097d99ebd14 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ColumnTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ColumnTest.php
@@ -44,7 +44,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Column::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Column::__construct
      */
     public function testConstruct()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/FileTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/FileTest.php
index 77786e075ff25ef7805b79f3fe800c6ddd4e252b..19165e58bff0099c9b1647cc11ce0823b8e0b0b9 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/FileTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/FileTest.php
@@ -44,7 +44,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\File::__construct
+     * @covers \Magento\Framework\Data\Form\Element\File::__construct
      */
     public function testConstruct()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/HiddenTest.php
index 1da08b0d511b1109f1fd9dfc627f1b1c6cc37e73..3b8211610698644c719d5030e53b1c9da71811be 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/HiddenTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/HiddenTest.php
@@ -44,7 +44,7 @@ class HiddenTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Hidden::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Hidden::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class HiddenTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Hidden::getDefaultHtml
+     * @covers \Magento\Framework\Data\Form\Element\Hidden::getDefaultHtml
      */
     public function testGetDefaultHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
index 86bf7cfa0cb379b840996818d29305b1db4b6c0a..db253018181384923b79efc04d311171055c466a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
@@ -53,7 +53,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Image::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Image::__construct
      */
     public function testConstruct()
     {
@@ -61,7 +61,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Image::getName
+     * @covers \Magento\Framework\Data\Form\Element\Image::getName
      */
     public function testGetName()
     {
@@ -70,7 +70,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Image::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Image::getElementHtml
      */
     public function testGetElementHtmlWithoutValue()
     {
@@ -83,7 +83,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Image::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Image::getElementHtml
      */
     public function testGetElementHtmlWithValue()
     {
@@ -97,7 +97,10 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $this->assertContains('<input', $html);
         $this->assertContains('type="file"', $html);
         $this->assertContains('value="test_value"', $html);
-        $this->assertContains('<a href="http://localhost/media/test_value" onclick="imagePreview(\'_image\'); return false;"', $html);
+        $this->assertContains(
+            '<a href="http://localhost/media/test_value" onclick="imagePreview(\'_image\'); return false;"',
+            $html
+        );
         $this->assertContains('<input type="checkbox"', $html);
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImagefileTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImagefileTest.php
index 6dd63e09e8c0ded1af3f5d8bf94f65a810dcc3b3..2ba27897cac7b7148b7a08c572b527d445f496f6 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImagefileTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImagefileTest.php
@@ -40,7 +40,7 @@ class ImagefileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Imagefile::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Imagefile::__construct
      */
     public function testConstruct()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
index 48a59757eb56324a86b57bf3f0f78f1ff2efba05..2e0f8aa103910217f86d791be8ada9609f74caee 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
@@ -40,7 +40,7 @@ class LabelTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Label::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Label::__construct
      */
     public function testConstruct()
     {
@@ -48,7 +48,7 @@ class LabelTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Label::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Label::getElementHtml
      */
     public function testGetElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
index c4894f86c82d042012490bbbd455da7eac2ebf66..b1146e86bdeff3cd006b9ba9c5e3ce5341000f31 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
@@ -44,7 +44,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Link::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Link::__construct
      */
     public function testConstruct()
     {
@@ -52,7 +52,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Link::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Link::getElementHtml
      */
     public function testGetElementHtml()
     {
@@ -69,7 +69,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Link::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Link::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index 75e52b1ad44c260ecfaab408dd6db8ff786fc7ba..e24ab55c5f1214f7019ae62c07efe2dff394290d 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -22,7 +22,7 @@ class MultiselectTest extends \PHPUnit_Framework_TestCase
     /**
      * Verify that hidden input is present in multiselect
      *
-     * covers \Magento\Framework\Data\Form\Element\Multiselect::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Multiselect::getElementHtml
      */
     public function testHiddenFieldPresentInMultiSelect()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
index 5f0d420d6c0c0feb944b7bef7713b70b6e323d92..8fcf5673702db099494e2dc504619f3ec40dbff9 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
@@ -44,7 +44,7 @@ class NoteTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Note::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Note::__construct
      */
     public function testConstruct()
     {
@@ -52,7 +52,7 @@ class NoteTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Note::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Note::getElementHtml
      */
     public function testGetElementHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
index 24960126c0a6d57b207380035b91997e5f50dd93..640aebb71a46a795aae4022daba66c037521efed 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
@@ -44,7 +44,7 @@ class ObscureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Obscure::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Obscure::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class ObscureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Obscure::getEscapedValue
+     * @covers \Magento\Framework\Data\Form\Element\Obscure::getEscapedValue
      */
     public function testGetEscapedValue()
     {
@@ -64,7 +64,7 @@ class ObscureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Obscure::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Obscure::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
index 9e2e70369d3690b11399480cb0fe74a3229e33a5..0fd77983e5255d5a2db39f440f164a71fd627d15 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
@@ -44,7 +44,7 @@ class PasswordTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Password::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Password::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class PasswordTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Password::getHtml
+     * @covers \Magento\Framework\Data\Form\Element\Password::getHtml
      */
     public function testGetHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/RadioTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/RadioTest.php
index 2cfdb1886390b7542e76a74aa295debe63b91b95..b8340600e63ab1bb41ceaa9d470aa9c2bf1245f8 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/RadioTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/RadioTest.php
@@ -44,7 +44,7 @@ class RadioTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Radio::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Radio::__construct
      */
     public function testConstruct()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ResetTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ResetTest.php
index 5237122b215435bc8a69ee43317fbd9a1f2acc42..427b0391a8dd962914773b26ad9b3e555bbb307a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ResetTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ResetTest.php
@@ -44,7 +44,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Reset::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Reset::__construct
      */
     public function testConstruct()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/SubmitTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/SubmitTest.php
index 1d2444cb599f390b95408fcd34beeb6729f88703..7d93c9009de5a12e99e1bc2f7b6ff458f32e8144 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/SubmitTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/SubmitTest.php
@@ -44,7 +44,7 @@ class SubmitTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Submit::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Submit::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class SubmitTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Submit::getHtml
+     * @covers \Magento\Framework\Data\Form\Element\Submit::getHtml
      */
     public function testGetHtml()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextTest.php
index 3d0822f60bd455fa2323b4caf649fc3afa8bf25c..85d93de729a2f23ef01d99174c7298b9ff2aa45e 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextTest.php
@@ -44,7 +44,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Text::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Text::__construct
      */
     public function testConstruct()
     {
@@ -53,7 +53,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Text::getHtml
+     * @covers \Magento\Framework\Data\Form\Element\Text::getHtml
      */
     public function testGetHtml()
     {
@@ -63,7 +63,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Text::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Text::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
index 51eb3c0ef09251cf1552f772621deac48b04185f..926de7ebb9776ed1af6fdca59fe3c0fee08a9801 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/TextareaTest.php
@@ -44,7 +44,7 @@ class TextareaTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Textarea::__construct
+     * @covers \Magento\Framework\Data\Form\Element\Textarea::__construct
      */
     public function testConstruct()
     {
@@ -55,7 +55,7 @@ class TextareaTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Textarea::getElementHtml
+     * @covers \Magento\Framework\Data\Form\Element\Textarea::getElementHtml
      */
     public function testGetElementHtml()
     {
@@ -67,7 +67,7 @@ class TextareaTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Data\Form\Element\Textarea::getHtmlAttributes
+     * @covers \Magento\Framework\Data\Form\Element\Textarea::getHtmlAttributes
      */
     public function testGetHtmlAttributes()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/StructureTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/StructureTest.php
index 860338dce31c9c2334a77b4281d48429f5cce1dd..4b994828b51d1745246f8276cd45ad2499333aec 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/StructureTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/StructureTest.php
@@ -566,8 +566,8 @@ class StructureTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @return void
-     * covers \Magento\Framework\Data\Structure::addToParentGroup
-     * covers \Magento\Framework\Data\Structure::getGroupChildNames
+     * @covers \Magento\Framework\Data\Structure::addToParentGroup
+     * @covers \Magento\Framework\Data\Structure::getGroupChildNames
      */
     public function testGroups()
     {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
index 8cd04c545936e8591c2f28bb03ebfba1d57f68a6..13025a0bf1952033448643de65fa89439c62523f 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
@@ -8,8 +8,8 @@ namespace Magento\Framework\Filter\Test\Unit;
 class RemoveTagsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Framework\Filter\RemoveTags::filter
-     * covers \Magento\Framework\Filter\RemoveTags::_convertEntities
+     * @covers \Magento\Framework\Filter\RemoveTags::filter
+     * @covers \Magento\Framework\Filter\RemoveTags::_convertEntities
      */
     public function testRemoveTags()
     {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
index b81c35e60f78dd2ad920decf6fc1b9f6622a14b4..40efc83e4f356d8251db7a8edbd89e8375fd72c9 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
@@ -8,7 +8,7 @@ namespace Magento\Framework\Filter\Test\Unit;
 class StripTagsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Framework\Filter\StripTags::filter
+     * @covers \Magento\Framework\Filter\StripTags::filter
      */
     public function testStripTags()
     {
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/HeaderTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/HeaderTest.php
index 099e2cb48ed9d5b41e0fcfd7545b3b2337dcb9f1..24bd8ff4e21a51727d0785e6825c77b5cf17cb6c 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/HeaderTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/HeaderTest.php
@@ -44,11 +44,11 @@ class HeaderTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider methodsDataProvider
      *
-     * covers \Magento\Framework\HTTP\Header::getHttpHost
-     * covers \Magento\Framework\HTTP\Header::getHttpUserAgent
-     * covers \Magento\Framework\HTTP\Header::getHttpAcceptLanguage
-     * covers \Magento\Framework\HTTP\Header::getHttpAcceptCharset
-     * covers \Magento\Framework\HTTP\Header::getHttpReferer
+     * @covers \Magento\Framework\HTTP\Header::getHttpHost
+     * @covers \Magento\Framework\HTTP\Header::getHttpUserAgent
+     * @covers \Magento\Framework\HTTP\Header::getHttpAcceptLanguage
+     * @covers \Magento\Framework\HTTP\Header::getHttpAcceptCharset
+     * @covers \Magento\Framework\HTTP\Header::getHttpReferer
      */
     public function testHttpMethods($method, $clean, $expectedValue)
     {
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
index ffac4f0eb5a9341d19029c812561fd68fbe29447..ff3bbceba5d1effa55af841f61dbcfe0ed4786b2 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
@@ -85,7 +85,7 @@ class AdapterFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Image\AdapterFactory::create
+     * @covers \Magento\Framework\Image\AdapterFactory::create
      */
     public function testCreateWithoutName()
     {
@@ -120,7 +120,7 @@ class AdapterFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Image\AdapterFactory::create
+     * @covers \Magento\Framework\Image\AdapterFactory::create
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Image adapter is not selected.
      */
@@ -139,7 +139,7 @@ class AdapterFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Image\AdapterFactory::create
+     * @covers \Magento\Framework\Image\AdapterFactory::create
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Image adapter for 'test' is not setup.
      */
@@ -159,7 +159,7 @@ class AdapterFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Image\AdapterFactory::create
+     * @covers \Magento\Framework\Image\AdapterFactory::create
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage stdClass is not instance of \Magento\Framework\Image\Adapter\AdapterInterface
      */
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Chain/ChainTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Chain/ChainTest.php
index 07761697a150a3e0a06316437403616674f1c4a7..11451bb0b805488dfb7557cfd7fe8d66f0c748c9 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Chain/ChainTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Chain/ChainTest.php
@@ -25,8 +25,8 @@ class ChainTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers  \Magento\Framework\Interception\Chain\Chain::invokeNext
-     * covers  \Magento\Framework\Interception\Chain\Chain::__construct
+     * @covers \Magento\Framework\Interception\Chain\Chain::invokeNext
+     * @covers \Magento\Framework\Interception\Chain\Chain::__construct
      */
     public function testInvokeNextBeforePlugin()
     {
@@ -64,7 +64,7 @@ class ChainTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers  \Magento\Framework\Interception\Chain\Chain::invokeNext
+     * @covers \Magento\Framework\Interception\Chain\Chain::invokeNext
      */
     public function testInvokeNextAroundPlugin()
     {
@@ -95,7 +95,7 @@ class ChainTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers  \Magento\Framework\Interception\Chain\Chain::invokeNext
+     * @covers \Magento\Framework\Interception\Chain\Chain::invokeNext
      */
     public function testInvokeNextAfterPlugin()
     {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
index 2ca3f6d1b77b1ee831c57e4dee33bc4189a2f878..463282a829dbbd23c7caf2e3061a1c8b91ccf585 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
@@ -37,12 +37,12 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::getMethodParameters
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::getMethodType
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::getOriginMethodName
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::getParametersType
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::__construct
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::getMethodParameters
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::getMethodType
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::getOriginMethodName
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::getParametersType
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::__construct
      */
     public function testValidate()
     {
@@ -55,7 +55,7 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Incorrect interface in
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
      */
     public function testValidateIncorrectInterface()
     {
@@ -68,7 +68,7 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Invalid [\Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item] $subject type
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
      */
     public function testValidateIncorrectSubjectType()
     {
@@ -81,8 +81,8 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Invalid method signature. Invalid method parameters count
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validateMethodsParameters
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validateMethodsParameters
      */
     public function testValidateIncompatibleMethodArgumentsCount()
     {
@@ -96,8 +96,8 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Incompatible parameter type
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validateMethodsParameters
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validateMethodsParameters
      */
     public function testValidateIncompatibleMethodArgumentsType()
     {
@@ -111,7 +111,7 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Invalid method signature. Detected extra parameters
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
      */
     public function testValidateExtraParameters()
     {
@@ -124,7 +124,7 @@ class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \Magento\Framework\Interception\Code\ValidatorException
      * @expectedExceptionMessage Invalid [] $name type in
-     * covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
+     * @covers \Magento\Framework\Interception\Code\InterfaceValidator::validate
      */
     public function testValidateInvalidProceed()
     {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Definition/CompiledTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Definition/CompiledTest.php
index 800438a656e777a87bfe8c3a5b76d00a09955e82..2818515a626e7bdaae7813e2cd0e34c0fa47164f 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Definition/CompiledTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Definition/CompiledTest.php
@@ -13,8 +13,8 @@ class CompiledTest extends \PHPUnit_Framework_TestCase
     protected $_definitions = ['type' => 'definitions'];
 
     /**
-     * covers \Magento\Framework\Interception\Definition\Compiled::getMethodList
-     * covers \Magento\Framework\Interception\Definition\Compiled::__construct
+     * @covers \Magento\Framework\Interception\Definition\Compiled::getMethodList
+     * @covers \Magento\Framework\Interception\Definition\Compiled::__construct
      */
     public function testGetMethodList()
     {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index c9a116432eee4ea57fec33d65324c62ec2fd9b60..9aa337afc3f726933c6371a9ea802b02c2259ba7 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -78,15 +78,24 @@ class PluginListTest extends \PHPUnit_Framework_TestCase
         $this->_configScopeMock->expects($this->any())->method('getCurrentScope')->will($this->returnValue('backend'));
         $this->_model->getNext('Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item', 'getName');
         $this->_model->getNext('Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer', 'getName');
-        $this->_model->getNext('Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash', 'getName');
+        $this->_model->getNext(
+            'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash',
+            'getName'
+        );
 
         $this->assertEquals(
             'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple',
-            $this->_model->getPlugin('Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item', 'simple_plugin')
+            $this->_model->getPlugin(
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item',
+                'simple_plugin'
+            )
         );
         $this->assertEquals(
             'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced',
-            $this->_model->getPlugin('Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item', 'advanced_plugin')
+            $this->_model->getPlugin(
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item',
+                'advanced_plugin'
+            )
         );
         $this->assertEquals(
             'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple',
@@ -180,8 +189,8 @@ class PluginListTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \InvalidArgumentException
-     * covers \Magento\Framework\Interception\PluginList\PluginList::getNext
-     * covers \Magento\Framework\Interception\PluginList\PluginList::_inheritPlugins
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::_inheritPlugins
      */
     public function testInheritPluginsWithNonExistingClass()
     {
@@ -193,8 +202,8 @@ class PluginListTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Interception\PluginList\PluginList::getNext
-     * covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
      */
     public function testLoadScopedDataCached()
     {
diff --git a/lib/internal/Magento/Framework/Less/Test/Unit/PreProcessor/Instruction/ImportTest.php b/lib/internal/Magento/Framework/Less/Test/Unit/PreProcessor/Instruction/ImportTest.php
index 91de6ddafa2cc4f599d5755266cdc13155e9c4a8..133ac7db0dbcec683fb42775f7a40ebe74c32bc5 100644
--- a/lib/internal/Magento/Framework/Less/Test/Unit/PreProcessor/Instruction/ImportTest.php
+++ b/lib/internal/Magento/Framework/Less/Test/Unit/PreProcessor/Instruction/ImportTest.php
@@ -108,7 +108,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Less\PreProcessor\Instruction\Import::resetRelatedFiles
+     * @covers \Magento\Framework\Less\PreProcessor\Instruction\Import::resetRelatedFiles
      */
     public function testGetRelatedFiles()
     {
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/ValidatorTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/ValidatorTest.php
index 62634c5c1d10bea2b5a0b8337c199f3e0e8be61c..b786006cd46c7b21cd88d76a5e3c8c65f1338063 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/ValidatorTest.php
@@ -41,7 +41,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
      * @dataProvider testIsValidDataProvider
      * @param string $locale
      * @param boolean $valid
-     * covers \Magento\Framework\Locale\Validator::isValid
+     * @covers \Magento\Framework\Locale\Validator::isValid
      */
     public function testIsValid($locale, $valid)
     {
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
index da6ddb497a78e9d61ba226221fb324b290ceeaf9..3ed9c781a76c51575fccea7f9a3b94123cecd508 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
@@ -24,8 +24,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase
      * @param string $messageType
      * @param string $method
      *
-     * covers \Magento\Framework\Mail\Message::setBody
-     * covers \Magento\Framework\Mail\Message::setMessageType
+     * @covers \Magento\Framework\Mail\Message::setBody
+     * @covers \Magento\Framework\Mail\Message::setMessageType
      * @dataProvider setBodyDataProvider
      */
     public function testSetBody($messageType, $method)
@@ -60,8 +60,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase
      * @param string $messageType
      * @param string $method
      *
-     * covers \Magento\Framework\Mail\Message::getBody
-     * covers \Magento\Framework\Mail\Message::setMessageType
+     * @covers \Magento\Framework\Mail\Message::getBody
+     * @covers \Magento\Framework\Mail\Message::setMessageType
      * @dataProvider getBodyDataProvider
      */
     public function testGetBody($messageType, $method)
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/FactoryTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/FactoryTest.php
index 88ca16f01bce2bbb9a3210f430469f953d9f5415..eb9f08e6701181b5c9f433c71b39b5ff97a5fc20 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/FactoryTest.php
@@ -24,8 +24,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Mail\Template\Factory::get
-     * covers \Magento\Framework\Mail\Template\Factory::__construct
+     * @covers \Magento\Framework\Mail\Template\Factory::get
+     * @covers \Magento\Framework\Mail\Template\Factory::__construct
      */
     public function testGet()
     {
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index d6c81a75c8aa7c1614b0f349dc3d42ba24caec2e..0a93ee2ca9ee23c07807d905230cbb3e9cefb549 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -206,7 +206,7 @@ class TransportBuilderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Mail\Template\TransportBuilder::addTo
+     * @covers \Magento\Framework\Mail\Template\TransportBuilder::addTo
      */
     public function testAddTo()
     {
@@ -219,7 +219,7 @@ class TransportBuilderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Mail\Template\TransportBuilder::addBcc
+     * @covers \Magento\Framework\Mail\Template\TransportBuilder::addBcc
      */
     public function testAddBcc()
     {
@@ -232,7 +232,7 @@ class TransportBuilderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Mail\Template\TransportBuilder::setReplyTo
+     * @covers \Magento\Framework\Mail\Template\TransportBuilder::setReplyTo
      */
     public function testSetReplyTo()
     {
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
index 8e58b1d7efac174943d1c9b7321f1c2187f20ee8..cb5590497f3aebce6a4cc42f1f45f8ba746fde76 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
@@ -34,7 +34,7 @@ class TransportTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Mail\Transport::sendMessage
+     * @covers \Magento\Framework\Mail\Transport::sendMessage
      * @expectedException \Magento\Framework\Mail\Exception
      * @expectedExceptionMessage No body specified
      */
diff --git a/lib/internal/Magento/Framework/Math/Test/Unit/CalculatorTest.php b/lib/internal/Magento/Framework/Math/Test/Unit/CalculatorTest.php
index 5b6b1cf1791a534809e5fb12211f0d0b7a090483..8d2fa4c25a776cd524d430b06ff47bcb26a07d3f 100644
--- a/lib/internal/Magento/Framework/Math/Test/Unit/CalculatorTest.php
+++ b/lib/internal/Magento/Framework/Math/Test/Unit/CalculatorTest.php
@@ -34,8 +34,8 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
      * @param bool $negative
      * @param float $expected
      * @dataProvider deltaRoundDataProvider
-     * covers \Magento\Framework\Math\Calculator::deltaRound
-     * covers \Magento\Framework\Math\Calculator::__construct
+     * @covers \Magento\Framework\Math\Calculator::deltaRound
+     * @covers \Magento\Framework\Math\Calculator::__construct
      */
     public function testDeltaRound($price, $negative, $expected)
     {
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
index 13c0698523e9058c58482eb8ae90fe93538d3821..0e2db724f0d5a29e369a26aa8c7346677ca92c6a 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
@@ -27,8 +27,8 @@ class AbstractMessageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\AbstractMessage::getText
-     * covers \Magento\Framework\Message\AbstractMessage::setText
+     * @covers \Magento\Framework\Message\AbstractMessage::getText
+     * @covers \Magento\Framework\Message\AbstractMessage::setText
      * @dataProvider setTextGetTextProvider
      */
     public function testSetTextGetText($text, $resultText)
@@ -46,8 +46,8 @@ class AbstractMessageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\AbstractMessage::getIdentifier
-     * covers \Magento\Framework\Message\AbstractMessage::setIdentifier
+     * @covers \Magento\Framework\Message\AbstractMessage::getIdentifier
+     * @covers \Magento\Framework\Message\AbstractMessage::setIdentifier
      * @dataProvider setIdentifierGetIdentifierProvider
      */
     public function testSetIdentifierGetIdentifier($identifier)
@@ -65,8 +65,8 @@ class AbstractMessageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\AbstractMessage::getIsSticky
-     * covers \Magento\Framework\Message\AbstractMessage::setIsSticky
+     * @covers \Magento\Framework\Message\AbstractMessage::getIsSticky
+     * @covers \Magento\Framework\Message\AbstractMessage::setIsSticky
      */
     public function testSetIsStickyGetIsSticky()
     {
@@ -76,7 +76,7 @@ class AbstractMessageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\AbstractMessage::toString
+     * @covers \Magento\Framework\Message\AbstractMessage::toString
      */
     public function testToString()
     {
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/CollectionTest.php
index 0ce4feb7c14a96d2db21db5d4f36d4eac9c26fc7..f97367965a4d8dc817c0ef34cdd5bfc98482f309 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/CollectionTest.php
@@ -29,8 +29,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::addMessage
-     * covers \Magento\Framework\Message\Collection::getItemsByType
+     * @covers \Magento\Framework\Message\Collection::addMessage
+     * @covers \Magento\Framework\Message\Collection::getItemsByType
      */
     public function testAddMessage()
     {
@@ -51,9 +51,9 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::addMessage
-     * covers \Magento\Framework\Message\Collection::getItems
-     * covers \Magento\Framework\Message\Collection::getLastAddedMessage
+     * @covers \Magento\Framework\Message\Collection::addMessage
+     * @covers \Magento\Framework\Message\Collection::getItems
+     * @covers \Magento\Framework\Message\Collection::getLastAddedMessage
      */
     public function testGetItems()
     {
@@ -75,10 +75,10 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::addMessage
-     * covers \Magento\Framework\Message\Collection::getItemsByType
-     * covers \Magento\Framework\Message\Collection::getCount
-     * covers \Magento\Framework\Message\Collection::getCountByType
+     * @covers \Magento\Framework\Message\Collection::addMessage
+     * @covers \Magento\Framework\Message\Collection::getItemsByType
+     * @covers \Magento\Framework\Message\Collection::getCount
+     * @covers \Magento\Framework\Message\Collection::getCountByType
      */
     public function testGetItemsByType()
     {
@@ -118,8 +118,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::addMessage
-     * covers \Magento\Framework\Message\Collection::getErrors
+     * @covers \Magento\Framework\Message\Collection::addMessage
+     * @covers \Magento\Framework\Message\Collection::getErrors
      */
     public function testGetErrors()
     {
@@ -141,8 +141,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::getMessageByIdentifier
-     * covers \Magento\Framework\Message\Collection::deleteMessageByIdentifier
+     * @covers \Magento\Framework\Message\Collection::getMessageByIdentifier
+     * @covers \Magento\Framework\Message\Collection::deleteMessageByIdentifier
      */
     public function testGetMessageByIdentifier()
     {
@@ -168,7 +168,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::clear
+     * @covers \Magento\Framework\Message\Collection::clear
      */
     public function testClear()
     {
@@ -189,7 +189,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Message\Collection::clear
+     * @covers \Magento\Framework\Message\Collection::clear
      */
     public function testClearWithSticky()
     {
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ActionValidator/RemoveActionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ActionValidator/RemoveActionTest.php
index e7364f106035484c3f54636c2b1ad60757fcb410..c7bcdb23df30365afaa3f3c83938b8fdbde344d6 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ActionValidator/RemoveActionTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ActionValidator/RemoveActionTest.php
@@ -14,8 +14,8 @@ class RemoveActionTest extends \PHPUnit_Framework_TestCase
      * @param bool $expectedResult
      *
      * @dataProvider isAllowedDataProvider
-     * covers \Magento\Framework\Model\ActionValidator\RemoveAction::isAllowed
-     * covers \Magento\Framework\Model\ActionValidator\RemoveAction::getBaseClassName
+     * @covers \Magento\Framework\Model\ActionValidator\RemoveAction::isAllowed
+     * @covers \Magento\Framework\Model\ActionValidator\RemoveAction::getBaseClassName
      */
     public function testIsAllowed($modelToCheck, $protectedModel, $secureArea, $expectedResult)
     {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
index e777d9c51fcbf28f00be4981f63dcc9a14199633..3c5023be5c3661bc84aac7ff3e9e7b37988b455b 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
@@ -135,7 +135,7 @@ class MigrationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Module\Setup\Migration::appendClassAliasReplace
+     * @covers \Magento\Framework\Module\Setup\Migration::appendClassAliasReplace
      */
     public function testAppendClassAliasReplace()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomTest.php
index 8990a324a7e7bd91129bc38c9e2ee36a31e0c802..690928ff07d8e9cb35c9fa286246ead92ddee452 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomTest.php
@@ -72,7 +72,7 @@ class DomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\ObjectManager\Config\Reader\Dom::_createConfigMerger()
+     * @covers \Magento\Framework\ObjectManager\Config\Reader\Dom::_createConfigMerger()
      */
     public function testRead()
     {
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
index 650423f5475597f3aca3ac4fcd404cd41a3d5232..6e7d84e2f341bd8949b616950f3c04edf438ff37 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
@@ -101,7 +101,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Pricing\PriceInfo\Base::getAdjustments
+     * @covers \Magento\Framework\Pricing\PriceInfo\Base::getAdjustments
      */
     public function testGetAdjustments()
     {
@@ -110,7 +110,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Pricing\PriceInfo\Base::getAdjustment
+     * @covers \Magento\Framework\Pricing\PriceInfo\Base::getAdjustment
      */
     public function testGetAdjustment()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayUtilsTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayUtilsTest.php
index 30a43b623090072bed8fde2a7759f1c20a3af493..08e3373ef96857b05e9c7470bd7f79524b575751 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayUtilsTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayUtilsTest.php
@@ -23,7 +23,7 @@ class ArrayUtilsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\ArrayUtils::ksortMultibyte
+     * @covers \Magento\Framework\Stdlib\ArrayUtils::ksortMultibyte
      * @dataProvider ksortMultibyteDataProvider
      */
     public function testKsortMultibyte($input, $locale)
@@ -47,7 +47,7 @@ class ArrayUtilsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\ArrayUtils::decorateArray
+     * @covers \Magento\Framework\Stdlib\ArrayUtils::decorateArray
      */
     public function testDecorateArray()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
index 755ef8c45de48819b70f29b1b0d1c4e21bc032af..d07d8b17c3f2c99ba719b1e6c604afb174919d3f 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
@@ -55,7 +55,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::getSensitiveCookieMetadata
+     * @covers ::getSensitiveCookieMetadata
      */
     public function testGetSensitiveCookieMetadataEmpty()
     {
@@ -71,7 +71,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::getPublicCookieMetadata
+     * @covers ::getPublicCookieMetadata
      */
     public function testGetPublicCookieMetadataEmpty()
     {
@@ -81,7 +81,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::getCookieMetadata
+     * @covers ::getCookieMetadata
      */
     public function testGetCookieMetadataEmpty()
     {
@@ -91,7 +91,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata
      */
     public function testGetSensitiveCookieMetadataDefaults()
     {
@@ -121,7 +121,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
      */
     public function testGetPublicCookieMetadataDefaults()
     {
@@ -153,7 +153,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
      */
     public function testGetCookieMetadataDefaults()
     {
@@ -174,7 +174,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
      */
     public function testGetSensitiveCookieMetadataOverrides()
     {
@@ -210,7 +210,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
      */
     public function testGetPublicCookieMetadataOverrides()
     {
@@ -241,7 +241,7 @@ class CookieScopeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
+     * @covers ::createSensitiveMetadata ::getPublicCookieMetadata ::getCookieMetadata
      */
     public function testGetCookieMetadataOverrides()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringTest.php
index 5a94a0d619ffd1211c2db5209c3c2ac795d8df69..0fef95cff1d54856a799fcc5ec64be1e07a249b2 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringTest.php
@@ -23,7 +23,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\String::split
+     * @covers \Magento\Framework\Stdlib\String::split
      */
     public function testStrSplit()
     {
@@ -41,7 +41,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\String::splitInjection
+     * @covers \Magento\Framework\Stdlib\String::splitInjection
      */
     public function testSplitInjection()
     {
@@ -50,7 +50,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\String::cleanString
+     * @covers \Magento\Framework\Stdlib\String::cleanString
      */
     public function testCleanString()
     {
@@ -70,7 +70,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Stdlib\String::strpos
+     * @covers \Magento\Framework\Stdlib\String::strpos
      */
     public function testStrpos()
     {
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index 06021edadb22ff4bf9e42e0f3bc457574f265de3..52077c116feb40b84619f8e48586bace99f140d5 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -23,7 +23,7 @@ class EscaperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Escaper::escapeHtml
+     * @covers \Magento\Framework\Escaper::escapeHtml
      * @dataProvider escapeHtmlDataProvider
      */
     public function testEscapeHtml($data, $expected, $allowedTags = null)
@@ -58,7 +58,7 @@ class EscaperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Escaper::escapeUrl
+     * @covers \Magento\Framework\Escaper::escapeUrl
      */
     public function testEscapeUrl()
     {
@@ -69,7 +69,7 @@ class EscaperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Escaper::escapeJsQuote
+     * @covers \Magento\Framework\Escaper::escapeJsQuote
      */
     public function testEscapeJsQuote()
     {
@@ -80,7 +80,7 @@ class EscaperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\Escaper::escapeQuote
+     * @covers \Magento\Framework\Escaper::escapeQuote
      */
     public function testEscapeQuote()
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Helper/ObjectManagerTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Helper/ObjectManagerTest.php
deleted file mode 100644
index d4e50811d7d92598df1588fa0af35359b2879a35..0000000000000000000000000000000000000000
--- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Helper/ObjectManagerTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-namespace Magento\Framework\TestFramework\Test\Unit\Unit\Helper;
-
-class ObjectManagerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * List of block default dependencies
-     *
-     * @var array
-     */
-    protected $_blockDependencies = [
-        'request' => 'Magento\Framework\App\RequestInterface',
-        'layout' => 'Magento\Framework\View\LayoutInterface',
-        'eventManager' => 'Magento\Framework\Event\ManagerInterface',
-        'translator' => 'Magento\Framework\TranslateInterface',
-        'cache' => 'Magento\Framework\App\CacheInterface',
-        'design' => 'Magento\Framework\View\DesignInterface',
-        'session' => 'Magento\Framework\Session\SessionManagerInterface',
-        'scopeConfig' => 'Magento\Framework\App\Config\ScopeConfigInterface',
-    ];
-
-    /**
-     * List of model default dependencies
-     *
-     * @var array
-     */
-    protected $_modelDependencies = [
-        'eventManager' => 'Magento\Framework\Event\ManagerInterface',
-        'cacheManager' => 'Magento\Framework\App\CacheInterface',
-        'resource' => 'Magento\Framework\Model\Resource\AbstractResource',
-        'resourceCollection' => 'Magento\Framework\Data\Collection\Db',
-    ];
-
-    /**
-     * @covers \Magento\TestFramework\TestCase\ObjectManager::getBlock
-     */
-    public function testGetBlock()
-    {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        /** @var $template \Magento\Framework\View\Element\Template */
-        $template = $objectManager->getObject('Magento\Framework\View\Element\Template');
-        $this->assertInstanceOf('Magento\Framework\View\Element\Template', $template);
-        foreach ($this->_blockDependencies as $propertyName => $propertyType) {
-            $this->assertAttributeInstanceOf($propertyType, '_' . $propertyName, $template);
-        }
-
-        $area = 'frontend';
-        /** @var $appStateMock \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
-        $appStateMock = $this->getMock('Magento\Framework\App\State', ['getAreaCode'], [], '', false);
-        $appStateMock->expects($this->once())->method('getAreaCode')->will($this->returnValue($area));
-
-        $context = $objectManager->getObject('Magento\Framework\View\Element\Template\Context');
-        $appStateProperty = new \ReflectionProperty('Magento\Framework\View\Element\Template\Context', '_appState');
-        $appStateProperty->setAccessible(true);
-        $appStateProperty->setValue($context, $appStateMock);
-
-        /** @var $template \Magento\Framework\View\Element\Template */
-        $template = $objectManager->getObject('Magento\Framework\View\Element\Template', ['context' => $context]);
-        $this->assertEquals($area, $template->getArea());
-    }
-
-    /**
-     * @covers \Magento\TestFramework\ObjectManager::getModel
-     */
-    public function testGetModel()
-    {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        /** @var $model \Magento\Framework\App\Config\ValueInterface */
-        $model = $objectManager->getObject('Magento\Framework\App\Config\Value');
-        $this->assertInstanceOf('Magento\Framework\App\Config\Value', $model);
-        foreach ($this->_modelDependencies as $propertyName => $propertyType) {
-            $this->assertAttributeInstanceOf($propertyType, '_' . $propertyName, $model);
-        }
-
-        /** @var $resourceMock \Magento\Framework\Module\Resource */
-        $resourceMock = $this->getMock(
-            'Magento\Framework\Module\Resource',
-            ['_getReadAdapter', 'getIdFieldName', '__sleep', '__wakeup'],
-            [],
-            '',
-            false
-        );
-        $resourceMock->expects($this->once())->method('_getReadAdapter')->will($this->returnValue(false));
-        $resourceMock->expects($this->any())->method('getIdFieldName')->will($this->returnValue('id'));
-        $arguments = ['resource' => $resourceMock];
-        $model = $objectManager->getObject('Magento\Framework\App\Config\Value', $arguments);
-        $this->assertFalse($model->getResource()->getDataVersion('test'));
-    }
-}
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
index 27b5fc97cb9e65fdf271cce8118ff9f3ff7b97d5..7799a53c57a6119df0cb9dc256ec33595e759c32 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
@@ -11,8 +11,8 @@ use \Magento\Framework\Url\Encoder;
 class DecoderTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Framework\Url\Encoder::encode
-     * covers \Magento\Framework\Url\Decoder::decode
+     * @covers \Magento\Framework\Url\Encoder::encode
+     * @covers \Magento\Framework\Url\Decoder::decode
      */
     public function testDecode()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
index ae5ccf3b07522b35c46a2ce0269f8e128e0ccee7..c5eedd5cb5a4542658a2301132b7a92de568b51e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\View\Test\Unit\Asset\File;
 
 /**
- * covers \Magento\Framework\View\Asset\File\FallbackContext
+ * @covers \Magento\Framework\View\Asset\File\FallbackContext
  */
 class FallbackContextTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,7 +26,7 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Asset\File\FallbackContext::getConfigPath
+     * @covers \Magento\Framework\View\Asset\File\FallbackContext::getConfigPath
      * @param string $baseUrl
      * @param string $areaType
      * @param string $themePath
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/AbstractFileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/AbstractFileTest.php
index 7505c2aab8c0fa62dc12d7bb976955c07168d699..95900ae331305960d53bc0c77b593d70b1142a29 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/AbstractFileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/AbstractFileTest.php
@@ -69,8 +69,8 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::__construct
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::create
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::__construct
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::create
      */
     public function testCreate()
     {
@@ -83,7 +83,7 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::getFullPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::getFullPath
      */
     public function testGetFullPath()
     {
@@ -108,10 +108,10 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::prepareFile
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareFileName
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareFilePath
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareSortOrder
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::prepareFile
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareFileName
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareFilePath
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_prepareSortOrder
      * @dataProvider getTestContent
      */
     public function testPrepareFile($type, $fileContent, $expectedContent, $existedFiles)
@@ -204,8 +204,8 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::save
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_saveFileContent
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::save
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_saveFileContent
      */
     public function testSave()
     {
@@ -248,8 +248,8 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::delete
-     * covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_deleteFileContent
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::delete
+     * @covers \Magento\Framework\View\Design\Theme\Customization\AbstractFile::_deleteFileContent
      */
     public function testDelete()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/PathTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/PathTest.php
index 6e7b020f731046de1a491a97c88d07f3bbcb4c43..f04ac911ee14d57c216a5f90fc27663daff8aa1f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/PathTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Customization/PathTest.php
@@ -58,8 +58,8 @@ class PathTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\Path::__construct
-     * covers \Magento\Framework\View\Design\Theme\Customization\Path::getCustomizationPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization\Path::__construct
+     * @covers \Magento\Framework\View\Design\Theme\Customization\Path::getCustomizationPath
      */
     public function testGetCustomizationPath()
     {
@@ -69,7 +69,7 @@ class PathTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\Path::getThemeFilesPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization\Path::getThemeFilesPath
      */
     public function testGetThemeFilesPath()
     {
@@ -80,7 +80,7 @@ class PathTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization\Path::getCustomViewConfigPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization\Path::getCustomViewConfigPath
      */
     public function testGetCustomViewConfigPath()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
index 928828537fd04bd594b5b5e76e3f983582c39eff..e181e2532ad0bdf3931242a9b1a3503193f0f84b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
@@ -77,8 +77,8 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::getFiles
-     * covers \Magento\Framework\View\Design\Theme\Customization::__construct
+     * @covers \Magento\Framework\View\Design\Theme\Customization::getFiles
+     * @covers \Magento\Framework\View\Design\Theme\Customization::__construct
      */
     public function testGetFiles()
     {
@@ -95,7 +95,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::getFilesByType
+     * @covers \Magento\Framework\View\Design\Theme\Customization::getFilesByType
      */
     public function testGetFilesByType()
     {
@@ -114,7 +114,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::generateFileInfo
+     * @covers \Magento\Framework\View\Design\Theme\Customization::generateFileInfo
      */
     public function testGenerationOfFileInfo()
     {
@@ -124,7 +124,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::getCustomizationPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization::getCustomizationPath
      */
     public function testGetCustomizationPath()
     {
@@ -141,7 +141,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::getThemeFilesPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization::getThemeFilesPath
      * @dataProvider getThemeFilesPathDataProvider
      * @param string $type
      * @param string $expectedMethod
@@ -174,7 +174,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::getCustomViewConfigPath
+     * @covers \Magento\Framework\View\Design\Theme\Customization::getCustomViewConfigPath
      */
     public function testGetCustomViewConfigPath()
     {
@@ -191,7 +191,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::reorder
+     * @covers \Magento\Framework\View\Design\Theme\Customization::reorder
      * @dataProvider customFileContent
      */
     public function testReorder($sequence, $filesContent)
@@ -267,7 +267,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Customization::delete
+     * @covers \Magento\Framework\View\Design\Theme\Customization::delete
      */
     public function testDelete()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
index 31285b23e88e6b10b96a697950bd29002864b6c6..07c1058228492ad620689c4c671c70c6a78c4795 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
@@ -12,7 +12,7 @@ namespace Magento\Framework\View\Test\Unit\Design\Theme\Domain;
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Framework\View\Design\Theme\Domain\Factory::create
+     * @covers \Magento\Framework\View\Design\Theme\Domain\Factory::create
      */
     public function testCreate()
     {
@@ -44,7 +44,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Domain\Factory::create
+     * @covers \Magento\Framework\View\Design\Theme\Domain\Factory::create
      */
     public function testCreateWithWrongThemeType()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
index 8767f8092cb38da9cc268a08749c2a39b7d7235b..fc733f548a584cd402057356b423fc25dcc11f52 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
@@ -29,7 +29,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
      * @param string $path
      * @param int $expectedId
      * @dataProvider createByIdDataProvider
-     * covers \Magento\Framework\View\Design\Theme\FlyweightFactory::create
+     * @covers \Magento\Framework\View\Design\Theme\FlyweightFactory::create
      */
     public function testCreateById($path, $expectedId)
     {
@@ -63,7 +63,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\FlyweightFactory::create
+     * @covers \Magento\Framework\View\Design\Theme\FlyweightFactory::create
      */
     public function testCreateByPath()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Image/UploaderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Image/UploaderTest.php
index 16fa864e3ecd5b380ad2d67a8e9dc7126b27bd53..8218420f5fcd080904f3ca2c1fb31a1cf088c1be 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Image/UploaderTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Image/UploaderTest.php
@@ -125,7 +125,7 @@ class UploaderTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider uploadDataProvider
-     * covers \Magento\Framework\View\Design\Theme\Image\Uploader::uploadPreviewImage
+     * @covers \Magento\Framework\View\Design\Theme\Image\Uploader::uploadPreviewImage
      */
     public function testUploadPreviewImage($isUploaded, $isValid, $checkExtension, $save, $result, $exception)
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/ImageTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/ImageTest.php
index 9eefb1c423c16711c2e4afd2212c13f7d8cf152e..998afda213463848b794085bd697c61316922afa 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/ImageTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/ImageTest.php
@@ -168,7 +168,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::__construct
+     * @covers \Magento\Framework\View\Design\Theme\Image::__construct
      */
     public function testConstructor()
     {
@@ -176,7 +176,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::createPreviewImage
+     * @covers \Magento\Framework\View\Design\Theme\Image::createPreviewImage
      */
     public function testCreatePreviewImage()
     {
@@ -195,7 +195,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::createPreviewImageCopy
+     * @covers \Magento\Framework\View\Design\Theme\Image::createPreviewImageCopy
      */
     public function testCreatePreviewImageCopy()
     {
@@ -242,7 +242,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::removePreviewImage
+     * @covers \Magento\Framework\View\Design\Theme\Image::removePreviewImage
      */
     public function testRemovePreviewImage()
     {
@@ -254,7 +254,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::removePreviewImage
+     * @covers \Magento\Framework\View\Design\Theme\Image::removePreviewImage
      */
     public function testRemoveEmptyPreviewImage()
     {
@@ -266,7 +266,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::uploadPreviewImage
+     * @covers \Magento\Framework\View\Design\Theme\Image::uploadPreviewImage
      */
     public function testUploadPreviewImage()
     {
@@ -294,7 +294,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::getPreviewImageUrl
+     * @covers \Magento\Framework\View\Design\Theme\Image::getPreviewImageUrl
      */
     public function testGetPreviewImageUrl()
     {
@@ -309,7 +309,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Design\Theme\Image::getPreviewImageUrl
+     * @covers \Magento\Framework\View\Design\Theme\Image::getPreviewImageUrl
      */
     public function testGetDefaultPreviewImageUrl()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
index e1bd08cc6f92c4bb183083b3f85f4d1423fa7b8b..96a3a1f474e27a5ff5fde809ac65fb829fdd2e37 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
@@ -8,7 +8,7 @@ namespace Magento\Framework\View\Test\Unit\Helper;
 class JsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Framework\View\Helper\Js::getScript
+     * @covers \Magento\Framework\View\Helper\Js::getScript
      */
     public function testGetScript()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderTest.php
index f2c8c6f347a6a0730f65528cdd437a32b410eb24..0c514265b3d8feedd7ad6f612554c7368029900c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderTest.php
@@ -14,14 +14,14 @@ use Magento\Framework\View\Layout\ProcessorInterface;
 
 /**
  * Class BuilderTest
- * covers \Magento\Framework\View\Layout\Builder
+ * @covers \Magento\Framework\View\Layout\Builder
  */
 class BuilderTest extends \PHPUnit_Framework_TestCase
 {
     const CLASS_NAME = 'Magento\Framework\View\Layout\Builder';
 
     /**
-     * covers \Magento\Framework\View\Layout\Builder::build()
+     * @covers \Magento\Framework\View\Layout\Builder::build()
      */
     public function testBuild()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
index 1f72728a7b72c2cc8167a24a8f4774809c0bb585..12a318f92beb4aef23244ef98f3353e0b8ca38a8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
@@ -6,13 +6,13 @@
 namespace Magento\Framework\View\Test\Unit\Layout\Generator;
 
 /**
- * covers Magento\Framework\View\Layout\Generator\Block
+ * @covers \Magento\Framework\View\Layout\Generator\Block
  */
 class BlockTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers Magento\Framework\View\Layout\Generator\Block::process()
-     * covers Magento\Framework\View\Layout\Generator\Block::createBlock()
+     * @covers \Magento\Framework\View\Layout\Generator\Block::process()
+     * @covers \Magento\Framework\View\Layout\Generator\Block::createBlock()
      * @param string $testGroup
      * @param string $testTemplate
      * @param string $testTtl
@@ -26,6 +26,7 @@ class BlockTest extends \PHPUnit_Framework_TestCase
      * @dataProvider provider
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function testProcess(
         $testGroup,
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
index 0e5c9ec84d8957895337051890d256bccda9431b..86570f82f9d3cd4859e084953ce55051b3b3504a 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
@@ -12,7 +12,7 @@ namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 /**
  * Class BlockTest
  *
- * covers Magento\Framework\View\Layout\Reader\Block
+ * @covers \Magento\Framework\View\Layout\Reader\Block
  */
 class BlockTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
index 7041e93bef494104850814b7bf0e252073eeaaa3..a6198409487a37df9183ce84f46b27340c10e747 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
@@ -10,7 +10,7 @@ use Magento\Framework\View\Layout;
 
 /**
  * Class HelperTest
- * covers Magento\Framework\View\Layout\ScheduledStructure\Helper
+ * @covers \Magento\Framework\View\Layout\ScheduledStructure\Helper
  */
 class HelperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
index 6a1a56c3d72cdcd08c45c89a305f43f55152b79b..de0509c8c6a7493cb49ddf2e40d7134cb68f5434 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
@@ -66,7 +66,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getListToMove
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getListToMove
      */
     public function testGetListToMove()
     {
@@ -78,7 +78,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getListToRemove
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getListToRemove
      */
     public function testGetListToRemove()
     {
@@ -96,7 +96,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getElements
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getElements
      */
     public function testGetElements()
     {
@@ -104,7 +104,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getElement
      */
     public function testGetElement()
     {
@@ -116,7 +116,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::isElementsEmpty
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::isElementsEmpty
      */
     public function testIsElementsEmpty()
     {
@@ -126,7 +126,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::setElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::setElement
      */
     public function testSetElement()
     {
@@ -144,7 +144,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::hasElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::hasElement
      */
     public function testHasElement()
     {
@@ -153,7 +153,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::unsetElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::unsetElement
      */
     public function testUnsetElement()
     {
@@ -163,7 +163,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getElementToMove
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getElementToMove
      */
     public function testGetElementToMove()
     {
@@ -186,7 +186,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::setElementToMove
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::setElementToMove
      */
     public function testSetElementToMove()
     {
@@ -204,7 +204,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::unsetElementFromListToRemove
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::unsetElementFromListToRemove
      */
     public function testUnsetElementFromListToRemove()
     {
@@ -214,7 +214,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::setElementToRemoveList
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::setElementToRemoveList
      */
     public function testSetElementToRemoveList()
     {
@@ -238,7 +238,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getStructure
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getStructure
      */
     public function testGetStructure()
     {
@@ -246,7 +246,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getStructureElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getStructureElement
      */
     public function testGetStructureElement()
     {
@@ -258,7 +258,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::isStructureEmpty
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::isStructureEmpty
      */
     public function testIsStructureEmpty()
     {
@@ -268,7 +268,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::hasStructureElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::hasStructureElement
      */
     public function testHasStructureElement()
     {
@@ -277,7 +277,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::setStructureElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::setStructureElement
      */
     public function testSetStructureElement()
     {
@@ -295,7 +295,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::unsetStructureElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::unsetStructureElement
      */
     public function testUnsetStructureElement()
     {
@@ -305,7 +305,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getPaths
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getPaths
      */
     public function testGetPaths()
     {
@@ -313,7 +313,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::getPath
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::getPath
      */
     public function testGetPath()
     {
@@ -323,7 +323,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::hasPath
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::hasPath
      */
     public function testHasPath()
     {
@@ -332,7 +332,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::setPathElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::setPathElement
      */
     public function testSetPathElement()
     {
@@ -350,7 +350,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::unsetPathElement
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::unsetPathElement
      */
     public function testUnsetPathElement()
     {
@@ -360,7 +360,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::flushPaths
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::flushPaths
      */
     public function testFlushPaths()
     {
@@ -370,7 +370,7 @@ class ScheduledStructureTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout\ScheduledStructure::flushScheduledStructure
+     * @covers \Magento\Framework\View\Layout\ScheduledStructure::flushScheduledStructure
      */
     public function testFlushScheduledStructure()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
index cdbcf735f4286711068606a57961c29928c9260d..7679ac3d2846e2f1a06c3dada1b988e275ea5de4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
@@ -6,7 +6,8 @@
 namespace Magento\Framework\View\Test\Unit;
 
 /**
- * Class LayoutTest
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LayoutTest extends \PHPUnit_Framework_TestCase
 {
@@ -142,9 +143,9 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
             ->method('create')
             ->willReturn($this->readerContextMock);
         $this->generatorContextFactoryMock = $this->getMockBuilder(
-                'Magento\Framework\View\Layout\Generator\ContextFactory'
-            )->disableOriginalConstructor()
-            ->getMock();
+            'Magento\Framework\View\Layout\Generator\ContextFactory'
+        )->disableOriginalConstructor()
+        ->getMock();
 
         $this->model = new \Magento\Framework\View\Layout(
             $this->processorFactoryMock,
@@ -460,9 +461,9 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Layout::setBlock
-     * covers \Magento\Framework\View\Layout::getAllBlocks
-     * covers \Magento\Framework\View\Layout::unsetElement
+     * @covers \Magento\Framework\View\Layout::setBlock
+     * @covers \Magento\Framework\View\Layout::getAllBlocks
+     * @covers \Magento\Framework\View\Layout::unsetElement
      */
     public function testSetGetBlock()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/TranslatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/TranslatorTest.php
index 16636dfab46a73e6888f87ddbbd101b771eece1e..6dfb6cd3f6e16c6097cc12dc5764fe016d48bbfd 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/TranslatorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/TranslatorTest.php
@@ -51,7 +51,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithNonTranslatedArgument()
     {
@@ -62,7 +62,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithTranslatedArgument()
     {
@@ -74,7 +74,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithHierarchyTranslatedArgumentAndNonStringParam()
     {
@@ -86,7 +86,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithoutModule()
     {
@@ -98,7 +98,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentWithDefaultModuleAndSelfTranslatedMode()
     {
@@ -107,7 +107,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentWithoutModuleAndNoSelfTranslatedMode()
     {
@@ -116,7 +116,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentNodeWithParentModule()
     {
@@ -125,7 +125,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentNodeWithOwnModule()
     {
@@ -134,7 +134,7 @@ XML;
     }
 
     /**
-     * covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentWithNodeThatIsNotInTranslateList()
     {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
index 721ef79e9fce1d870eb29f4382116595946ae7dc..6316c9e0036cfe133bbc4bb5ad88f3b497599a0a 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
@@ -10,7 +10,7 @@ use Magento\Framework;
 
 /**
  * Class BuilderTest
- * covers \Magento\Framework\View\Page\Builder
+ * @covers \Magento\Framework\View\Page\Builder
  */
 class BuilderTest extends \Magento\Framework\View\Test\Unit\Layout\BuilderTest
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
index faf0d388a9b2b3319656e1fc18a22d19061e88e5..de680b4301330f645c1323e9009106a136b0c146 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
@@ -10,7 +10,7 @@ namespace Magento\Framework\View\Test\Unit\Result;
 
 /**
  * Class LayoutTest
- * covers \Magento\Framework\View\Result\Layout
+ * @covers \Magento\Framework\View\Result\Layout
  */
 class LayoutTest extends \PHPUnit_Framework_TestCase
 {
@@ -59,7 +59,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * covers \Magento\Framework\View\Result\Layout::getLayout()
+     * @covers \Magento\Framework\View\Result\Layout::getLayout()
      */
     public function testGetLayout()
     {