diff --git a/lib/Cake/Controller/ErrorController.php b/lib/Cake/Controller/ErrorController.php
index 08d9a57277b..ca914c341a9 100644
--- a/lib/Cake/Controller/ErrorController.php
+++ b/lib/Cake/Controller/ErrorController.php
@@ -1,11 +1,5 @@
 <?php
 /**
- * Error Handling Controller
- *
- * Controller used by ErrorHandler to render error views.
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -14,14 +8,12 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Controller
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 namespace Cake\Controller;
-use Cake\Routing\Router;
 
-App::uses('AppController', 'Controller');
+use Cake\Routing\Router;
 
 /**
  * Error Handling Controller
diff --git a/lib/Cake/Test/TestCase/Core/ObjectTest.php b/lib/Cake/Test/TestCase/Core/ObjectTest.php
index e27c8e8bfdc..93366191705 100644
--- a/lib/Cake/Test/TestCase/Core/ObjectTest.php
+++ b/lib/Cake/Test/TestCase/Core/ObjectTest.php
@@ -515,7 +515,7 @@ public function testRequestActionGetParameters() {
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'params_pass'),
-			array('url' => array('get' => 'value', 'limit' => 5))
+			array('query' => array('get' => 'value', 'limit' => 5))
 		);
 		$this->assertEquals('value', $result->query['get']);
 	}
diff --git a/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
index 0ddca63e1fe..a0ee3310bd8 100644
--- a/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
+++ b/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
@@ -7167,7 +7167,7 @@ public function testFormInputRequiredDetection() {
 			'Imalsonotrequired2',
 			'/label',
 			'input' => array(
-				'type' => 'text', 'name' => 'data[Contact][imalsonotrequired2]',
+				'type' => 'text', 'name' => 'Contact[imalsonotrequired2]',
 				'id' => 'ContactImalsonotrequired2'
 			),
 			'/div'