diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
index 953b7a8ea..3d028afbb 100644
--- a/cake/console/libs/testsuite.php
+++ b/cake/console/libs/testsuite.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: testsuite.php 6730 2008-04-23 18:25:03Z DarkAngelBGE $ */
+/* SVN FILE: $Id$ */
 /**
  * Test Suite Shell
  *
@@ -21,9 +21,9 @@
  * @package			cake
  * @subpackage		cake.cake.console.libs
  * @since			CakePHP(tm) v 1.2.0.4433
- * @version			$Revision: 6715 $
- * @modifiedby		$LastChangedBy: DarkAngelBGE $
- * @lastmodified	$Date: 2008-04-23 20:25:03 +0200 (Wed, 23 Apr 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class TestSuiteShell extends Shell {
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index b39f342a6..451bec286 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -40,7 +40,7 @@ App::import('Helper', array('Session'));
  * @subpackage	cake.tests.cases.libs.view.helpers
  */
 class SessionHelperTest extends CakeTestCase {
-	
+
 	function setUp() {
 		$this->Session = new SessionHelper();
 		$this->Session->__start();
@@ -54,7 +54,7 @@ class SessionHelperTest extends CakeTestCase {
 					'message' => 'This is a calling'
 				),
 				'notification' => array(
-					'layout' => 'sessionHelper',
+					'layout' => 'session_helper',
 					'params' => array('title' => 'Notice!', 'name' => 'Alert!'),
 					'message' => 'This is a test of the emergency broadcasting system',
 				),
@@ -69,10 +69,10 @@ class SessionHelperTest extends CakeTestCase {
 	}
 
 	function tearDown() {
-		$_SESSION = array();		
+		$_SESSION = array();
 		unset($this->Session);
 	}
-	
+
 	function testRead() {
 		$result = $this->Session->read('Deeply.nested.key');
 		$this->assertEqual($result, 'value');
@@ -80,7 +80,7 @@ class SessionHelperTest extends CakeTestCase {
 		$result = $this->Session->read('test');
 		$this->assertEqual($result, 'info');
 	}
-	
+
 	function testCheck() {
 		$this->assertTrue($this->Session->check('test'));
 
@@ -90,26 +90,26 @@ class SessionHelperTest extends CakeTestCase {
 
 		$this->assertFalse($this->Session->check('Nope'));
 	}
-	
+
 	function testWrite() {
 		$this->expectError();
 		$this->Session->write('NoWay', 'AccessDenied');
 	}
-	
+
 	function testFlash() {
 		ob_start();
 		$this->Session->flash();
 		$result = ob_get_contents();
 		ob_clean();
-			
+
 		$expected = '<div id="flashMessage" class="message">This is a calling</div>';
-		$this->assertEqual($result, $expected);		
+		$this->assertEqual($result, $expected);
 		$this->assertFalse($this->Session->check('Message.flash'));
-		
+
 		Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
 		$controller = new Controller();
 		$this->Session->view = new View($controller);
-		
+
 		ob_start();
 		$this->Session->flash('notification');
 		$result = ob_get_contents();
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index d62a3da5f..9310141d8 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: callback_fixture.php 6354 2008-01-10 07:02:33Z nate $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 6354 $
- * @modifiedby		$LastChangedBy: nate $
- * @lastmodified	$Date: 2008-01-10 02:02:33 -0500 (Thu, 10 Jan 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index a12989924..30fd6d615 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: data_test_fixture.php 6354 2008-01-10 07:02:33Z nate $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.6700
- * @version			$Revision: 6354 $
- * @modifiedby		$LastChangedBy: nate $
- * @lastmodified	$Date: 2008-01-10 02:02:33 -0500 (Thu, 10 Jan 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index a9038b5c0..04fdc9b2b 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: flag_tree_fixture.php 6354 2008-01-10 07:02:33Z nate $ */
+/* SVN FILE: $Id$ */
 /**
  * Tree behavior class test fixture.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.5331
- * @version			$Revision: 6354 $
- * @modifiedby		$LastChangedBy: nate $
- * @lastmodified	$Date: 2008-01-10 02:02:33 -0500 (Thu, 10 Jan 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index 2dd70b881..3cbf11386 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: join_thing_fixture.php 4860 2007-04-15 07:19:31Z phpnut $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 4860 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2007-04-15 03:19:31 -0400 (Sun, 15 Apr 2007) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index e8dea334e..70523607f 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: something_else_fixture.php 4860 2007-04-15 07:19:31Z phpnut $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 4860 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2007-04-15 03:19:31 -0400 (Sun, 15 Apr 2007) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index 370545ec0..40123fd9d 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: something_fixture.php 4860 2007-04-15 07:19:31Z phpnut $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 4860 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2007-04-15 03:19:31 -0400 (Sun, 15 Apr 2007) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index 99d988df7..4e07f937e 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: the_paper_monkies_fixture.php 6296 2008-01-01 22:18:17Z nate $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 6296 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2008-01-01 17:18:17 -0500 (Tue, 01 Jan 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index 12a2678ac..1e7d09403 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.4667
- * @version			$Revision: 6571 $
- * @modifiedby		$LastChangedBy: nate $
- * @lastmodified	$Date: 2008-03-15 01:08:06 -0400 (Sat, 15 Mar 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class UnderscoreFieldFixture extends CakeTestFixture {
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 02a776e73..cb953e33c 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: uuid_fixture.php 6354 2008-01-10 07:02:33Z nate $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake.tests
  * @subpackage		cake.tests.fixtures
  * @since			CakePHP(tm) v 1.2.0.6700
- * @version			$Revision: 6354 $
- * @modifiedby		$LastChangedBy: nate $
- * @lastmodified	$Date: 2008-01-10 02:02:33 -0500 (Thu, 10 Jan 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 /**
diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index e026f00d2..220f6c275 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: code_coverage_manager.php 6527 2008-04-09 04:07:56Z DarkAngelBGE $ */
+/* SVN FILE: $Id$ */
 /**
  * A class to manage all aspects for Code Coverage Analysis
  *
@@ -21,9 +21,9 @@
  * @package			cake
  * @subpackage		cake.cake.tests.lib
  * @since			CakePHP(tm) v 1.2.0.4433
- * @version			$Revision: 6527 $
- * @modifiedby		$LastChangedBy: gwoo $
- * @lastmodified	$Date: 2008-03-09 05:07:56 +0100 (Sun, 09 Mar 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Folder');
diff --git a/cake/tests/lib/xdebug.php b/cake/tests/lib/xdebug.php
index bbd7319ee..b49484f09 100644
--- a/cake/tests/lib/xdebug.php
+++ b/cake/tests/lib/xdebug.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: simpletest.php 6488 2008-04-20 15:52:07Z DarkAngelBGE $ */
+/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -21,9 +21,9 @@
  * @package			cake
  * @subpackage		cake.cake.tests.libs
  * @since			CakePHP(tm) v 1.2.0.4433
- * @version			$Revision: 6488 $
- * @modifiedby		$LastChangedBy: gwoo $
- * @lastmodified	$Date: 2008-02-28 16:52:07 +0100 (Thu, 28 Feb 2008) $
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 ?>
diff --git a/cake/tests/test_app/views/layouts/sessionHelper.ctp b/cake/tests/test_app/views/layouts/session_helper.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/sessionHelper.ctp
rename to cake/tests/test_app/views/layouts/session_helper.ctp