diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php
index c79ac8d97..e1349c4ba 100644
--- a/lib/Cake/Test/Case/Console/ShellTest.php
+++ b/lib/Cake/Test/Case/Console/ShellTest.php
@@ -749,13 +749,10 @@ class ShellTest extends CakeTestCase {
 	public function testRunCommandBaseclassMethod() {
 		$Mock = $this->getMock('Shell', array('startup', 'getOptionParser', 'out'), array(), '', false);
 		$Parser = $this->getMock('ConsoleOptionParser', array(), array(), '', false);
-
 		$Parser->expects($this->once())->method('help');
 		$Mock->expects($this->once())->method('getOptionParser')
 			->will($this->returnValue($Parser));
-		$Mock->expects($this->never())->method('hr');
 		$Mock->expects($this->once())->method('out');
-
 		$Mock->runCommand('hr', array());
 	}
 
@@ -767,13 +764,10 @@ class ShellTest extends CakeTestCase {
 	public function testRunCommandMissingMethod() {
 		$Mock = $this->getMock('Shell', array('startup', 'getOptionParser', 'out'), array(), '', false);
 		$Parser = $this->getMock('ConsoleOptionParser', array(), array(), '', false);
-
 		$Parser->expects($this->once())->method('help');
-		$Mock->expects($this->never())->method('idontexist');
 		$Mock->expects($this->once())->method('getOptionParser')
 			->will($this->returnValue($Parser));
 		$Mock->expects($this->once())->method('out');
-
 		$result = $Mock->runCommand('idontexist', array());
 		$this->assertFalse($result);
 	}
@@ -1003,31 +997,27 @@ TEXT;
 
 /**
  * Test that shell loggers do not get overridden in constructor if already configured
- * 
+ *
  * @return void
  */
 	public function testShellLoggersDoNotGetOverridden() {
 		$shell = $this->getMock(
 			"Shell", array(
 				"_loggerIsConfigured",
-				"configureStdOutLogger",
-				"configureStdErrLogger",
+				"_configureStdOutLogger",
+				"_configureStdErrLogger",
 			),
 			array(),
 			"",
 			false
 		);
-
 		$shell->expects($this->exactly(2))
 			->method("_loggerIsConfigured")
 			->will($this->returnValue(true));
-
 		$shell->expects($this->never())
 			->method("_configureStdOutLogger");
-
 		$shell->expects($this->never())
 			->method("_configureStdErrLogger");
-
 		$shell->__construct();
 	}
 }
diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
index e7d13b0ea..05c12c532 100644
--- a/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -889,18 +889,12 @@ class DispatcherTest extends CakeTestCase {
 			'_clearBuffer',
 			'_flushBuffer'
 		));
-
-		$response->expects($this->never())
-			->method('body');
-
 		$response->expects($this->exactly(1))
 			->method('_isActive')
 			->will($this->returnValue(true));
-
 		ob_start();
 		$Dispatcher->dispatch($request, $response);
 		$result = ob_get_clean();
-
 		$this->assertEquals("/* this is the test asset css file */\n", $result);
 	}
 
diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
index eb24861c1..222b39813 100644
--- a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
@@ -154,13 +154,10 @@ class AssetDispatcherTest extends CakeTestCase {
 
 		$response = $this->getMock('CakeResponse', array('_sendHeader', 'checkNotModified'));
 		$request = new CakeRequest('theme/test_theme/img/cake.power.gif');
-
 		$response->expects($this->once())->method('checkNotModified')
 			->with($request)
 			->will($this->returnValue(true));
-		$response->expects($this->never())->method('send');
 		$event = new CakeEvent('DispatcherTest', $this, compact('request', 'response'));
-
 		$this->assertSame($response, $filter->beforeDispatch($event));
 		$this->assertEquals($time->format('D, j M Y H:i:s') . ' GMT', $response->modified());
 	}
@@ -193,13 +190,9 @@ class AssetDispatcherTest extends CakeTestCase {
 			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
 		), App::RESET);
-
 		$response = $this->getMock('CakeResponse', array('_sendHeader'));
 		$request = new CakeRequest('theme/test_theme/../../../../../../VERSION.txt');
 		$event = new CakeEvent('Dispatcher.beforeRequest', $this, compact('request', 'response'));
-
-		$response->expects($this->never())->method('send');
-
 		$filter = new AssetDispatcher();
 		$this->assertNull($filter->beforeDispatch($event));
 		$this->assertFalse($event->isStopped());