MAGETWO-34878: PR and cleanup

app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php

@@ -238,7 +238,7 @@ class LoginTest extends \PHPUnit_Framework_TestCase
             ->expects($this->any())
             ->method('authenticate')
             ->with('invalid@example.com', 'invalid')
-            ->willThrowException(new InvalidEmailOrPasswordException(__('Invalid login or password.', [])));
+            ->willThrowException(new InvalidEmailOrPasswordException(__('Invalid login or password.')));
 
         $this->customerSession->expects($this->never())
             ->method('setCustomerDataAsLoggedIn')

lib/internal/Magento/Framework/Test/Unit/PhraseTest.php

@@ -34,7 +34,7 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
         $text = 'some text';
         $arguments = ['arg1', 'arg2'];
         $result = 'rendered text';
-        $phrase = new Phrase($text, $arguments);
+        $phrase = new \Magento\Framework\Phrase($text, $arguments);
         Phrase::setRenderer($this->rendererMock);
 
         $this->rendererMock->expects($this->once())