diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php
index db849f8b825a987b0f265533c0c7e685ee6fef00..ee0e0af6733f08296429adb671d90818af5e931c 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php
@@ -47,9 +47,7 @@ class DeveloperChainFactory implements ChainFactoryInterface
     }
 
     /**
-     * Creates chain of pre-processors
-     *
-     * @return Chain
+     * {inheritdoc}
      */
     public function create(array $arguments = [])
     {
diff --git a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
index dd4676153dedb819ca9c41312c10df61e93c31e6..f16153904e638f380f3fd565bce703b22cdd1073 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
@@ -3,9 +3,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Developer\Model\View\Asset\PreProcessor;
+namespace Magento\Developer\Test\View\Model\View\Asset\PreProcessor;
 
 use Magento\Framework\View\Asset\LocalInterface;
+use Magento\Developer\Model\View\Asset\PreProcessor\DeveloperChain;
 
 class DeveloperChainTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
index bc3cc380ffbb85a70f509d203975ad03bb068d82..33e19db984920af2d86cd01b39c3e9485a5d24a1 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\App\ObjectManager\Environment;
+namespace Magento\Framework\Test\Unit\App\ObjectManager\Environment;
 
 use Magento\Framework\App\Test\Unit\ObjectManager\Environment\CompiledTesting;
 
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
index 47c97497bed2f7ff687ea1930631399881082f05..6dda0dfb1feb5e1fbdd90257b255cba5a6ab9272 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
@@ -26,9 +26,7 @@ class ChainFactory implements ChainFactoryInterface
     }
 
     /**
-     * Creates chain of pre-processors
-     *
-     * @return Chain
+     * {inheritdoc}
      */
     public function create(array $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
index c094ee574d1259db97bf4d5c1bab306ea53c09f3..737fced8777ff1df8cdccccb91d3c37f789035bb 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
@@ -10,6 +10,7 @@ interface ChainFactoryInterface
     /**
      * Creates chain of pre-processors
      *
+     * @param array $arguments
      * @return Chain
      */
     public function create(array $arguments = []);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php
index ca2ad5bc4b97abf5b4be235fa0853ad105cfe4ba..4752d354bc3db4a21d6023ce135bb6e2932d5e75 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\View\Asset\PreProcessor;
+namespace Magento\Framework\View\Test\Unit\Asset\PreProcessor;
+
+use Magento\Framework\View\Asset\PreProcessor\Chain;
 
 /**
  * Class ChainTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
index 773742f2eea28c5b5fba0507dde6802d0cf3d216..9d4cc9ffb80c525b493f0edec98dcbafa4fe8f77 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
@@ -4,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\View\Page\Config;
+namespace Magento\Framework\View\Test\Unit\Page\Config;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\GroupedCollection;
+use Magento\Framework\View\Page\Config\Renderer;
 
 /**
  * Test for page config renderer model
@@ -70,7 +72,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
      */
     protected $titleMock;
 
-    /** @var ObjectManagerHelper */
+    /** @var ObjectManager */
     protected $objectManagerHelper;
 
     protected function setUp()
@@ -116,7 +118,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);;
+        $this->objectManagerHelper = new ObjectManager($this);;
         $this->renderer = $this->objectManagerHelper->getObject(
             'Magento\Framework\View\Page\Config\Renderer',
             [