diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php
index fd650ade8..2ac0c1815 100644
--- a/lib/Cake/Test/Case/Cache/CacheTest.php
+++ b/lib/Cake/Test/Case/Cache/CacheTest.php
@@ -205,7 +205,7 @@ class CacheTest extends CakeTestCase {
 	public function testWritingWithConfig() {
 		$_cacheConfigSessions = Cache::config('sessions');
 
-		Cache::write('test_somthing', 'this is the test data', 'tests');
+		Cache::write('test_something', 'this is the test data', 'tests');
 
 		$expected = array(
 			'path' => TMP . 'sessions' . DS,
diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
index c9ae26447..ee06d2d74 100644
--- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
+++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -366,7 +366,7 @@ class MemcacheEngineTest extends CakeTestCase {
 	}
 
 /**
- * test that a 0 duration can succesfully write.
+ * test that a 0 duration can successfully write.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php
index 847902b69..d65fe4cc3 100644
--- a/lib/Cake/Test/Case/Configure/IniReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php
@@ -38,7 +38,7 @@ class IniReaderTest extends CakeTestCase {
 	}
 
 /**
- * test constrction
+ * test construct
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
index 6696f9a4f..d241917f1 100644
--- a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
+++ b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -38,7 +38,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 	}
 
 /**
- * test setting the console epliog
+ * test setting the console epilog
  *
  * @return void
  */
@@ -302,7 +302,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 	public function testPositionalArgument() {
 		$parser = new ConsoleOptionParser('test', false);
 		$result = $parser->addArgument('name', array('help' => 'An argument'));
-		$this->assertEquals($parser, $result, 'Should returnn this');
+		$this->assertEquals($parser, $result, 'Should return this');
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php
index 870130af3..2e6c63243 100644
--- a/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php
@@ -146,7 +146,7 @@ class PhpAclTest extends CakeTestCase {
 		$this->assertTrue($this->Acl->check('jan', 'foo/bar'));
 		$this->assertTrue($this->Acl->check('user/jan', 'foo/bar'));
 		$this->assertTrue($this->Acl->check('Role/admin', 'controllers/bar'));
-		$this->assertTrue($this->Acl->check(array('User' => array('username' =>'jan')), '/controlers/bar/bll'));
+		$this->assertTrue($this->Acl->check(array('User' => array('username' =>'jan')), '/controllers/bar/bll'));
 		$this->assertTrue($this->Acl->check('Role/database_manager', 'controllers/db/create'));
 		$this->assertTrue($this->Acl->check('User/db_manager_2', 'controllers/db/create'));
 		$this->assertFalse($this->Acl->check('db_manager_2', '/controllers/users/Dashboard'));
@@ -338,7 +338,7 @@ class PhpAclTest extends CakeTestCase {
 		$this->assertTrue($this->Acl->check('Role/sales', 'controllers/bla/create'));
 		$this->assertTrue($this->Acl->check('Role/default', 'foo'));
 		// undefined user, undefined aco
-		$this->assertTrue($this->Acl->check('foobart', 'foo/bar'));
+		$this->assertTrue($this->Acl->check('foobar', 'foo/bar'));
 
 		// deny rule: Role.sales -> controllers.*.delete
 		$this->assertFalse($this->Acl->check('Role/sales', 'controllers/bar/delete'));
diff --git a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
index 254708d27..cfdcf6623 100644
--- a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
@@ -51,8 +51,8 @@ class AclComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that construtor throws an exception when Acl.classname is a
- * non-existant class
+ * test that constructor throws an exception when Acl.classname is a
+ * non-existent class
  *
  * @expectedException CakeException
  * @return void
@@ -64,7 +64,7 @@ class AclComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that adapter() allows control of the interal implementation AclComponent uses.
+ * test that adapter() allows control of the internal implementation AclComponent uses.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
index b3974249d..3523185b6 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
@@ -160,7 +160,7 @@ DIGEST;
 	}
 
 /**
- * test authenticate sucesss
+ * test authenticate success
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
index 9faff0c46..5463c4e44 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
@@ -115,7 +115,7 @@ class FormAuthenticateTest extends CakeTestCase {
 	}
 
 /**
- * test authenticate sucesss
+ * test authenticate success
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
index 183919d2d..695d45aac 100644
--- a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -481,7 +481,7 @@ class AuthComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that isAuthroized calls methods correctly
+ * test that isAuthorized calls methods correctly
  *
  * @return void
  */
@@ -881,7 +881,7 @@ class AuthComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that no redirects or authoization tests occur on the loginAction
+ * test that no redirects or authorization tests occur on the loginAction
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
index 13d198084..45df7d372 100644
--- a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -162,7 +162,7 @@ class ControllerPaginateModel extends CakeTestModel {
 }
 
 /**
- * PaginatorControllerCommentclass
+ * PaginatorControllerComment class
  *
  * @package       Cake.Test.Case.Controller.Component
  */
@@ -191,7 +191,7 @@ class PaginatorControllerComment extends CakeTestModel {
 }
 
 /**
- * PaginatorAuthorclass
+ * PaginatorAuthor class
  *
  * @package       Cake.Test.Case.Controller.Component
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index 380062ab8..e0c6b10cf 100644
--- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -189,7 +189,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 /**
  * Test that RequestHandler sets $this->ext when jQuery sends its wonky-ish headers
- * and the application is configured to handle multiplate extensions
+ * and the application is configured to handle multiple extensions
  *
  * @return void
  */
@@ -203,7 +203,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 	}
 
 /**
- * Test that RequestHandler does not set $this->ext when multple accepts are sent.
+ * Test that RequestHandler does not set $this->ext when multiple accepts are sent.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
index e0b502a2d..996e0ac86 100644
--- a/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
@@ -24,7 +24,6 @@ App::uses('Controller', 'Controller');
 * TestSecurityComponent
 *
 * @package       Cake.Test.Case.Controller.Component
-* @package       Cake.Test.Case.Controller.Component
 */
 class TestSecurityComponent extends SecurityComponent {
 
@@ -32,7 +31,7 @@ class TestSecurityComponent extends SecurityComponent {
  * validatePost method
  *
  * @param Controller $controller
- * @return unknown
+ * @return boolean
  */
 	public function validatePost($controller) {
 		return $this->_validatePost($controller);
@@ -43,7 +42,6 @@ class TestSecurityComponent extends SecurityComponent {
 * SecurityTestController
 *
 * @package       Cake.Test.Case.Controller.Component
-* @package       Cake.Test.Case.Controller.Component
 */
 class SecurityTestController extends Controller {
 
@@ -64,7 +62,7 @@ class SecurityTestController extends Controller {
 /**
  * failed property
  *
- * @var bool false
+ * @var boolean false
  */
 	public $failed = false;
 
@@ -97,7 +95,7 @@ class SecurityTestController extends Controller {
 	}
 
 /**
- * Conveinence method for header()
+ * Convenience method for header()
  *
  * @param string $status
  * @return void
@@ -162,7 +160,7 @@ class SecurityComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that initalize can set properties.
+ * test that initialize can set properties.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
index fb05d2ef6..82c2d52cf 100644
--- a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
+++ b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
@@ -150,7 +150,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
-		$this->assertEquals($Controller->components, $expected, 'Duplication of settings occured. %s');
+		$this->assertEquals($Controller->components, $expected, 'Duplication of settings occurred. %s');
 	}
 
 /**
@@ -177,7 +177,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
-		$this->assertEquals($Controller->helpers, $expected, 'Duplication of settings occured. %s');
+		$this->assertEquals($Controller->helpers, $expected, 'Duplication of settings occurred. %s');
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php
index 8cb054ecf..cf95c8e4c 100644
--- a/lib/Cake/Test/Case/Core/CakePluginTest.php
+++ b/lib/Cake/Test/Case/Core/CakePluginTest.php
@@ -216,7 +216,7 @@ class CakePluginTest extends CakeTestCase {
 	}
 
 /**
- * Tests that CakePlugin::loadAll() will load all plgins in the configured folder
+ * Tests that CakePlugin::loadAll() will load all plugins in the configured folder
  *
  * @return void
  */
@@ -227,7 +227,7 @@ class CakePluginTest extends CakeTestCase {
 	}
 
 /**
- * Tests that CakePlugin::loadAll() will load all plgins in the configured folder with bootstrap loading
+ * Tests that CakePlugin::loadAll() will load all plugins in the configured folder with bootstrap loading
  *
  * @return void
  */
@@ -242,7 +242,7 @@ class CakePluginTest extends CakeTestCase {
 	}
 
 /**
- * Tests that CakePlugin::loadAll() will load all plgins in the configured folder wit defaults
+ * Tests that CakePlugin::loadAll() will load all plugins in the configured folder wit defaults
  * and overrides for a plugin
  *
  * @return void
diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php
index 4568ff29f..bd3f634fb 100644
--- a/lib/Cake/Test/Case/Core/ConfigureTest.php
+++ b/lib/Cake/Test/Case/Core/ConfigureTest.php
@@ -305,7 +305,7 @@ class ConfigureTest extends CakeTestCase {
 		Configure::write('testing', 'value');
 		Configure::store('store_test', 'default', array('store_test' => 'one'));
 		Configure::delete('testing');
-		$this->assertNull(Configure::read('store_test'), 'Calling store with data shouldnt modify runtime.');
+		$this->assertNull(Configure::read('store_test'), 'Calling store with data shouldn\'t modify runtime.');
 
 		Configure::restore('store_test', 'default');
 		$this->assertEquals('one', Configure::read('store_test'));
diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
index fe33eeb99..834d05be2 100644
--- a/lib/Cake/Test/Case/Log/CakeLogTest.php
+++ b/lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -131,7 +131,7 @@ class CakeLogTest extends CakeTestCase {
 	}
 
 /**
- * explict tests for drop()
+ * explicit tests for drop()
  *
  * @return void
  **/
diff --git a/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
index 01f8c5578..2a741289b 100644
--- a/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
+++ b/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
@@ -30,7 +30,6 @@ App::uses('DbAcl', 'Model');
 * Test Person class - self joined model
 *
 * @package       Cake.Test.Case.Model.Behavior
-* @package       Cake.Test.Case.Model.Behavior
 */
 class AclPerson extends CakeTestModel {
 
@@ -105,7 +104,6 @@ class AclPerson extends CakeTestModel {
 * AclUser class
 *
 * @package       Cake.Test.Case.Model.Behavior
-* @package       Cake.Test.Case.Model.Behavior
 */
 class AclUser extends CakeTestModel {
 
@@ -143,7 +141,6 @@ class AclUser extends CakeTestModel {
 * AclPost class
 *
 * @package       Cake.Test.Case.Model.Behavior
-* @package       Cake.Test.Case.Model.Behavior
 */
 class AclPost extends CakeTestModel {
 
@@ -181,7 +178,6 @@ class AclPost extends CakeTestModel {
 * AclBehaviorTest class
 *
 * @package       Cake.Test.Case.Model.Behavior
-* @package       Cake.Test.Case.Model.Behavior
 */
 class AclBehaviorTest extends CakeTestCase {
 
diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
index adcd1df8d..523cd36c4 100644
--- a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
+++ b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -870,7 +870,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 	}
 
 /**
- * Test infinite loops not occuring with unbindTranslation()
+ * Test infinite loops not occurring with unbindTranslation()
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
index baeee291a..5c29a4b5a 100644
--- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
+++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
@@ -151,11 +151,11 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	}
 
 /**
- * testDetectNoneExistantParent method
+ * testDetectNoneExistentParent method
  *
  * @return void
  */
-	public function testDetectNoneExistantParent() {
+	public function testDetectNoneExistentParent() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
 		$this->Tree->initialize(2, 2);
diff --git a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
index 1ac417378..e429ab510 100644
--- a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
+++ b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
@@ -550,7 +550,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 	}
 
 /**
- * test that attaching a non existant Behavior triggers a cake error.
+ * test that attaching a non existent Behavior triggers a cake error.
  *
  * @expectedException MissingBehaviorException
  * @return void
@@ -793,7 +793,8 @@ class BehaviorCollectionTest extends CakeTestCase {
 		);
 		//$this->assertEquals($Apple->find('all'), $expected);
 	}
-	/**
+
+/**
  * testBehaviorBelongsToFindCallbacks method
  *
  * @return void
@@ -1167,7 +1168,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 	}
 
 /**
- * test hasMethod returrning a 'callback'
+ * test hasMethod returning a 'callback'
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
index 1f468fcef..e080f5626 100644
--- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php
+++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -222,7 +222,7 @@ class TestAppSchema extends CakeSchema {
 }
 
 /**
- * SchmeaPost class
+ * SchemaPost class
  *
  * @package       Cake.Test.Case.Model
  */
@@ -341,7 +341,7 @@ class SchemaDatatype extends CakeTestModel {
  * Testdescribe class
  *
  * This class is defined purely to inherit the cacheSources variable otherwise
- * testSchemaCreatTable will fail if listSources has already been called and
+ * testSchemaCreateTable will fail if listSources has already been called and
  * its source cache populated - I.e. if the test is run within a group
  *
  * @uses          CakeTestModel
diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
index 104e87fef..dfca05c91 100644
--- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -348,7 +348,7 @@ class CakeSessionTest extends CakeTestCase {
  * @return void
  */
 	public function testDestroy() {
-		TestCakeSession::write('bulletProof', 'invicible');
+		TestCakeSession::write('bulletProof', 'invincible');
 		$id = TestCakeSession::id();
 		TestCakeSession::destroy();
 
diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index 3c31e543f..a2b248c0b 100644
--- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -581,7 +581,7 @@ class DboSourceTest extends CakeTestCase {
 	}
 
 /**
- * test that cacheMethod works as exepected
+ * test that cacheMethod works as expected
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
index 401c87adf..f4d1ceb33 100644
--- a/lib/Cake/Test/Case/Model/ModelReadTest.php
+++ b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -7692,7 +7692,7 @@ class ModelReadTest extends BaseModelTest {
  *
  */
 	public function testVirtualFieldsMysql() {
-		$this->skipIf(!($this->db instanceof Mysql), 'The rest of virtualFieds test only compatible with Mysql.');
+		$this->skipIf(!($this->db instanceof Mysql), 'The rest of virtualFields test only compatible with Mysql.');
 
 		$this->loadFixtures('Post', 'Author');
 		$Post = ClassRegistry::init('Post');
diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php
index 02be26ce4..8d35eed36 100644
--- a/lib/Cake/Test/Case/Model/ModelValidationTest.php
+++ b/lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -568,7 +568,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Something->create();
 		$result = $Something->save($data);
-		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+		$this->assertFalse($result, 'Save occurred even when with models failed. %s');
 		$this->assertEquals($JoinThing->validationErrors, $expectedError);
 		$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
 		$this->assertSame($count, 0);
@@ -587,7 +587,7 @@ class ModelValidationTest extends BaseModelTest {
 		);
 		$Something->create();
 		$result = $Something->save($data);
-		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+		$this->assertFalse($result, 'Save occurred even when with models failed. %s');
 
 		$joinRecords = $JoinThing->find('count', array(
 			'conditions' => array('JoinThing.something_id' => $data['Something']['id'])
@@ -681,7 +681,7 @@ class ModelValidationTest extends BaseModelTest {
 
 /**
  * Test that missing validation methods trigger errors in development mode.
- * Helps to make developement easier.
+ * Helps to make development easier.
  *
  * @expectedException PHPUnit_Framework_Error
  * @return void
diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
index 1b58e4c9b..80484e4a3 100644
--- a/lib/Cake/Test/Case/Model/ModelWriteTest.php
+++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -1050,8 +1050,8 @@ class ModelWriteTest extends BaseModelTest {
 		$data = array(
 			'user_id' => '1',
 			'non_existent' => 'This field does not exist',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
+			'title' => 'Fifth Article - New Title',
+			'body' => 'Fifth Article Body',
 			'published' => 'N'
 		);
 		$result = $TestModel->create() && $TestModel->save($data);
@@ -1060,8 +1060,8 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = array('Article' => array(
 			'id' => '5',
 			'user_id' => '1',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
+			'title' => 'Fifth Article - New Title',
+			'body' => 'Fifth Article Body',
 			'published' => 'N'
 		));
 		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
@@ -4689,7 +4689,7 @@ class ModelWriteTest extends BaseModelTest {
 	}
 
 /**
- * test that saveAll behaves like plain save() when suplied empty data
+ * test that saveAll behaves like plain save() when supplied empty data
  *
  * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/277-test-saveall-with-validation-returns-incorrect-boolean-when-saving-empty-data
  * @return void
@@ -6024,7 +6024,7 @@ class ModelWriteTest extends BaseModelTest {
 	}
 
 /**
- * test that saveAssociated behaves like plain save() when suplied empty data
+ * test that saveAssociated behaves like plain save() when supplied empty data
  *
  * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/277-test-saveall-with-validation-returns-incorrect-boolean-when-saving-empty-data
  * @return void
diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php
index 9f583066e..8708df26c 100644
--- a/lib/Cake/Test/Case/Model/models.php
+++ b/lib/Cake/Test/Case/Model/models.php
@@ -2070,7 +2070,7 @@ class ValidationTest1 extends CakeTestModel {
 	}
 
 /**
- * Custom validator with messaage
+ * Custom validator with message
  *
  * @return array
  */
diff --git a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
index 563e937ad..611986613 100644
--- a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
+++ b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
@@ -39,7 +39,7 @@ class TestHttpResponse extends HttpResponse {
 /**
  * Convenience method for testing protected method
  *
- * @param string $body A string continaing the body to decode
+ * @param string $body A string containing the body to decode
  * @param mixed $encoding Can be false in case no encoding is being used, or a string representing the encoding
  * @return mixed Array or false
  */
@@ -50,7 +50,7 @@ class TestHttpResponse extends HttpResponse {
 /**
  * Convenience method for testing protected method
  *
- * @param string $body A string continaing the chunked body to decode
+ * @param string $body A string containing the chunked body to decode
  * @return mixed Array or false
  */
 	public function decodeChunkedBody($body) {
@@ -123,7 +123,7 @@ class HttpResponseTest extends CakeTestCase {
 	}
 
 /**
- * testGetHeadr
+ * testGetHeader
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
index c2d17723f..6869e83a8 100644
--- a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
+++ b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
@@ -107,7 +107,7 @@ class TestHttpSocket extends HttpSocket {
  *
  * @param array $uri A $uri array, or uses $this->config if left empty
  * @param string $uriTemplate The Uri template/format to use
- * @return string A fully qualified URL formated according to $uriTemplate
+ * @return string A fully qualified URL formatted according to $uriTemplate
  */
 	public function buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%port/%path?%query#%fragment') {
 		return parent::_buildUri($uri, $uriTemplate);
@@ -1538,7 +1538,7 @@ class HttpSocketTest extends CakeTestCase {
 	}
 
 /**
- * Test that HttpSocket::escapeToken is escaping all characters as descriped in RFC 2616 (HTTP 1.1 specs)
+ * Test that HttpSocket::escapeToken is escaping all characters as described in RFC 2616 (HTTP 1.1 specs)
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
index b38bd364d..441be1f1b 100644
--- a/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -403,7 +403,7 @@ class TestCachedPagesController extends Controller {
 	);
 
 /**
- * Mock out the reponse object so it doesn't send headers.
+ * Mock out the response object so it doesn't send headers.
  *
  * @var string
  */
diff --git a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
index 9dba06fb0..d4bf61cf4 100644
--- a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
+++ b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
@@ -531,7 +531,7 @@ class CakeRouteTest extends CakeTestCase {
 	}
 
 /**
- * test numerically indexed defaults, get appeneded to pass
+ * test numerically indexed defaults, get appended to pass
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php
index 772bcdc7d..ade59c3de 100644
--- a/lib/Cake/Test/Case/Routing/RouterTest.php
+++ b/lib/Cake/Test/Case/Routing/RouterTest.php
@@ -2110,7 +2110,7 @@ class RouterTest extends CakeTestCase {
 	}
 
 /**
- * testCurentRoute
+ * testCurrentRoute
  *
  * This test needs some improvement and actual requestAction() usage
  *
diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
index 0bebaf4cc..b0d33db4b 100644
--- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php
+++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -800,7 +800,7 @@ class CakeTimeTest extends CakeTestCase {
 	}
 
 /**
- * test new format() syntax which inverts first and secod parameters
+ * test new format() syntax which inverts first and second parameters
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
index e034f5f10..e24d00871 100644
--- a/lib/Cake/Test/Case/Utility/DebuggerTest.php
+++ b/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -201,7 +201,7 @@ class DebuggerTest extends CakeTestCase {
 	}
 
 /**
- * Test that choosing a non-existant format causes an exception
+ * Test that choosing a non-existent format causes an exception
  *
  * @expectedException CakeException
  * @return void
diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php
index 9537b896e..5795dcb7f 100644
--- a/lib/Cake/Test/Case/Utility/FileTest.php
+++ b/lib/Cake/Test/Case/Utility/FileTest.php
@@ -236,11 +236,11 @@ class FileTest extends CakeTestCase {
 	}
 
 /**
- * testOpeningNonExistantFileCreatesIt method
+ * testOpeningNonExistentFileCreatesIt method
  *
  * @return void
  */
-	public function testOpeningNonExistantFileCreatesIt() {
+	public function testOpeningNonExistentFileCreatesIt() {
 		$someFile = new File(TMP . 'some_file.txt', false);
 		$this->assertTrue($someFile->open());
 		$this->assertEquals('', $someFile->read());
diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php
index 99b7a3d3f..24fafe9d9 100644
--- a/lib/Cake/Test/Case/Utility/FolderTest.php
+++ b/lib/Cake/Test/Case/Utility/FolderTest.php
@@ -125,7 +125,7 @@ class FolderTest extends CakeTestCase {
 	}
 
 /**
- * test creation of single and mulitple paths.
+ * test creation of single and multiple paths.
  *
  * @return void
  */
@@ -162,7 +162,7 @@ class FolderTest extends CakeTestCase {
 	}
 
 /**
- * test recurisve directory create failure.
+ * test recursive directory create failure.
  *
  * @return void
  */
@@ -731,15 +731,15 @@ class FolderTest extends CakeTestCase {
 	}
 
 /**
- * testConstructWithNonExistantPath method
+ * testConstructWithNonExistentPath method
  *
  * @return void
  */
-	public function testConstructWithNonExistantPath() {
-		$Folder = new Folder(TMP . 'config_non_existant', true);
-		$this->assertTrue(is_dir(TMP . 'config_non_existant'));
+	public function testConstructWithNonExistentPath() {
+		$Folder = new Folder(TMP . 'config_non_existent', true);
+		$this->assertTrue(is_dir(TMP . 'config_non_existent'));
 		$Folder->cd(TMP);
-		$Folder->delete($Folder->pwd() . 'config_non_existant');
+		$Folder->delete($Folder->pwd() . 'config_non_existent');
 	}
 
 /**
@@ -748,7 +748,7 @@ class FolderTest extends CakeTestCase {
  * @return void
  */
 	public function testDirSize() {
-		$Folder = new Folder(TMP . 'config_non_existant', true);
+		$Folder = new Folder(TMP . 'config_non_existent', true);
 		$this->assertEquals($Folder->dirSize(), 0);
 
 		$File = new File($Folder->pwd() . DS . 'my.php', true, 0777);
@@ -758,7 +758,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertEquals($Folder->dirSize(), 14);
 
 		$Folder->cd(TMP);
-		$Folder->delete($Folder->pwd() . 'config_non_existant');
+		$Folder->delete($Folder->pwd() . 'config_non_existent');
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
index 0042e185f..b3eb5d80f 100644
--- a/lib/Cake/Test/Case/Utility/InflectorTest.php
+++ b/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -28,7 +28,6 @@ App::uses('Inflector', 'Utility');
 /**
  * Short description for class.
  *
- * @package		  cake.tests
  * @package       Cake.Test.Case.Utility
  */
 class InflectorTest extends CakeTestCase {
diff --git a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
index d00fb383b..85976a205 100644
--- a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
+++ b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
@@ -352,7 +352,7 @@ class ObjectCollectionTest extends CakeTestCase {
 	}
 
 /**
- * test that returrning null doesn't modify parameters.
+ * test that returning null doesn't modify parameters.
  *
  * @return void
  */
@@ -383,7 +383,7 @@ class ObjectCollectionTest extends CakeTestCase {
 	}
 
 /**
- * test order of callbacks trigerring based on priority.
+ * test order of callbacks triggering based on priority.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
index 81091fb89..ead808ac4 100644
--- a/lib/Cake/Test/Case/Utility/XmlTest.php
+++ b/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -712,7 +712,7 @@ class XmlTest extends CakeTestCase {
 /**
  * testNamespace
  *
- * @retun void
+ * @return void
  */
 	public function testNamespace() {
 		$xmlResponse = Xml::build('<root xmlns:ns="http://cakephp.org"><ns:tag id="1"><child>good</child><otherchild>bad</otherchild></ns:tag><tag>Tag without ns</tag></root>');
diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
index fe0999f19..42175c6f8 100644
--- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
@@ -525,9 +525,9 @@ class CacheHelperTest extends CakeTestCase {
 /**
  * test ControllerName contains AppName
  *
- * This test verifys view cache is created correctly when the app name is contained in part of the controller name.
+ * This test verifies view cache is created correctly when the app name is contained in part of the controller name.
  * (webapp Name) base name is 'cache' controller is 'cacheTest' action is 'cache_name'
- * apps url would look somehing like http://localhost/cache/cacheTest/cache_name
+ * apps url would look something like http://localhost/cache/cacheTest/cache_name
  *
  * @return void
  **/
diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
index d91b33284..5f328ace1 100644
--- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -1547,7 +1547,7 @@ class FormHelperTest extends CakeTestCase {
 /**
  * testEmptyInputErrorValidation method
  *
- * test validation error div when validation message is overriden by an empty string when calling input()
+ * test validation error div when validation message is overridden by an empty string when calling input()
  *
  * @access public
  * @return void
diff --git a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
index ba0e3877b..08ab106a5 100644
--- a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
@@ -172,7 +172,7 @@ class SessionHelperTest extends CakeTestCase {
 	}
 
 /**
- * test using eleents in plugins.
+ * test using elements in plugins.
  *
  * @return void
  */
diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php
index 0f83b6b0c..b4b7707be 100644
--- a/lib/Cake/Test/Case/View/HelperTest.php
+++ b/lib/Cake/Test/Case/View/HelperTest.php
@@ -256,7 +256,7 @@ class HelperTest extends CakeTestCase {
 	}
 
 /**
- * Test setting an entity and retriving the entity, model and field.
+ * Test setting an entity and retrieving the entity, model and field.
  *
  * @dataProvider entityProvider
  * @return void
diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
index 4eb9710f6..ca77c2021 100644
--- a/lib/Cake/Test/Case/View/ViewTest.php
+++ b/lib/Cake/Test/Case/View/ViewTest.php
@@ -655,9 +655,9 @@ class ViewTest extends CakeTestCase {
 		$result = $this->View->element('test_plugin_element');
 		$this->assertEquals($result, 'this is the test set using View::$plugin plugin element');
 
-		$result = $this->View->element('non_existant_element');
+		$result = $this->View->element('non_existent_element');
 		$this->assertRegExp('/Not Found:/', $result);
-		$this->assertRegExp('/non_existant_element/', $result);
+		$this->assertRegExp('/non_existent_element/', $result);
 
 		$result = $this->View->element('TestPlugin.plugin_element', array(), array('plugin' => 'test_plugin'));
 		$this->assertRegExp('/Not Found:/', $result);