diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
index 768d70e8e1f76d50c836203c63386816dbd3a980..dabe1345d14d79fc2ef6c008e5641fcf6ebf96fa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
@@ -63,7 +63,7 @@ class NewWidgetTest extends \PHPUnit_Framework_TestCase
             false,
             false
         );
-        $this->scopeConfig = $this->getMock(\Magento\Framework\App\Config::class, ['getValue'], [], '', false, false);
+        $this->scopeConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '', false, false);
         $this->cacheState = $this->getMock(
             \Magento\Framework\App\Cache\State::class,
             ['isEnabled'],
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
index fb8865a1d7e420735c220a9f2b54e4d07aeff3d0..2b4ffdcd5c176295008187f82e44b64164801122 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
@@ -76,7 +76,7 @@ class SubstitutionTest extends \PHPUnit_Framework_TestCase
             ->willReturn($abstractBlock);
 
         $infoMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
-            ->disableOriginalConstructor()->setMethods([])
+            ->disableOriginalConstructor()
             ->getMock();
         $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
index 50ddfa1be5128c43465cb16cc7e9471bab5f8cd0..8970f57f8bb8a8695a1634f4ec74bfddfb889d7f 100644
--- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
@@ -149,8 +149,7 @@ class AdditionalTest extends \PHPUnit_Framework_TestCase
             '',
             false,
             true,
-            true,
-            ['getValue']
+            true
         );
         $this->cacheStateMock = $this->getMockForAbstractClass(
             \Magento\Framework\App\Cache\StateInterface::class,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
index 06a2e3a2685154e63340274ae2422d3ecb75342a..97ade66fed125eeea40d40db2293c719db96e854 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -160,19 +160,6 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
         $this->urlBuilderMock->expects($this->once())
             ->method('getUrl')
             ->will($this->returnValue($wishlistSharingUrl));
-        $this->scopeConfig->expects($this->any())
-            ->method('getValue')
-            ->will($this->returnValueMap(
-                    [
-                        [
-                            Data::XML_PATH_DEFAULT_LOCALE,
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            null,
-                            $locale
-                        ],
-                    ]
-                )
-            );
 
         $staticArgs = [
             'productName' => $productName,
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 1a8908bf3779f31136c261a8c4f29d44d5fb7281..dccefa5212fb05ad2bd725bf3aef3524ca8beb29 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -3,7 +3,6 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\Module;
 
 /**