diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index 924147237..2c9b9f45d 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -20,22 +20,27 @@
  * @since         CakePHP(tm) v 0.10.8.2117
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
  * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
  *
- * $modelPaths 	= array('/full/path/to/models/', '/next/full/path/to/models/');
- * $viewPaths = array('/full/path/to/views/', '/next/full/path/to/views/');
- * $controllerPaths = array(/full/path/to/controllers/', '/next/full/path/to/controllers/');
- * $pluginPaths = array('/full/path/to/plugins/', '/next/full/path/to/plugins/');
- * $behaviorPaths = array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/');
- * $componentPaths = array('/full/path/to/components/', '/next/full/path/to/components/');
- * $helperPaths = array('/full/path/to/helpers/', '/next/full/path/to/helpers/');
- * $vendorPaths = array('/full/path/to/vendors/', '/next/full/path/to/vendors/');
- * $shellPaths = array('/full/path/to/shells/', '/next/full/path/to/shells/');
- * $localePaths = array('/full/path/to/locale/', '/next/full/path/to/locale/';
+ * App::build(array(
+ *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
+ *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ *     'controllers' => array(/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ *     'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ *     'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ *     'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ *     'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * ));
  *
  */
+
 /**
  * As of 1.3, additional rules for the inflector are added below
  *
diff --git a/app/webroot/test.php b/app/webroot/test.php
index 725469d93..4cdbd8c28 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -93,7 +93,7 @@ if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
-$corePath = Configure::corePaths('cake');
+$corePath = App::core('cake');
 if (isset($corePath[0])) {
 	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
 } else {
diff --git a/cake/basics.php b/cake/basics.php
index cae6e65bd..b6b07c761 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Basic Cake functionality.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Basic defines for timing functions.
  */
@@ -34,6 +36,7 @@
 	define('WEEK', 7 * DAY);
 	define('MONTH', 30 * DAY);
 	define('YEAR', 365 * DAY);
+
 /**
  * Patch for PHP < 5.0
  */
@@ -46,6 +49,7 @@ if (!function_exists('clone')) {
 		}');
 	}
 }
+
 /**
  * Loads configuration files. Receives a set of configuration files
  * to load.
@@ -75,6 +79,7 @@ if (!function_exists('clone')) {
 		}
 		return true;
 	}
+
 /**
  * Loads component/components from LIBS. Takes optional number of parameters.
  *
@@ -91,6 +96,7 @@ if (!function_exists('clone')) {
 			require_once(LIBS . strtolower($file) . '.php');
 		}
 	}
+
 /**
  * Prints out debug information about given variable.
  *
@@ -118,6 +124,7 @@ if (!function_exists('clone')) {
 		}
 	}
 if (!function_exists('getMicrotime')) {
+
 /**
  * Returns microtime for execution time checking
  *
@@ -129,6 +136,7 @@ if (!function_exists('getMicrotime')) {
 	}
 }
 if (!function_exists('sortByKey')) {
+
 /**
  * Sorts given $array by key $sortby.
  *
@@ -160,6 +168,7 @@ if (!function_exists('sortByKey')) {
 	}
 }
 if (!function_exists('array_combine')) {
+
 /**
  * Combines given identical arrays by using the first array's values as keys,
  * and the second one's values as values. (Implemented for backwards compatibility with PHP4)
@@ -188,6 +197,7 @@ if (!function_exists('array_combine')) {
 		return $output;
 	}
 }
+
 /**
  * Convenience method for htmlspecialchars.
  *
@@ -208,6 +218,7 @@ if (!function_exists('array_combine')) {
 		}
 		return htmlspecialchars($text, ENT_QUOTES, $charset);
 	}
+
 /**
  * Returns an array of all the given parameters.
  *
@@ -228,6 +239,7 @@ if (!function_exists('array_combine')) {
 		$args = func_get_args();
 		return $args;
 	}
+
 /**
  * Constructs associative array from pairs of arguments.
  *
@@ -257,6 +269,7 @@ if (!function_exists('array_combine')) {
 		}
 		return $a;
 	}
+
 /**
  * Convenience method for echo().
  *
@@ -266,6 +279,7 @@ if (!function_exists('array_combine')) {
 	function e($text) {
 		echo $text;
 	}
+
 /**
  * Convenience method for strtolower().
  *
@@ -276,6 +290,7 @@ if (!function_exists('array_combine')) {
 	function low($str) {
 		return strtolower($str);
 	}
+
 /**
  * Convenience method for strtoupper().
  *
@@ -286,6 +301,7 @@ if (!function_exists('array_combine')) {
 	function up($str) {
 		return strtoupper($str);
 	}
+
 /**
  * Convenience method for str_replace().
  *
@@ -298,6 +314,7 @@ if (!function_exists('array_combine')) {
 	function r($search, $replace, $subject) {
 		return str_replace($search, $replace, $subject);
 	}
+
 /**
  * Print_r convenience function, which prints out <PRE> tags around
  * the output of given array. Similar to debug().
@@ -314,6 +331,7 @@ if (!function_exists('array_combine')) {
 			echo '</pre>';
 		}
 	}
+
 /**
  * Display parameters.
  *
@@ -329,6 +347,7 @@ if (!function_exists('array_combine')) {
 		}
 		return $p;
 	}
+
 /**
  * Merge a group of arrays
  *
@@ -350,6 +369,7 @@ if (!function_exists('array_combine')) {
 		}
 		return $r;
 	}
+
 /**
  * Gets an environment variable from available sources, and provides emulation
  * for unsupported or inconsistent environment variables (i.e. DOCUMENT_ROOT on
@@ -362,8 +382,8 @@ if (!function_exists('array_combine')) {
  */
 	function env($key) {
 		if ($key == 'HTTPS') {
-			if (isset($_SERVER) && !empty($_SERVER)) {
-				return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on');
+			if (isset($_SERVER['HTTPS'])) {
+				return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 			}
 			return (strpos(env('SCRIPT_URI'), 'https://') === 0);
 		}
@@ -426,6 +446,7 @@ if (!function_exists('array_combine')) {
 		return null;
 	}
 if (!function_exists('file_put_contents')) {
+
 /**
  * Writes data into file.
  *
@@ -453,6 +474,7 @@ if (!function_exists('file_put_contents')) {
 		return false;
 	}
 }
+
 /**
  * Reads/writes temporary data to cache files or session.
  *
@@ -504,6 +526,7 @@ if (!function_exists('file_put_contents')) {
 		}
 		return $data;
 	}
+
 /**
  * Used to delete files in the cache directories, or clear contents of cache directories
  *
@@ -566,6 +589,7 @@ if (!function_exists('file_put_contents')) {
 		}
 		return false;
 	}
+
 /**
  * Recursively strips slashes from all values in an array
  *
@@ -583,6 +607,7 @@ if (!function_exists('file_put_contents')) {
 		}
 		return $values;
 	}
+
 /**
  * Returns a translated string if one is found; Otherwise, the submitted message.
  *
@@ -605,6 +630,7 @@ if (!function_exists('file_put_contents')) {
 			return I18n::translate($singular);
 		}
 	}
+
 /**
  * Returns correct plural form of message identified by $singular and $plural for count $count.
  * Some languages have more than one form for plural messages dependent on the count.
@@ -624,11 +650,12 @@ if (!function_exists('file_put_contents')) {
 		}
 
 		if ($return === false) {
-			echo I18n::translate($singular, $plural, null, 5, $count);
+			echo I18n::translate($singular, $plural, null, 6, $count);
 		} else {
-			return I18n::translate($singular, $plural, null, 5, $count);
+			return I18n::translate($singular, $plural, null, 6, $count);
 		}
 	}
+
 /**
  * Allows you to override the current domain for a single message lookup.
  *
@@ -651,6 +678,7 @@ if (!function_exists('file_put_contents')) {
 			return I18n::translate($msg, null, $domain);
 		}
 	}
+
 /**
  * Allows you to override the current domain for a single plural message lookup.
  * Returns correct plural form of message identified by $singular and $plural for count $count
@@ -672,11 +700,12 @@ if (!function_exists('file_put_contents')) {
 		}
 
 		if ($return === false) {
-			echo I18n::translate($singular, $plural, $domain, 5, $count);
+			echo I18n::translate($singular, $plural, $domain, 6, $count);
 		} else {
-			return I18n::translate($singular, $plural, $domain, 5, $count);
+			return I18n::translate($singular, $plural, $domain, 6, $count);
 		}
 	}
+
 /**
  * Allows you to override the current domain for a single message lookup.
  * It also allows you to specify a category.
@@ -713,6 +742,7 @@ if (!function_exists('file_put_contents')) {
 			return I18n::translate($msg, null, $domain, $category);
 		}
 	}
+
 /**
  * Allows you to override the current domain for a single plural message lookup.
  * It also allows you to specify a category.
@@ -723,13 +753,13 @@ if (!function_exists('file_put_contents')) {
  * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
  *
  * Note that the category must be specified with a numeric value, instead of the constant name.  The values are:
- * LC_CTYPE     0
- * LC_NUMERIC   1
- * LC_TIME      2
- * LC_COLLATE   3
- * LC_MONETARY  4
- * LC_MESSAGES  5
- * LC_ALL       6
+ * LC_ALL       0
+ * LC_COLLATE   1
+ * LC_CTYPE     2
+ * LC_MONETARY  3
+ * LC_NUMERIC   4
+ * LC_TIME      5
+ * LC_MESSAGES  6
  *
  * @param string $domain Domain
  * @param string $singular Singular string to translate
@@ -753,6 +783,7 @@ if (!function_exists('file_put_contents')) {
 			return I18n::translate($singular, $plural, $domain, $category, $count);
 		}
 	}
+
 /**
  * The category argument allows a specific category of the locale settings to be used for fetching a message.
  * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
@@ -785,6 +816,7 @@ if (!function_exists('file_put_contents')) {
 			return I18n::translate($msg, null, null, $category);
 		}
 	}
+
 /**
  * Computes the difference of arrays using keys for comparison.
  *
@@ -819,6 +851,7 @@ if (!function_exists('file_put_contents')) {
 			return $valuesDiff;
 		}
 	}
+
 /**
  * Computes the intersection of arrays using keys for comparison
  *
@@ -837,6 +870,7 @@ if (!function_exists('file_put_contents')) {
 			return $res;
 		}
 	}
+
 /**
  * Shortcut to Log::write.
  *
@@ -850,6 +884,7 @@ if (!function_exists('file_put_contents')) {
 		$good = ' ';
 		CakeLog::write('error', str_replace($bad, $good, $message));
 	}
+
 /**
  * Searches include path for files.
  *
@@ -870,6 +905,7 @@ if (!function_exists('file_put_contents')) {
 		}
 		return false;
 	}
+
 /**
  * Convert forward slashes to underscores and removes first and last underscores in a string
  *
@@ -883,6 +919,7 @@ if (!function_exists('file_put_contents')) {
 		$string = str_replace('/', '_', $string);
 		return $string;
 	}
+
 /**
  * Implements http_build_query for PHP4.
  *
@@ -922,6 +959,7 @@ if (!function_exists('file_put_contents')) {
 			return implode($argSep, $out);
 		}
 	}
+
 /**
  * Wraps ternary operations. If $condition is a non-empty value, $val1 is returned, otherwise $val2.
  * Don't use for isset() conditions, or wrap your variable with @ operator:
diff --git a/cake/config/paths.php b/cake/config/paths.php
index 6a6449f0e..4a29fadab 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * If the index.php file is used instead of an .htaccess file
  * or if the user can not set the web root to use the public
@@ -36,92 +38,112 @@
 	if (!defined('WEBROOT_DIR')) {
 		define('WEBROOT_DIR', 'webroot');
 	}
+
 /**
  * Path to the cake directory.
  */
 	define('CAKE', CORE_PATH.'cake'.DS);
+
 /**
  * Path to the application's directory.
  */
 if (!defined('APP')) {
 	define('APP', ROOT.DS.APP_DIR.DS);
 }
+
 /**
  * Path to the application's models directory.
  */
 	define('MODELS', APP.'models'.DS);
+
 /**
  * Path to model behaviors directory.
  */
 	define('BEHAVIORS', MODELS.'behaviors'.DS);
+
 /**
  * Path to the application's controllers directory.
  */
 	define('CONTROLLERS', APP.'controllers'.DS);
+
 /**
  * Path to the application's components directory.
  */
 	define('COMPONENTS', CONTROLLERS.'components'.DS);
+
 /**
  * Path to the application's views directory.
  */
 	define('VIEWS', APP.'views'.DS);
+
 /**
  * Path to the application's helpers directory.
  */
 	define('HELPERS', VIEWS.'helpers'.DS);
+
 /**
  * Path to the application's view's layouts directory.
  */
 	define('LAYOUTS', VIEWS.'layouts'.DS);
+
 /**
  * Path to the application's view's elements directory.
  * It's supposed to hold pieces of PHP/HTML that are used on multiple pages
  * and are not linked to a particular layout (like polls, footers and so on).
  */
 	define('ELEMENTS', VIEWS.'elements'.DS);
+
 /**
  * Path to the configuration files directory.
  */
 if (!defined('CONFIGS')) {
 	define('CONFIGS', APP.'config'.DS);
 }
+
 /**
  * Path to the libs directory.
  */
 	define('INFLECTIONS', CAKE.'config'.DS.'inflections'.DS);
+
 /**
  * Path to the libs directory.
  */
 	define('LIBS', CAKE.'libs'.DS);
+
 /**
  * Path to the public CSS directory.
  */
 	define('CSS', WWW_ROOT.'css'.DS);
+
 /**
  * Path to the public JavaScript directory.
  */
 	define('JS', WWW_ROOT.'js'.DS);
+
 /**
  * Path to the public images directory.
  */
 	define('IMAGES', WWW_ROOT.'img'.DS);
+
 /**
  * Path to the console libs direcotry.
  */
 	define('CONSOLE_LIBS', CAKE.'console'.DS.'libs'.DS);
+
 /**
  * Path to the tests directory.
  */
 if (!defined('TESTS')) {
 	define('TESTS', APP.'tests'.DS);
 }
+
 /**
  * Path to the core tests directory.
  */
 if (!defined('CAKE_TESTS')) {
 	define('CAKE_TESTS', CAKE.'tests'.DS);
 }
+
 /**
  * Path to the test suite.
  */
@@ -131,48 +153,58 @@ if (!defined('CAKE_TESTS')) {
  * Path to the controller test directory.
  */
 	define('CONTROLLER_TESTS', TESTS.'cases'.DS.'controllers'.DS);
+
 /**
  * Path to the components test directory.
  */
 	define('COMPONENT_TESTS', TESTS.'cases'.DS.'components'.DS);
+
 /**
  * Path to the helpers test directory.
  */
 	define('HELPER_TESTS', TESTS.'cases'.DS.'views'.DS.'helpers'.DS);
+
 /**
  * Path to the models' test directory.
  */
 	define('MODEL_TESTS', TESTS.'cases'.DS.'models'.DS);
+
 /**
  * Path to the lib test directory.
  */
 	define('LIB_TESTS', CAKE_TESTS.'cases'.DS.'lib'.DS);
+
 /**
  * Path to the temporary files directory.
  */
 if (!defined('TMP')) {
 	define('TMP', APP.'tmp'.DS);
 }
+
 /**
  * Path to the logs directory.
  */
 	define('LOGS', TMP.'logs'.DS);
+
 /**
  * Path to the cache files directory. It can be shared between hosts in a multi-server setup.
  */
 	define('CACHE', TMP.'cache'.DS);
+
 /**
  * Path to the vendors directory.
  */
 if (!defined('VENDORS')) {
 	define('VENDORS', CAKE_CORE_INCLUDE_PATH.DS.'vendors'.DS);
 }
+
 /**
  * Path to the Pear directory
  * The purporse is to make it easy porting Pear libs into Cake
  * without setting the include_path PHP variable.
  */
 	define('PEAR', VENDORS.'Pear'.DS);
+
 /**
  *  Full url prefix
  */
@@ -189,18 +221,21 @@ if (!defined('FULL_BASE_URL')) {
 	}
 	unset($httpHost, $s);
 }
+
 /**
  * Web path to the public images directory.
  */
 if (!defined('IMAGES_URL')) {
 	define('IMAGES_URL', 'img/');
 }
+
 /**
  * Web path to the CSS files directory.
  */
 if (!defined('CSS_URL')) {
 	define('CSS_URL', 'css/');
 }
+
 /**
  * Web path to the js files directory.
  */
diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php
index 361b9f4ce..5207b0d95 100644
--- a/cake/config/unicode/casefolding/0080_00ff.php
+++ b/cake/config/unicode/casefolding/0080_00ff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php
index 4f27b2b08..804ef66af 100644
--- a/cake/config/unicode/casefolding/0100_017f.php
+++ b/cake/config/unicode/casefolding/0100_017f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php
index c3d60326e..1eed655ba 100644
--- a/cake/config/unicode/casefolding/0180_024F.php
+++ b/cake/config/unicode/casefolding/0180_024F.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php
index 31d9b912d..505bdf9e6 100644
--- a/cake/config/unicode/casefolding/0250_02af.php
+++ b/cake/config/unicode/casefolding/0250_02af.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php
index 776667a88..a8f5fabe9 100644
--- a/cake/config/unicode/casefolding/0370_03ff.php
+++ b/cake/config/unicode/casefolding/0370_03ff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php
index 6e1f6e9a8..58f777e45 100644
--- a/cake/config/unicode/casefolding/0400_04ff.php
+++ b/cake/config/unicode/casefolding/0400_04ff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php
index 17853593e..6a5b661a8 100644
--- a/cake/config/unicode/casefolding/0500_052f.php
+++ b/cake/config/unicode/casefolding/0500_052f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php
index 83000a12f..d22dd68a8 100644
--- a/cake/config/unicode/casefolding/0530_058f.php
+++ b/cake/config/unicode/casefolding/0530_058f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php
index b8ad76f65..bdce745ad 100644
--- a/cake/config/unicode/casefolding/1e00_1eff.php
+++ b/cake/config/unicode/casefolding/1e00_1eff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php
index 2e758924c..aeecb3ede 100644
--- a/cake/config/unicode/casefolding/1f00_1fff.php
+++ b/cake/config/unicode/casefolding/1f00_1fff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php
index 42bf20709..66824e45b 100644
--- a/cake/config/unicode/casefolding/2100_214f.php
+++ b/cake/config/unicode/casefolding/2100_214f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php
index ac4f9d154..d85bbe7f3 100644
--- a/cake/config/unicode/casefolding/2150_218f.php
+++ b/cake/config/unicode/casefolding/2150_218f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php
index 9efd3916f..b3d5b5e5e 100644
--- a/cake/config/unicode/casefolding/2460_24ff.php
+++ b/cake/config/unicode/casefolding/2460_24ff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php
index 0b00aa577..5c687e782 100644
--- a/cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php
index 91dc2e47e..e2713f193 100644
--- a/cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php
index 8f07be272..e2fdb3131 100644
--- a/cake/config/unicode/casefolding/2c80_2cff.php
+++ b/cake/config/unicode/casefolding/2c80_2cff.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php
index ddcd35e46..3a6d99ac2 100644
--- a/cake/config/unicode/casefolding/ff00_ffef.php
+++ b/cake/config/unicode/casefolding/ff00_ffef.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Case Folding Properties.
  *
@@ -28,6 +29,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * The upper field is the decimal value of the upper case character
  *
diff --git a/cake/console/cake b/cake/console/cake
index 1257251d6..cd7256cd0 100755
--- a/cake/console/cake
+++ b/cake/console/cake
@@ -22,8 +22,6 @@
 # @license			http://www.opensource.org/licenses/mit-license.php The MIT License
 #
 ################################################################################
-clear
-
 LIB=${0/%cake/}
 APP=`pwd`
 
diff --git a/cake/console/cake.php b/cake/console/cake.php
index 1c234e23a..7864a82bc 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php -q
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Command-line code generation utility to automate programmer chores.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Shell dispatcher
  *
@@ -32,6 +34,7 @@
  * @subpackage    cake.cake.console
  */
 class ShellDispatcher {
+
 /**
  * Standard input stream.
  *
@@ -39,6 +42,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $stdin;
+
 /**
  * Standard output stream.
  *
@@ -46,6 +50,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $stdout;
+
 /**
  * Standard error stream.
  *
@@ -53,6 +58,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $stderr;
+
 /**
  * Contains command switches parsed from the command line.
  *
@@ -60,6 +66,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $params = array();
+
 /**
  * Contains arguments parsed from the command line.
  *
@@ -67,6 +74,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $args = array();
+
 /**
  * The file name of the shell that was invoked.
  *
@@ -74,6 +82,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shell = null;
+
 /**
  * The class name of the shell that was invoked.
  *
@@ -81,6 +90,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shellClass = null;
+
 /**
  * The command called if public methods are available.
  *
@@ -88,6 +98,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shellCommand = null;
+
 /**
  * The path locations of shells.
  *
@@ -95,6 +106,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shellPaths = array();
+
 /**
  * The path to the current shell location.
  *
@@ -102,6 +114,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shellPath = null;
+
 /**
  * The name of the shell in camelized.
  *
@@ -109,6 +122,7 @@ class ShellDispatcher {
  * @access public
  */
 	var $shellName = null;
+
 /**
  * Constructs this ShellDispatcher instance.
  *
@@ -117,19 +131,27 @@ class ShellDispatcher {
 	function ShellDispatcher($args = array()) {
 		$this->__construct($args);
 	}
+
 /**
  * Constructor
  *
- * @param array $args the argv.
+ * The execution of the script is stopped after dispatching the request with
+ * a status code of either 0 or 1 according to the result of the dispatch.
+ *
+ * @param array $args the argv
+ * @return void
+ * @access public
  */
 	function __construct($args = array()) {
 		set_time_limit(0);
+
 		$this->__initConstants();
 		$this->parseParams($args);
 		$this->_initEnvironment();
 		$this->__buildPaths();
-		$this->_stop($this->dispatch());
+		$this->_stop($this->dispatch() === false ? 1 : 0);
 	}
+
 /**
  * Defines core configuration.
  *
@@ -154,6 +176,7 @@ class ShellDispatcher {
 		}
 		require_once(CORE_PATH . 'cake' . DS . 'basics.php');
 	}
+
 /**
  * Defines current working environment.
  *
@@ -190,6 +213,7 @@ class ShellDispatcher {
 
 		$this->shiftArgs();
 	}
+
 /**
  * Builds the shell paths.
  *
@@ -224,6 +248,7 @@ class ShellDispatcher {
 
 		$this->shellPaths = array_values(array_unique(array_merge($paths, App::path('shells'))));
 	}
+
 /**
  * Initializes the environment and loads the Cake core.
  *
@@ -259,129 +284,163 @@ class ShellDispatcher {
 		Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
 
 		if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
-			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
-			Configure::buildPaths(array());
+			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'libs' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
+			App::build();
 		}
 
 		Configure::write('debug', 1);
 		return true;
 	}
+
+/**
+ * Clear the console
+ *
+ * @return void
+ * @access public
+ */
+	function clear() {
+		if (empty($this->params['noclear'])) {
+			if ( DS === '/') {
+				passthru('clear');
+			} else {
+				passthru('cls');
+			}
+		}
+	}
+
 /**
  * Dispatches a CLI request
  *
+ * @return boolean
  * @access public
  */
 	function dispatch() {
-		if (isset($this->args[0])) {
-			$plugin = null;
-			$shell = $this->args[0];
-			if (strpos($shell, '.') !== false)  {
-				list($plugin, $shell) = explode('.', $this->args[0]);
-			}
+		$arg = $this->shiftArgs();
 
-			$this->shell = $shell;
-			$this->shiftArgs();
-			$this->shellName = Inflector::camelize($this->shell);
-			$this->shellClass = $this->shellName . 'Shell';
-
-			if ($this->shell === 'help') {
-				$this->help();
-			} else {
-				$loaded = false;
-				foreach ($this->shellPaths as $path) {
-					$this->shellPath = $path . $this->shell . '.php';
-
-					$isPlugin = ($plugin && strpos($path, DS . $plugin . DS . 'vendors' . DS . 'shells' . DS) !== false);
-					if (($isPlugin && file_exists($this->shellPath)) || (!$plugin && file_exists($this->shellPath))) {
-						$loaded = true;
-						break;
-					}
-				}
-
-				if ($loaded) {
-					if (!class_exists('Shell')) {
-						require CONSOLE_LIBS . 'shell.php';
-					}
-					require $this->shellPath;
-					if (class_exists($this->shellClass)) {
-						$command = null;
-						if (isset($this->args[0])) {
-							$command = $this->args[0];
-						}
-						$this->shellCommand = Inflector::variable($command);
-						$shell = new $this->shellClass($this);
-
-						if (strtolower(get_parent_class($shell)) == 'shell') {
-							$shell->initialize();
-							$shell->loadTasks();
-
-							foreach ($shell->taskNames as $task) {
-								if (strtolower(get_parent_class($shell)) == 'shell') {
-									$shell->{$task}->initialize();
-									$shell->{$task}->loadTasks();
-								}
-							}
-
-							$task = Inflector::camelize($command);
-							if (in_array($task, $shell->taskNames)) {
-								$this->shiftArgs();
-								$shell->{$task}->startup();
-								if (isset($this->args[0]) && $this->args[0] == 'help') {
-									if (method_exists($shell->{$task}, 'help')) {
-										$shell->{$task}->help();
-										$this->_stop();
-									} else {
-										$this->help();
-									}
-								}
-								return $shell->{$task}->execute();
-							}
-						}
-
-						$classMethods = get_class_methods($shell);
-
-						$privateMethod = $missingCommand = false;
-						if ((in_array($command, $classMethods) || in_array(strtolower($command), $classMethods)) && strpos($command, '_', 0) === 0) {
-							$privateMethod = true;
-						}
-
-						if (!in_array($command, $classMethods) && !in_array(strtolower($command), $classMethods)) {
-							$missingCommand = true;
-						}
-
-						$protectedCommands = array(
-							'initialize','in','out','err','hr',
-							'createfile', 'isdir','copydir','object','tostring',
-							'requestaction','log','cakeerror', 'shelldispatcher',
-							'__initconstants','__initenvironment','__construct',
-							'dispatch','__bootstrap','getinput','stdout','stderr','parseparams','shiftargs'
-						);
-
-						if (in_array(strtolower($command), $protectedCommands)) {
-							$missingCommand = true;
-						}
-
-						if ($missingCommand && method_exists($shell, 'main')) {
-							$shell->startup();
-							return $shell->main();
-						} elseif (!$privateMethod && method_exists($shell, $command)) {
-							$this->shiftArgs();
-							$shell->startup();
-							return $shell->{$command}();
-						} else {
-							$this->stderr("Unknown {$this->shellName} command '$command'.\nFor usage, try 'cake {$this->shell} help'.\n\n");
-						}
-					} else {
-						$this->stderr('Class '.$this->shellClass.' could not be loaded');
-					}
-				} else {
-					$this->help();
-				}
-			}
-		} else {
+		if (!$arg) {
 			$this->help();
+			return false;
 		}
+		if ($arg == 'help') {
+			$this->help();
+			return true;
+		}
+
+		if (strpos($arg, '.') !== false)  {
+			list($plugin, $shell) = explode('.', $arg);
+		} else {
+			$plugin = null;
+			$shell = $arg;
+		}
+		$this->shell = $shell;
+		$this->shellName = Inflector::camelize($shell);
+		$this->shellClass = $this->shellName . 'Shell';
+
+		$arg = null;
+
+		if (isset($this->args[0])) {
+			$arg = $this->args[0];
+			$this->shellCommand = Inflector::variable($arg);
+		}
+
+		$Shell = $this->_getShell($plugin);
+
+		if (!$Shell) {
+			$title = sprintf(__('Error: Class %s could not be loaded.', true), $this->shellClass);
+			$this->stderr($title . "\n");
+			return false;
+		}
+
+		$methods = array();
+
+		if (is_a($Shell, 'Shell')) {
+			$Shell->initialize();
+			$Shell->loadTasks();
+
+			foreach ($Shell->taskNames as $task) {
+				if (is_a($Shell->{$task}, 'Shell')) {
+					$Shell->{$task}->initialize();
+					$Shell->{$task}->loadTasks();
+				}
+			}
+
+			$task = Inflector::camelize($arg);
+
+			if (in_array($task, $Shell->taskNames)) {
+				$this->shiftArgs();
+				$Shell->{$task}->startup();
+
+				if (isset($this->args[0]) && $this->args[0] == 'help') {
+					if (method_exists($Shell->{$task}, 'help')) {
+						$Shell->{$task}->help();
+					} else {
+						$this->help();
+					}
+					return true;
+				}
+				return $Shell->{$task}->execute();
+			}
+			$methods = array_diff(get_class_methods('Shell'), array('help'));
+		}
+		$methods = array_diff(get_class_methods($Shell), $methods);
+		$added = in_array(strtolower($arg), array_map('strtolower', $methods));
+		$private = $arg[0] == '_' && method_exists($Shell, $arg);
+
+		if (!$private) {
+			if ($added) {
+				$this->shiftArgs();
+				$Shell->startup();
+				return $Shell->{$arg}();
+			}
+			if (method_exists($Shell, 'main')) {
+				$Shell->startup();
+				return $Shell->main();
+			}
+		}
+
+		$title = sprintf(__('Error: Unknown %1$s command %2$s.', true), $this->shellName, $arg);
+		$message = sprintf(__('For usage try `cake %s help`', true), $this->shell);
+		$this->stderr($title . "\n" . $message . "\n");
+		return false;
 	}
+/**
+ * Get shell to use, either plugin shell or application shell
+ *
+ * All paths in the shellPaths property are searched.
+ * shell, shellPath and shellClass properties are taken into account.
+ *
+ * @param string $plugin Optionally the name of a plugin
+ * @return mixed False if no shell could be found or an object on success
+ * @access protected
+ */
+	function _getShell($plugin = null) {
+		foreach ($this->shellPaths as $path) {
+			$this->shellPath = $path . $this->shell . '.php';
+			$pluginShellPath =  DS . $plugin . DS . 'vendors' . DS . 'shells' . DS;
+
+			if ((strpos($path, $pluginShellPath) !== false || !$plugin) && file_exists($this->shellPath)) {
+				$loaded = true;
+				break;
+			}
+		}
+		if (!isset($loaded)) {
+			return false;
+		}
+
+		if (!class_exists('Shell')) {
+			require CONSOLE_LIBS . 'shell.php';
+		}
+
+		if (!class_exists($this->shellClass)) {
+			require $this->shellPath;
+		}
+		if (!class_exists($this->shellClass)) {
+			return false;
+		}
+		$Shell = new $this->shellClass($this);
+		return $Shell;
+	}
+
 /**
  * Prompts the user for input, and returns it.
  *
@@ -415,6 +474,7 @@ class ShellDispatcher {
 		}
 		return $result;
 	}
+
 /**
  * Outputs to the stdout filehandle.
  *
@@ -429,6 +489,7 @@ class ShellDispatcher {
 			fwrite($this->stdout, $string);
 		}
 	}
+
 /**
  * Outputs to the stderr filehandle.
  *
@@ -436,8 +497,9 @@ class ShellDispatcher {
  * @access public
  */
 	function stderr($string) {
-		fwrite($this->stderr, 'Error: '. $string);
+		fwrite($this->stderr, $string);
 	}
+
 /**
  * Parses command line options
  *
@@ -446,13 +508,15 @@ class ShellDispatcher {
  */
 	function parseParams($params) {
 		$this->__parseParams($params);
-
 		$defaults = array('app' => 'app', 'root' => dirname(dirname(dirname(__FILE__))), 'working' => null, 'webroot' => 'webroot');
-
 		$params = array_merge($defaults, array_intersect_key($this->params, $defaults));
-
-		$isWin = array_filter(array_map('strpos', $params, array('\\')));
-
+		$isWin = false;
+		foreach ($defaults as $default => $value) {
+			if (strpos($params[$default], '\\') !== false) {
+				$isWin = true;
+				break;
+			}
+		}
 		$params = str_replace('\\', '/', $params);
 
 		if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) {
@@ -464,7 +528,7 @@ class ShellDispatcher {
 			}
 		}
 
-		if ($params['app'][0] == '/' || preg_match('/([a-zA-Z])(:)/i', $params['app'], $matches)) {
+		if ($params['app'][0] == '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) {
 			$params['root'] = dirname($params['app']);
 		} elseif (strpos($params['app'], '/')) {
 			$params['root'] .= '/' . dirname($params['app']);
@@ -479,8 +543,9 @@ class ShellDispatcher {
 
 		$this->params = array_merge($this->params, $params);
 	}
+
 /**
- * Helper for recursively paraing params
+ * Helper for recursively parsing params
  *
  * @return array params
  * @access private
@@ -510,26 +575,24 @@ class ShellDispatcher {
 			}
 		}
 	}
+
 /**
  * Removes first argument and shifts other arguments up
  *
- * @return boolean False if there are no arguments
+ * @return mixed Null if there are no arguments otherwise the shifted argument
  * @access public
  */
 	function shiftArgs() {
-		if (empty($this->args)) {
-			return false;
-		}
-		unset($this->args[0]);
-		$this->args = array_values($this->args);
-		return true;
+		return array_shift($this->args);
 	}
+
 /**
  * Shows console help
  *
  * @access public
  */
 	function help() {
+		$this->clear();
 		$this->stdout("\nWelcome to CakePHP v" . Configure::version() . " Console");
 		$this->stdout("---------------------------------------------------------------");
 		$this->stdout("Current Paths:");
@@ -559,6 +622,7 @@ class ShellDispatcher {
 				} else {
 					sort($shells);
 					foreach ($shells as $shell) {
+
 						if ($shell !== 'shell.php') {
 							$this->stdout("\t " . str_replace('.php', '', $shell));
 						}
@@ -568,8 +632,8 @@ class ShellDispatcher {
 		}
 		$this->stdout("\nTo run a command, type 'cake shell_name [args]'");
 		$this->stdout("To get help on a specific command, type 'cake shell_name help'");
-		$this->_stop();
 	}
+
 /**
  * Stop execution of the current script
  *
diff --git a/cake/console/error.php b/cake/console/error.php
index 9c88a40b8..4d9a9f7a5 100644
--- a/cake/console/error.php
+++ b/cake/console/error.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ErrorHandler for Console Shells
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Error Handler for Cake console.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.console
  */
 class ErrorHandler extends Object {
+
 /**
  * Standard output stream.
  *
@@ -38,6 +41,7 @@ class ErrorHandler extends Object {
  * @access public
  */
 	var $stdout;
+
 /**
  * Standard error stream.
  *
@@ -45,6 +49,7 @@ class ErrorHandler extends Object {
  * @access public
  */
 	var $stderr;
+
 /**
  * Class constructor.
  *
@@ -60,6 +65,7 @@ class ErrorHandler extends Object {
 			call_user_func_array(array(&$this, 'error404'), $messages);
 		}
 	}
+
 /**
  * Displays an error page (e.g. 404 Not found).
  *
@@ -71,6 +77,7 @@ class ErrorHandler extends Object {
 		$this->stderr($code . $name . $message."\n");
 		$this->_stop();
 	}
+
 /**
  * Convenience method to display a 404 page.
  *
@@ -84,6 +91,7 @@ class ErrorHandler extends Object {
 							'message' => sprintf(__("The requested address %s was not found on this server.", true), $url, $message)));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Controller web page.
  *
@@ -96,6 +104,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Controller '%s'", true), $controllerName));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Action web page.
  *
@@ -107,6 +116,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Method '%s' in '%s'", true), $action, $className));
 		$this->_stop();
 	}
+
 /**
  * Renders the Private Action web page.
  *
@@ -118,6 +128,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Trying to access private method '%s' in '%s'", true), $action, $className));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Table web page.
  *
@@ -129,6 +140,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing database table '%s' for model '%s'", true), $table, $className));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Database web page.
  *
@@ -139,6 +151,7 @@ class ErrorHandler extends Object {
 		$this->stderr(__("Missing Database", true));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing View web page.
  *
@@ -150,6 +163,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing View '%s' for '%s' in '%s'", true), $file, $action, $className));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Layout web page.
  *
@@ -161,6 +175,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Layout '%s'", true), $file));
 		$this->_stop();
 	}
+
 /**
  * Renders the Database Connection web page.
  *
@@ -172,6 +187,7 @@ class ErrorHandler extends Object {
 		$this->stderr(__("Missing Database Connection. Try 'cake bake'", true));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Helper file web page.
  *
@@ -183,6 +199,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Helper file '%s' for '%s'", true), $file, Inflector::camelize($helper)));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Helper class web page.
  *
@@ -194,6 +211,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Helper class '%s' in '%s'", true), Inflector::camelize($helper), $file));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Component file web page.
  *
@@ -205,6 +223,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Component file '%s' for '%s'", true), $file, Inflector::camelize($component)));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Component class web page.
  *
@@ -216,6 +235,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing Component class '%s' in '%s'", true), Inflector::camelize($component), $file));
 		$this->_stop();
 	}
+
 /**
  * Renders the Missing Model class web page.
  *
@@ -227,6 +247,7 @@ class ErrorHandler extends Object {
 		$this->stderr(sprintf(__("Missing model '%s'", true), $className));
 		$this->_stop();
 	}
+
 /**
  * Outputs to the stdout filehandle.
  *
@@ -241,6 +262,7 @@ class ErrorHandler extends Object {
 			fwrite($this->stdout, $string);
 		}
 	}
+
 /**
  * Outputs to the stderr filehandle.
  *
diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 5a7873da8..c62f91ba3 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -26,6 +27,7 @@
  */
 App::import('Component', 'Acl');
 App::import('Model', 'DbAcl');
+
 /**
  * Shell for ACL management.
  *
@@ -33,6 +35,7 @@ App::import('Model', 'DbAcl');
  * @subpackage    cake.cake.console.libs
  */
 class AclShell extends Shell {
+
 /**
  * Contains instance of AclComponent
  *
@@ -40,6 +43,7 @@ class AclShell extends Shell {
  * @access public
  */
 	var $Acl;
+
 /**
  * Contains arguments parsed from the command line.
  *
@@ -47,6 +51,7 @@ class AclShell extends Shell {
  * @access public
  */
 	var $args;
+
 /**
  * Contains database source to use
  *
@@ -54,6 +59,7 @@ class AclShell extends Shell {
  * @access public
  */
 	var $dataSource = 'default';
+
 /**
  * Contains tasks to load and instantiate
  *
@@ -61,6 +67,7 @@ class AclShell extends Shell {
  * @access public
  */
 	var $tasks = array('DbConfig');
+
 /**
  * Override startup of the Shell
  *
@@ -101,6 +108,7 @@ class AclShell extends Shell {
 			}
 		}
 	}
+
 /**
  * Override main() for help message hook
  *
@@ -122,6 +130,7 @@ class AclShell extends Shell {
 		$out .= __("For help, run the 'help' command.  For help on a specific command, run 'help <command>'", true);
 		$this->out($out);
 	}
+
 /**
  * Creates an ARO/ACO node
  *
@@ -179,6 +188,7 @@ class AclShell extends Shell {
 			$this->err(sprintf(__("There was a problem creating a new %s '%s'.", true), $class, $this->args[2]));
 		}
 	}
+
 /**
  * Delete an ARO/ACO node.
  *
@@ -216,6 +226,7 @@ class AclShell extends Shell {
 			$this->out(sprintf(__("Node parent set to %s", true), $this->args[2]) . "\n", true);
 		}
 	}
+
 /**
  * Get path to specified ARO/ACO node.
  *
@@ -234,6 +245,7 @@ class AclShell extends Shell {
 			$this->out(str_repeat('  ', $i) . "[" . $nodes[$i][$class]['id'] . "]" . $nodes[$i][$class]['alias'] . "\n");
 		}
 	}
+
 /**
  * Check permission for a given ARO to a given ACO.
  *
@@ -249,6 +261,7 @@ class AclShell extends Shell {
 			$this->out(sprintf(__("%s is not allowed.", true), $aro), true);
 		}
 	}
+
 /**
  * Grant permission for a given ARO to a given ACO.
  *
@@ -264,6 +277,7 @@ class AclShell extends Shell {
 			$this->out(__("Permission was not granted.", true), true);
 		}
 	}
+
 /**
  * Deny access for an ARO to an ACO.
  *
@@ -279,6 +293,7 @@ class AclShell extends Shell {
 			$this->out(__("Permission was not denied.", true), true);
 		}
 	}
+
 /**
  * Set an ARO to inhermit permission to an ACO.
  *
@@ -294,6 +309,7 @@ class AclShell extends Shell {
 			$this->out(__("Permission was not inherited.", true), true);
 		}
 	}
+
 /**
  * Show a specific ARO/ACO node.
  *
@@ -345,6 +361,7 @@ class AclShell extends Shell {
 		}
 		$this->hr();
 	}
+
 /**
  * Initialize ACL database.
  *
@@ -354,6 +371,7 @@ class AclShell extends Shell {
 		$this->Dispatch->args = array('schema', 'run', 'create', 'DbAcl');
 		$this->Dispatch->dispatch();
 	}
+
 /**
  * Show help screen.
  *
@@ -431,6 +449,7 @@ class AclShell extends Shell {
 			$this->out(sprintf(__("Command '%s' not found", true), $this->args[0]));
 		}
 	}
+
 /**
  * Check that first argument specifies a valid Node type (ARO/ACO)
  *
@@ -444,6 +463,7 @@ class AclShell extends Shell {
 			$this->error(sprintf(__("Missing/Unknown node type: '%s'", true), $this->args[1]), __('Please specify which ACL object type you wish to create.', true));
 		}
 	}
+
 /**
  * Checks that given node exists
  *
@@ -465,6 +485,7 @@ class AclShell extends Shell {
 		}
 		return $possibility;
 	}
+
 /**
  * get params for standard Acl methods
  *
diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index 7ff0d73e0..8da6f9092 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * API shell to get CakePHP core method signatures.
  *
@@ -32,6 +33,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class ApiShell extends Shell {
+
 /**
  * Map between short name for paths and real paths.
  *
@@ -39,6 +41,7 @@ class ApiShell extends Shell {
  * @access public
  */
 	var $paths = array();
+
 /**
  * Override intialize of the Shell
  *
@@ -56,6 +59,7 @@ class ApiShell extends Shell {
 			'core' => LIBS
 		));
 	}
+
 /**
  * Override main() to handle action
  *
@@ -66,7 +70,7 @@ class ApiShell extends Shell {
 			return $this->help();
 		}
 
-		$type = low($this->args[0]);
+		$type = strtolower($this->args[0]);
 
 		if (isset($this->paths[$type])) {
 			$path = $this->paths[$type];
@@ -202,7 +206,7 @@ class ApiShell extends Shell {
 
 				if (strpos($method, '__') === false && $method[0] != '_') {
 					$parsed[$method] = array(
-						'comment' => r(array('/*', '*/', '*'), '', trim($result[1][$key])),
+						'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])),
 						'method' => $method,
 						'parameters' => trim($result[3][$key])
 					);
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index f891ca2a4..bc15e6360 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * Command-line code generation utility to automate programmer chores.
  *
@@ -21,11 +20,9 @@
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Bake is a command-line code generation utility for automating programmer chores.
  *
@@ -34,13 +31,15 @@
  * @link          http://book.cakephp.org/view/113/Code-Generation-with-Bake
  */
 class BakeShell extends Shell {
+
 /**
  * Contains tasks to load and instantiate
  *
  * @var array
  * @access public
  */
-	var $tasks = array('Project', 'DbConfig', 'Model', 'Controller', 'View', 'Plugin', 'Test');
+	var $tasks = array('Project', 'DbConfig', 'Model', 'Controller', 'View', 'Plugin', 'Fixture', 'Test');
+
 /**
  * Override loadTasks() to handle paths
  *
@@ -50,14 +49,23 @@ class BakeShell extends Shell {
 		parent::loadTasks();
 		$task = Inflector::classify($this->command);
 		if (isset($this->{$task}) && !in_array($task, array('Project', 'DbConfig'))) {
-			$path = Inflector::underscore(Inflector::pluralize($this->command));
-			$this->{$task}->path = $this->params['working'] . DS . $path . DS;
+			if (empty($this->{$task}->path)) {
+				$path = Inflector::underscore(Inflector::pluralize($this->command));
+				$this->{$task}->path = $this->params['working'] . DS . $path . DS;
+			}
+			if (isset($this->params['connection'])) {
+				$this->{$task}->connection = $this->params['connection'];
+			}
+			if (isset($this->params['plugin'])) {
+				$this->{$task}->plugin = $this->params['plugin'];
+			}
 			if (!is_dir($this->{$task}->path)) {
 				$this->err(sprintf(__("%s directory could not be found.\nBe sure you have created %s", true), $task, $this->{$task}->path));
 				$this->_stop();
 			}
 		}
 	}
+
 /**
  * Override main() to handle action
  *
@@ -82,6 +90,7 @@ class BakeShell extends Shell {
 		$this->out('[V]iew');
 		$this->out('[C]ontroller');
 		$this->out('[P]roject');
+		$this->out('[F]ixture');
 		$this->out('[Q]uit');
 
 		$classToBake = strtoupper($this->in(__('What would you like to Bake?', true), array('D', 'M', 'V', 'C', 'P', 'Q')));
@@ -101,6 +110,9 @@ class BakeShell extends Shell {
 			case 'P':
 				$this->Project->execute();
 				break;
+			case 'F':
+				$this->Fixture->execute();
+				break;
 			case 'Q':
 				exit(0);
 				break;
@@ -110,28 +122,33 @@ class BakeShell extends Shell {
 		$this->hr();
 		$this->main();
 	}
+
 /**
  * Quickly bake the MVC
  *
  * @access public
  */
 	function all() {
-		$ds = 'default';
 		$this->hr();
 		$this->out('Bake All');
 		$this->hr();
 
-		if (isset($this->params['connection'])) {
-			$ds = $this->params['connection'];
+		if (!isset($this->params['connection']) && empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
 		}
 
 		if (empty($this->args)) {
-			$name = $this->Model->getName($ds);
+			$this->Model->interactive = true;
+			$name = $this->Model->getName($this->connection);
+		}
+
+		foreach (array('Model', 'Controller', 'View') as $task) {
+			$this->{$task}->connection = $this->connection;
+			$this->{$task}->interactive = false;
 		}
 
 		if (!empty($this->args[0])) {
 			$name = $this->args[0];
-			$this->Model->listAll($ds, false);
 		}
 
 		$modelExists = false;
@@ -140,8 +157,8 @@ class BakeShell extends Shell {
 			$object = new $model();
 			$modelExists = true;
 		} else {
-			App::import('Model');
-			$object = new Model(array('name' => $name, 'ds' => $ds));
+			App::import('Model', 'Model', false);
+			$object = new Model(array('name' => $name, 'ds' => $this->connection));
 		}
 
 		$modelBaked = $this->Model->bake($object, false);
@@ -149,6 +166,7 @@ class BakeShell extends Shell {
 		if ($modelBaked && $modelExists === false) {
 			$this->out(sprintf(__('%s Model was baked.', true), $model));
 			if ($this->_checkUnitTest()) {
+				$this->Model->bakeFixture($model);
 				$this->Model->bakeTest($model);
 			}
 			$modelExists = true;
@@ -165,16 +183,13 @@ class BakeShell extends Shell {
 			if (App::import('Controller', $controller)) {
 				$this->View->args = array($controller);
 				$this->View->execute();
+				$this->out(sprintf(__('%s Views were baked.', true), $name));
 			}
-			$this->out(__('Bake All complete'));
+			$this->out(__('Bake All complete', true));
 			array_shift($this->args);
 		} else {
 			$this->err(__('Bake All could not continue without a valid model', true));
 		}
-
-		if (empty($this->args)) {
-			$this->all();
-		}
 		$this->_stop();
 	}
 
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index b9f2e6e96..82427d9b4 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,11 +25,13 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * @package       cake
  * @subpackage    cake.cake.console.libs
  */
 class ConsoleShell extends Shell {
+
 /**
  * Available binding types
  *
@@ -36,6 +39,7 @@ class ConsoleShell extends Shell {
  * @access public
  */
 	var $associations = array('hasOne', 'hasMany', 'belongsTo', 'hasAndBelongsToMany');
+
 /**
  * Chars that describe invalid commands
  *
@@ -43,6 +47,7 @@ class ConsoleShell extends Shell {
  * @access public
  */
 	var $badCommandChars = array('$', ';');
+
 /**
  * Available models
  *
@@ -50,6 +55,7 @@ class ConsoleShell extends Shell {
  * @access public
  */
 	var $models = array();
+
 /**
  * Override intialize of the Shell
  *
@@ -74,6 +80,7 @@ class ConsoleShell extends Shell {
 		}
 		$this->_loadRoutes();
 	}
+
 /**
  * Prints the help message
  *
@@ -136,6 +143,7 @@ class ConsoleShell extends Shell {
 		$out .= "\tRoutes show";
 		$this->out($out);
 	}
+
 /**
  * Override main() to handle action
  *
@@ -269,8 +277,7 @@ class ConsoleShell extends Shell {
 					if ($this->_isValidModel($modelToSave)) {
 						// Extract the array of data we are trying to build
 						list($foo, $data) = explode("->save", $command);
-						$badChars = array("(", ")");
-						$data = str_replace($badChars, "", $data);
+						$data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data);
 						$saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));";
 						@eval($saveCommand);
 						$this->out('Saved record for ' . $modelToSave);
@@ -321,6 +328,7 @@ class ConsoleShell extends Shell {
 			$command = '';
 		}
 	}
+
 /**
  * Tells if the specified model is included in the list of available models
  *
@@ -331,6 +339,7 @@ class ConsoleShell extends Shell {
 	function _isValidModel($modelToCheck) {
 		return in_array($modelToCheck, $this->models);
 	}
+
 /**
  * Reloads the routes configuration from config/routes.php, and compiles
  * all routes found
diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index aa5fe8b8a..5e8d547ed 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Shell for I18N management.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class I18nShell extends Shell {
+
 /**
  * Contains database source to use
  *
@@ -38,6 +41,7 @@ class I18nShell extends Shell {
  * @access public
  */
 	var $dataSource = 'default';
+
 /**
  * Contains tasks to load and instantiate
  *
@@ -45,6 +49,7 @@ class I18nShell extends Shell {
  * @access public
  */
 	var $tasks = array('DbConfig', 'Extract');
+
 /**
  * Override startup of the Shell
  *
@@ -63,6 +68,7 @@ class I18nShell extends Shell {
 			}
 		}
 	}
+
 /**
  * Override main() for help message hook
  *
@@ -96,6 +102,7 @@ class I18nShell extends Shell {
 		$this->hr();
 		$this->main();
 	}
+
 /**
  * Initialize I18N database.
  *
@@ -105,6 +112,7 @@ class I18nShell extends Shell {
 		$this->Dispatch->args = array('schema', 'run', 'create', 'i18n');
 		$this->Dispatch->dispatch();
 	}
+
 /**
  * Show help screen.
  *
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index 445ad1579..60d959721 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Command-line database management utility to automate programmer chores.
  *
@@ -26,7 +27,8 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('File');
-App::import('Model', 'CakeSchema');
+App::import('Model', 'CakeSchema', false);
+
 /**
  * Schema is a command-line database management utility for automating programmer chores.
  *
@@ -35,6 +37,7 @@ App::import('Model', 'CakeSchema');
  * @link          http://book.cakephp.org/view/734/Schema-management-and-migrations
  */
 class SchemaShell extends Shell {
+
 /**
  * is this a dry run?
  *
@@ -42,6 +45,7 @@ class SchemaShell extends Shell {
  * @access private
  */
 	var $__dry = null;
+
 /**
  * Override initialize
  *
@@ -52,6 +56,7 @@ class SchemaShell extends Shell {
 		$this->out('Cake Schema Shell');
 		$this->hr();
 	}
+
 /**
  * Override startup
  *
@@ -85,6 +90,7 @@ class SchemaShell extends Shell {
 
 		$this->Schema =& new CakeSchema(compact('name', 'path', 'file', 'connection'));
 	}
+
 /**
  * Override main
  *
@@ -93,6 +99,7 @@ class SchemaShell extends Shell {
 	function main() {
 		$this->help();
 	}
+
 /**
  * Read and output contents of schema object
  * path to read as second arg
@@ -109,6 +116,7 @@ class SchemaShell extends Shell {
 			$this->_stop();
 		}
 	}
+
 /**
  * Read database and Write schema object
  * accepts a connection as first arg or path to save as second arg
@@ -177,6 +185,7 @@ class SchemaShell extends Shell {
 			$this->_stop();
 		}
 	}
+
 /**
  * Dump Schema object to sql file
  * if first arg == write, file will be written to sql file
@@ -199,7 +208,7 @@ class SchemaShell extends Shell {
 			}
 		}
 		$db =& ConnectionManager::getDataSource($this->Schema->connection);
-		$contents = "#". $Schema->name ." sql generated on: " . date('Y-m-d H:m:s') . " : ". time()."\n\n";
+		$contents = "#" . $Schema->name . " sql generated on: " . date('Y-m-d H:i:s') . " : " . time() . "\n\n";
 		$contents .= $db->dropSchema($Schema) . "\n\n". $db->createSchema($Schema);
 		if ($write) {
 			if (strpos($write, '.sql') === false) {
@@ -217,6 +226,7 @@ class SchemaShell extends Shell {
 		$this->out($contents);
 		return $contents;
 	}
+
 /**
  * Run database commands: create, update
  *
@@ -275,6 +285,7 @@ class SchemaShell extends Shell {
 			$this->_stop();
 		}
 	}
+
 /**
  * Create database from Schema object
  * Should be called via the run method
@@ -318,6 +329,7 @@ class SchemaShell extends Shell {
 
 		$this->out(__('End create.', true));
 	}
+
 /**
  * Update database with Schema object
  * Should be called via the run method
@@ -356,6 +368,7 @@ class SchemaShell extends Shell {
 
 		$this->out(__('End update.', true));
 	}
+
 /**
  * Runs sql from __create() or __update()
  *
@@ -397,6 +410,7 @@ class SchemaShell extends Shell {
 			}
 		}
 	}
+
 /**
  * Displays help contents
  *
@@ -426,4 +440,4 @@ class SchemaShell extends Shell {
 		$this->_stop();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index bac6c347b..503a63111 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Base class for Shells
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Base class for command-line utilities for automating programmer chores.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class Shell extends Object {
+
 /**
  * An instance of the ShellDispatcher object that loaded this script
  *
@@ -38,6 +41,7 @@ class Shell extends Object {
  * @access public
  */
 	var $Dispatch = null;
+
 /**
  * If true, the script will ask for permission to perform actions.
  *
@@ -45,6 +49,7 @@ class Shell extends Object {
  * @access public
  */
 	var $interactive = true;
+
 /**
  * Holds the DATABASE_CONFIG object for the app. Null if database.php could not be found,
  * or the app does not exist.
@@ -53,6 +58,7 @@ class Shell extends Object {
  * @access public
  */
 	var $DbConfig = null;
+
 /**
  * Contains command switches parsed from the command line.
  *
@@ -60,6 +66,7 @@ class Shell extends Object {
  * @access public
  */
 	var $params = array();
+
 /**
  * Contains arguments parsed from the command line.
  *
@@ -67,6 +74,7 @@ class Shell extends Object {
  * @access public
  */
 	var $args = array();
+
 /**
  * The file name of the shell that was invoked.
  *
@@ -74,6 +82,7 @@ class Shell extends Object {
  * @access public
  */
 	var $shell = null;
+
 /**
  * The class name of the shell that was invoked.
  *
@@ -81,6 +90,7 @@ class Shell extends Object {
  * @access public
  */
 	var $className = null;
+
 /**
  * The command called if public methods are available.
  *
@@ -88,6 +98,7 @@ class Shell extends Object {
  * @access public
  */
 	var $command = null;
+
 /**
  * The name of the shell in camelized.
  *
@@ -95,6 +106,7 @@ class Shell extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * An alias for the shell
  *
@@ -102,6 +114,7 @@ class Shell extends Object {
  * @access public
  */
 	var $alias = null;
+
 /**
  * Contains tasks to load and instantiate
  *
@@ -109,6 +122,7 @@ class Shell extends Object {
  * @access public
  */
 	var $tasks = array();
+
 /**
  * Contains the loaded tasks
  *
@@ -116,6 +130,7 @@ class Shell extends Object {
  * @access public
  */
 	var $taskNames = array();
+
 /**
  * Contains models to load and instantiate
  *
@@ -123,6 +138,7 @@ class Shell extends Object {
  * @access public
  */
 	var $uses = array();
+
 /**
  *  Constructs this Shell instance.
  *
@@ -149,16 +165,17 @@ class Shell extends Object {
 		ClassRegistry::map($this->name, $this->alias);
 
 		if (!PHP5 && isset($this->args[0])) {
-			if (strpos($this->name, low(Inflector::camelize($this->args[0]))) !== false) {
+			if (strpos($this->name, strtolower(Inflector::camelize($this->args[0]))) !== false) {
 				$dispatch->shiftArgs();
 			}
-			if (low($this->command) == low(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
+			if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
 				$dispatch->shiftArgs();
 			}
 		}
 
 		$this->Dispatch =& $dispatch;
 	}
+
 /**
  * Initializes the Shell
  * acts as constructor for subclasses
@@ -169,6 +186,7 @@ class Shell extends Object {
 	function initialize() {
 		$this->_loadModels();
 	}
+
 /**
  * Starts up the the Shell
  * allows for checking and configuring prior to command or main execution
@@ -179,18 +197,21 @@ class Shell extends Object {
 	function startup() {
 		$this->_welcome();
 	}
+
 /**
  * Displays a header for the shell
  *
  * @access protected
  */
 	function _welcome() {
+		$this->Dispatch->clear();
 		$this->out("\nWelcome to CakePHP v" . Configure::version() . " Console");
 		$this->out("---------------------------------------------------------------");
 		$this->out('App : '. $this->params['app']);
 		$this->out('Path: '. $this->params['working']);
 		$this->hr();
 	}
+
 /**
  * Loads database file and constructs DATABASE_CONFIG class
  * makes $this->DbConfig available to subclasses
@@ -207,6 +228,7 @@ class Shell extends Object {
 		$this->out('Run \'bake\' to create the database configuration');
 		return false;
 	}
+
 /**
  * if var $uses = true
  * Loads AppModel file and constructs AppModel class
@@ -251,6 +273,7 @@ class Shell extends Object {
 		}
 		return false;
 	}
+
 /**
  * Loads tasks defined in var $tasks
  *
@@ -297,13 +320,14 @@ class Shell extends Object {
 			}
 
 			if (!isset($this->{$taskName})) {
-				$this->err("Task '".$taskName."' could not be loaded");
+				$this->err("Task '" . $taskName . "' could not be loaded");
 				$this->_stop();
 			}
 		}
 
 		return true;
 	}
+
 /**
  * Prompts the user for input, and returns it.
  *
@@ -329,7 +353,7 @@ class Shell extends Object {
 			}
 		}
 		if (is_array($options)) {
-			while ($in == '' || ($in && (!in_array(low($in), $options) && !in_array(up($in), $options)) && !in_array($in, $options))) {
+			while ($in == '' || ($in && (!in_array(strtolower($in), $options) && !in_array(strtoupper($in), $options)) && !in_array($in, $options))) {
 				$in = $this->Dispatch->getInput($prompt, $options, $default);
 			}
 		}
@@ -337,68 +361,82 @@ class Shell extends Object {
 			return $in;
 		}
 	}
+
 /**
- * Outputs to the stdout filehandle.
+ * Outputs a single or multiple messages to stdout.
  *
- * @param string $string String to output.
- * @param boolean $newline If true, the outputs gets an added newline.
+ * @param mixed $message A string or a an array of strings to output
+ * @param mixed $after Appended to message, if true a newline is used
  * @access public
  */
-	function out($string, $newline = true) {
-		if (is_array($string)) {
-			$str = '';
-			foreach ($string as $message) {
-				$str .= $message ."\n";
-			}
-			$string = $str;
+	function out($message, $after = true) {
+		if (is_array($message)) {
+			$message = implode($this->nl(), $message);
 		}
-		return $this->Dispatch->stdout($string, $newline);
+		$this->Dispatch->stdout($message . $this->nl($after), false);
 	}
+
 /**
- * Outputs to the stderr filehandle.
+ * Outputs a single or multiple error messages to stderr.
  *
- * @param string $string Error text to output.
+ * @param mixed $message A string or a an array of strings to output
+ * @param mixed $after Appended to message, if true a newline is used
  * @access public
  */
-	function err($string) {
-		if (is_array($string)) {
-			$str = '';
-			foreach ($string as $message) {
-				$str .= $message ."\n";
-			}
-			$string = $str;
+	function err($message, $after = true) {
+		if (is_array($message)) {
+			$message = implode($this->nl(), $message);
 		}
-		return $this->Dispatch->stderr($string."\n");
+		$this->Dispatch->stderr($message . $this->nl($after));
 	}
+
+/**
+ * Returns a single or multiple linefeeds sequences.
+ *
+ * @param mixed $format If true returns a linefeed sequence, if false null,
+ *	if a string is given that is returned,
+ *	if an integer is given it is used as a multiplier to return multiple linefeed sequences
+ * @access public
+ * @return string
+ */
+	function nl($format = true) {
+		if (is_string($format)) {
+			return $format . "\n";
+		}
+		if (is_int($format)) {
+			return str_repeat("\n", $format);
+		}
+		return $format ? "\n" : null;
+	}
+
 /**
  * Outputs a series of minus characters to the standard output, acts as a visual separator.
  *
- * @param boolean $newline If true, the outputs gets an added newline.
+ * @param mixed $surround If true, the outputs gets surrounded by newlines.
  * @access public
  */
-	function hr($newline = false) {
-		if ($newline) {
-			$this->out("\n");
-		}
+	function hr($surround = false) {
+		$this->out(null, $surround);
 		$this->out('---------------------------------------------------------------');
-		if ($newline) {
-			$this->out("\n");
-		}
+		$this->out(null, $surround);
 	}
 /**
- * Displays a formatted error message and exits the application
+ * Displays a formatted error message
+ * and exits the application with status code 1
  *
- * @param string $title Title of the error message
- * @param string $msg Error message
+ * @param string $title Title of the error
+ * @param string $message An optional error message
  * @access public
  */
-	function error($title, $msg) {
-		$out  = "$title\n";
-		$out .= "$msg\n";
-		$out .= "\n";
-		$this->err($out);
-		$this->_stop();
+	function error($title, $message = null) {
+		$this->err(sprintf(__('Error: %s', true), $title));
+
+		if (!empty($message)) {
+			$this->err($message);
+		}
+		$this->_stop(1);
 	}
+
 /**
  * Will check the number args matches otherwise throw an error
  *
@@ -414,6 +452,7 @@ class Shell extends Object {
 			$this->error("Wrong number of parameters: ".count($this->args), "Expected: {$expectedNum}\nPlease type 'cake {$this->shell} help' for help on usage of the {$this->name} {$command}");
 		}
 	}
+
 /**
  * Creates a file at given path
  *
@@ -427,10 +466,10 @@ class Shell extends Object {
 		$this->out("\n" . sprintf(__("Creating file %s", true), $path));
 		if (is_file($path) && $this->interactive === true) {
 			$key = $this->in(__("File exists, overwrite?", true). " {$path}",  array('y', 'n', 'q'), 'n');
-			if (low($key) == 'q') {
+			if (strtolower($key) == 'q') {
 				$this->out(__("Quitting.", true) ."\n");
 				exit;
-			} elseif (low($key) != 'y') {
+			} elseif (strtolower($key) != 'y') {
 				$this->out(__("Skip", true) ." {$path}\n");
 				return false;
 			}
@@ -449,6 +488,7 @@ class Shell extends Object {
 			return false;
 		}
 	}
+
 /**
  * Outputs usage text on the standard output. Implement it in subclasses.
  *
@@ -461,6 +501,7 @@ class Shell extends Object {
 			$this->Dispatch->help();
 		}
 	}
+
 /**
  * Action to create a Unit Test
  *
@@ -472,13 +513,14 @@ class Shell extends Object {
 			return true;
 		}
 		$unitTest = $this->in('SimpleTest is not installed.  Do you want to bake unit test files anyway?', array('y','n'), 'y');
-		$result = low($unitTest) == 'y' || low($unitTest) == 'yes';
+		$result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes';
 
 		if ($result) {
 			$this->out("\nYou can download SimpleTest from http://simpletest.org", true);
 		}
 		return $result;
 	}
+
 /**
  * Makes absolute file path easier to read
  *
@@ -488,38 +530,10 @@ class Shell extends Object {
  */
 	function shortPath($file) {
 		$shortPath = str_replace(ROOT, null, $file);
-		$shortPath = str_replace('..'.DS, '', $shortPath);
-		return r(DS.DS, DS, $shortPath);
-	}
-/**
- * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled
- *
- * @return string Admin route to use
- * @access public
- */
-	function getAdmin() {
-		$admin = '';
-		$cakeAdmin = null;
-		$adminRoute = Configure::read('Routing.admin');
-		if (!empty($adminRoute)) {
-			$cakeAdmin = $adminRoute . '_';
-		} else {
-			$this->out('You need to enable Configure::write(\'Routing.admin\',\'admin\') in /app/config/core.php to use admin routing.');
-			$this->out('What would you like the admin route to be?');
-			$this->out('Example: www.example.com/admin/controller');
-			while ($admin == '') {
-				$admin = $this->in("What would you like the admin route to be?", null, 'admin');
-			}
-			if ($this->Project->cakeAdmin($admin) !== true) {
-				$this->out('Unable to write to /app/config/core.php.');
-				$this->out('You need to enable Configure::write(\'Routing.admin\',\'admin\') in /app/config/core.php to use admin routing.');
-				$this->_stop();
-			} else {
-				$cakeAdmin = $admin . '_';
-			}
-		}
-		return $cakeAdmin;
+		$shortPath = str_replace('..' . DS, '', $shortPath);
+		return str_replace(DS . DS, DS, $shortPath);
 	}
+
 /**
  * Creates the proper controller path for the specified controller class name
  *
@@ -528,8 +542,9 @@ class Shell extends Object {
  * @access protected
  */
 	function _controllerPath($name) {
-		return low(Inflector::underscore($name));
+		return strtolower(Inflector::underscore($name));
 	}
+
 /**
  * Creates the proper controller plural name for the specified controller class name
  *
@@ -540,6 +555,7 @@ class Shell extends Object {
 	function _controllerName($name) {
 		return Inflector::pluralize(Inflector::camelize($name));
 	}
+
 /**
  * Creates the proper controller camelized name (singularized) for the specified name
  *
@@ -550,6 +566,7 @@ class Shell extends Object {
 	function _modelName($name) {
 		return Inflector::camelize(Inflector::singularize($name));
 	}
+
 /**
  * Creates the proper singular model key for associations
  *
@@ -560,6 +577,7 @@ class Shell extends Object {
 	function _modelKey($name) {
 		return Inflector::underscore(Inflector::singularize($name)).'_id';
 	}
+
 /**
  * Creates the proper model name from a foreign key
  *
@@ -571,6 +589,7 @@ class Shell extends Object {
 		$name = str_replace('_id', '',$key);
 		return Inflector::camelize($name);
 	}
+
 /**
  * creates the singular name for use in views.
  *
@@ -581,6 +600,7 @@ class Shell extends Object {
 	function _singularName($name) {
 		return Inflector::variable(Inflector::singularize($name));
 	}
+
 /**
  * Creates the plural name for views
  *
@@ -591,6 +611,7 @@ class Shell extends Object {
 	function _pluralName($name) {
 		return Inflector::variable(Inflector::pluralize($name));
 	}
+
 /**
  * Creates the singular human name used in views
  *
@@ -601,6 +622,7 @@ class Shell extends Object {
 	function _singularHumanName($name) {
 		return Inflector::humanize(Inflector::underscore(Inflector::singularize($name)));
 	}
+
 /**
  * Creates the plural human name used in views
  *
@@ -611,5 +633,22 @@ class Shell extends Object {
 	function _pluralHumanName($name) {
 		return Inflector::humanize(Inflector::underscore(Inflector::pluralize($name)));
 	}
+
+/**
+ * Find the correct path for a plugin. Scans $pluginPaths for the plugin you want.
+ *
+ * @param string $pluginName Name of the plugin you want ie. DebugKit
+ * @return string $path path to the correct plugin.
+ **/
+	function _pluginPath($pluginName) {
+		$pluginPaths = App::path('plugins');
+		$pluginDirName = Inflector::underscore($pluginName);
+		foreach ($pluginPaths as $path) {
+			if (is_dir($path . $pluginDirName)) {
+				return $path . $pluginDirName . DS ;
+			}
+		}
+		return $pluginPaths[0] . $pluginDirName . DS;
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index 81f4fafbe..25e63e404 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The ControllerTask handles creating and updating controller files.
  *
@@ -8,22 +7,20 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008,	Cake Software Foundation, Inc.
+ * Copyright 2005-2009, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Task class for creating and updating controller files.
  *
@@ -31,6 +28,7 @@
  * @subpackage    cake.cake.console.libs.tasks
  */
 class ControllerTask extends Shell {
+
 /**
  * Name of plugin
  *
@@ -38,13 +36,15 @@ class ControllerTask extends Shell {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * Tasks to be loaded by this Task
  *
  * @var array
  * @access public
  */
-	var $tasks = array('Project');
+	var $tasks = array('Model', 'Test', 'Template', 'DbConfig', 'Project');
+
 /**
  * path to CONTROLLERS directory
  *
@@ -52,6 +52,7 @@ class ControllerTask extends Shell {
  * @access public
  */
 	var $path = CONTROLLERS;
+
 /**
  * Override initialize
  *
@@ -59,6 +60,7 @@ class ControllerTask extends Shell {
  */
 	function initialize() {
 	}
+
 /**
  * Execution method always used for tasks
  *
@@ -70,16 +72,22 @@ class ControllerTask extends Shell {
 		}
 
 		if (isset($this->args[0])) {
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
 			$controller = Inflector::camelize($this->args[0]);
 			$actions = null;
 			if (isset($this->args[1]) && $this->args[1] == 'scaffold') {
-				$this->out('Baking scaffold for ' . $controller);
+				$this->out(__('Baking scaffold for ', true) . $controller);
 				$actions = $this->bakeActions($controller);
 			} else {
 				$actions = 'scaffold';
 			}
 			if ((isset($this->args[1]) && $this->args[1] == 'admin') || (isset($this->args[2]) && $this->args[2] == 'admin')) {
-				if ($admin = $this->getAdmin()) {
+				if ($admin = $this->Project->getAdmin()) {
 					$this->out('Adding ' . Configure::read('Routing.admin') .' methods');
 					if ($actions == 'scaffold') {
 						$actions = $this->bakeActions($controller, $admin);
@@ -95,144 +103,169 @@ class ControllerTask extends Shell {
 			}
 		}
 	}
+
+/**
+ * Bake All the controllers at once.  Will only bake controllers for models that exist.
+ *
+ * @access public
+ * @return void
+ **/
+	function all() {
+		$this->interactive = false;
+		$this->listAll($this->connection, false);
+		ClassRegistry::config('Model', array('ds' => $this->connection));
+		$unitTestExists = $this->_checkUnitTest();
+		foreach ($this->__tables as $table) {
+			$model = $this->_modelName($table);
+			$controller = $this->_controllerName($model);
+			if (App::import('Model', $model)) {
+				$actions = $this->bakeActions($controller);
+				if ($this->bake($controller, $actions) && $unitTestExists) {
+					$this->bakeTest($controller);
+				}
+			}
+		}
+	}
+
 /**
  * Interactive
  *
  * @access private
  */
-	function __interactive($controllerName = false) {
-		if (!$controllerName) {
-			$this->interactive = true;
-			$this->hr();
-			$this->out(sprintf("Bake Controller\nPath: %s", $this->path));
-			$this->hr();
-			$actions = '';
-			$uses = array();
-			$helpers = array();
-			$components = array();
-			$wannaUseSession = 'y';
-			$wannaDoAdmin = 'n';
-			$wannaUseScaffold = 'n';
-			$wannaDoScaffolding = 'y';
-			$controllerName = $this->getName();
-		}
+	function __interactive() {
+		$this->interactive = true;
 		$this->hr();
-		$this->out("Baking {$controllerName}Controller");
+		$this->out(sprintf(__("Bake Controller\nPath: %s", true), $this->path));
 		$this->hr();
 
-		$controllerFile = low(Inflector::underscore($controllerName));
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+
+		$controllerName = $this->getName();
+		$this->hr();
+		$this->out(sprintf(__('Baking %sController', true), $controllerName));
+		$this->hr();
+
+		$helpers = $components = array();
+		$actions = '';
+		$wannaUseSession = 'y';
+		$wannaBakeAdminCrud = 'n';
+		$useDynamicScaffold = 'n';
+		$wannaBakeCrud = 'y';
+
+		$controllerFile = strtolower(Inflector::underscore($controllerName));
 
 		$question[] = __("Would you like to build your controller interactively?", true);
 		if (file_exists($this->path . $controllerFile .'_controller.php')) {
 			$question[] = sprintf(__("Warning: Choosing no will overwrite the %sController.", true), $controllerName);
 		}
-		$doItInteractive = $this->in(join("\n", $question), array('y','n'), 'y');
+		$doItInteractive = $this->in(join("\n", $question), array('y', 'n'), 'y');
 
-		if (low($doItInteractive) == 'y' || low($doItInteractive) == 'yes') {
+		if (strtolower($doItInteractive) == 'y') {
 			$this->interactive = true;
+			$useDynamicScaffold = $this->in(
+				__("Would you like to use dynamic scaffolding?", true), array('y','n'), 'n'
+			);
 
-			$wannaUseScaffold = $this->in(__("Would you like to use scaffolding?", true), array('y','n'), 'n');
-
-			if (low($wannaUseScaffold) == 'n' || low($wannaUseScaffold) == 'no') {
-
-				$wannaDoScaffolding = $this->in(__("Would you like to include some basic class methods (index(), add(), view(), edit())?", true), array('y','n'), 'n');
-
-				if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') {
-					$wannaDoAdmin = $this->in(__("Would you like to create the methods for admin routing?", true), array('y','n'), 'n');
-				}
-
-				$wannaDoHelpers = $this->in(__("Would you like this controller to use other helpers besides HtmlHelper and FormHelper?", true), array('y','n'), 'n');
-
-				if (low($wannaDoHelpers) == 'y' || low($wannaDoHelpers) == 'yes') {
-					$helpersList = $this->in(__("Please provide a comma separated list of the other helper names you'd like to use.\nExample: 'Ajax, Javascript, Time'", true));
-					$helpersListTrimmed = str_replace(' ', '', $helpersList);
-					$helpers = explode(',', $helpersListTrimmed);
-				}
-				$wannaDoComponents = $this->in(__("Would you like this controller to use any components?", true), array('y','n'), 'n');
-
-				if (low($wannaDoComponents) == 'y' || low($wannaDoComponents) == 'yes') {
-					$componentsList = $this->in(__("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'", true));
-					$componentsListTrimmed = str_replace(' ', '', $componentsList);
-					$components = explode(',', $componentsListTrimmed);
-				}
-
-				$wannaUseSession = $this->in(__("Would you like to use Sessions?", true), array('y','n'), 'y');
+			if (strtolower($useDynamicScaffold) == 'y') {
+				$wannaBakeCrud = 'n';
+				$actions = 'scaffold';
 			} else {
-				$wannaDoScaffolding = 'n';
+				list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
+
+				$helpers = $this->doHelpers();
+				$components = $this->doComponents();
+
+				$wannaUseSession = $this->in(
+					__("Would you like to use Session flash messages?", true), array('y','n'), 'y'
+				);
 			}
 		} else {
-			$wannaDoScaffolding = $this->in(__("Would you like to include some basic class methods (index(), add(), view(), edit())?", true), array('y','n'), 'y');
-
-			if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') {
-				$wannaDoAdmin = $this->in(__("Would you like to create the methods for admin routing?", true), array('y','n'), 'y');
-			}
-		}
-		$admin = false;
-
-		if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) {
-			$admin = $this->getAdmin();
+			list($wannaBakeCrud, $wannaBakeCrud) = $this->_askAboutMethods();
 		}
 
-		if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') {
-			$actions = $this->bakeActions($controllerName, null, in_array(low($wannaUseSession), array('y', 'yes')));
-			if ($admin) {
-				$actions .= $this->bakeActions($controllerName, $admin, in_array(low($wannaUseSession), array('y', 'yes')));
-			}
+		if (strtolower($wannaBakeCrud) == 'y') {
+			$actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) == 'y');
+		}
+		if (strtolower($wannaBakeAdminCrud) == 'y') {
+			$admin = $this->Project->getAdmin();
+			$actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y');
 		}
 
 		if ($this->interactive === true) {
-			$this->out('');
-			$this->hr();
-			$this->out('The following controller will be created:');
-			$this->hr();
-			$this->out("Controller Name:  $controllerName");
-
-			if (low($wannaUseScaffold) == 'y' || low($wannaUseScaffold) == 'yes') {
-				$this->out("		   var \$scaffold;");
-				$actions = 'scaffold';
-			}
-
-			if (count($helpers)) {
-				$this->out("Helpers:      ", false);
-
-				foreach ($helpers as $help) {
-					if ($help != $helpers[count($helpers) - 1]) {
-						$this->out(ucfirst($help) . ", ", false);
-					} else {
-						$this->out(ucfirst($help));
-					}
-				}
-			}
-
-			if (count($components)) {
-				$this->out("Components:      ", false);
-
-				foreach ($components as $comp) {
-					if ($comp != $components[count($components) - 1]) {
-						$this->out(ucfirst($comp) . ", ", false);
-					} else {
-						$this->out(ucfirst($comp));
-					}
-				}
-			}
-			$this->hr();
+			$this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
 			$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
 
-			if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
-				$baked = $this->bake($controllerName, $actions, $helpers, $components, $uses);
+			if (strtolower($looksGood) == 'y') {
+				$baked = $this->bake($controllerName, $actions, $helpers, $components);
 				if ($baked && $this->_checkUnitTest()) {
 					$this->bakeTest($controllerName);
 				}
-			} else {
-				$this->__interactive($controllerName);
 			}
 		} else {
-			$baked = $this->bake($controllerName, $actions, $helpers, $components, $uses);
+			$baked = $this->bake($controllerName, $actions, $helpers, $components);
 			if ($baked && $this->_checkUnitTest()) {
 				$this->bakeTest($controllerName);
 			}
 		}
 	}
+
+/**
+ * Confirm a to be baked controller with the user
+ *
+ * @return void
+ **/
+	function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
+		$this->out('');
+		$this->hr();
+		$this->out(__('The following controller will be created:', true));
+		$this->hr();
+		$this->out(sprintf(__("Controller Name:\n\t%s", true), $controllerName));
+
+		if (strtolower($useDynamicScaffold) == 'y') {
+			$this->out("var \$scaffold;");
+		}
+
+		$properties = array(
+			'helpers' => __("Helpers:", true),
+			'components' => __('Components:', true),
+		);
+
+		foreach ($properties as $var => $title) {
+			if (count($$var)) {
+				$output = '';
+				$length = count($$var);
+				foreach ($$var as $i => $propElement) {
+					if ($i != $length -1) {
+						$output .= ucfirst($propElement) . ', ';
+					} else {
+						$output .= ucfirst($propElement);
+					}
+				}
+				$this->out($title . "\n\t" . $output);
+			}
+		}
+		$this->hr();
+	}
+
+/**
+ * Interact with the user and ask about which methods (admin or regular they want to bake)
+ *
+ * @return array Array containing (bakeRegular, bakeAdmin) answers
+ **/
+	function _askAboutMethods() {
+		$wannaBakeCrud = $this->in(
+			__("Would you like to create some basic class methods \n(index(), add(), view(), edit())?", true),
+			array('y','n'), 'n'
+		);
+		$wannaBakeAdminCrud = $this->in(
+			__("Would you like to create the basic class methods for admin routing?", true),
+			array('y','n'), 'n'
+		);
+		return array($wannaBakeCrud, $wannaBakeAdminCrud);
+	}
+
 /**
  * Bake scaffold actions
  *
@@ -247,151 +280,24 @@ class ControllerTask extends Shell {
 		if ($this->plugin) {
 			$modelImport = $this->plugin . '.' . $modelImport;
 		}
-		if (!App::import('Model', $modelImport)) {
-			$this->err(__('You must have a model for this class to build scaffold methods. Please try again.', true));
-			exit;
+		if (!App::import('Model', $currentModelName)) {
+			$this->err(__('You must have a model for this class to build basic methods. Please try again.', true));
+			$this->_stop();
 		}
-		$actions = null;
-		$modelObj =& new $currentModelName();
+
+		$modelObj =& ClassRegistry::init($currentModelName);
 		$controllerPath = $this->_controllerPath($controllerName);
 		$pluralName = $this->_pluralName($currentModelName);
 		$singularName = Inflector::variable($currentModelName);
 		$singularHumanName = Inflector::humanize($currentModelName);
 		$pluralHumanName = Inflector::humanize($controllerName);
-		$actions .= "\n";
-		$actions .= "\tfunction {$admin}index() {\n";
-		$actions .= "\t\t\$this->{$currentModelName}->recursive = 0;\n";
-		$actions .= "\t\t\$this->set('{$pluralName}', \$this->paginate());\n";
-		$actions .= "\t}\n";
-		$actions .= "\n";
-		$actions .= "\tfunction {$admin}view(\$id = null) {\n";
-		$actions .= "\t\tif (!\$id) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid {$singularHumanName}.', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t}\n";
-		$actions .= "\t\t\$this->set('".$singularName."', \$this->{$currentModelName}->read(null, \$id));\n";
-		$actions .= "\t}\n";
-		$actions .= "\n";
 
-		/* ADD ACTION */
-		$compact = array();
-		$actions .= "\tfunction {$admin}add() {\n";
-		$actions .= "\t\tif (!empty(\$this->data)) {\n";
-		$actions .= "\t\t\t\$this->{$currentModelName}->create();\n";
-		$actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The ".$singularHumanName." has been saved', true));\n";
-			$actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\t\$this->flash(__('{$currentModelName} saved.', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t\t} else {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The {$singularHumanName} could not be saved. Please, try again.', true));\n";
-		}
-		$actions .= "\t\t\t}\n";
-		$actions .= "\t\t}\n";
-		foreach ($modelObj->hasAndBelongsToMany as $associationName => $relation) {
-			if (!empty($associationName)) {
-				$habtmModelName = $this->_modelName($associationName);
-				$habtmSingularName = $this->_singularName($associationName);
-				$habtmPluralName = $this->_pluralName($associationName);
-				$actions .= "\t\t\${$habtmPluralName} = \$this->{$currentModelName}->{$habtmModelName}->find('list');\n";
-				$compact[] = "'{$habtmPluralName}'";
-			}
-		}
-		foreach ($modelObj->belongsTo as $associationName => $relation) {
-			if (!empty($associationName)) {
-				$belongsToModelName = $this->_modelName($associationName);
-				$belongsToPluralName = $this->_pluralName($associationName);
-				$actions .= "\t\t\${$belongsToPluralName} = \$this->{$currentModelName}->{$belongsToModelName}->find('list');\n";
-				$compact[] = "'{$belongsToPluralName}'";
-			}
-		}
-		if (!empty($compact)) {
-			$actions .= "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
-		}
-		$actions .= "\t}\n";
-		$actions .= "\n";
-
-		/* EDIT ACTION */
-		$compact = array();
-		$actions .= "\tfunction {$admin}edit(\$id = null) {\n";
-		$actions .= "\t\tif (!\$id && empty(\$this->data)) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid {$singularHumanName}', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t}\n";
-		$actions .= "\t\tif (!empty(\$this->data)) {\n";
-		$actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The ".$singularHumanName." has been saved', true));\n";
-			$actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\t\$this->flash(__('The ".$singularHumanName." has been saved.', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t\t} else {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The {$singularHumanName} could not be saved. Please, try again.', true));\n";
-		}
-		$actions .= "\t\t\t}\n";
-		$actions .= "\t\t}\n";
-		$actions .= "\t\tif (empty(\$this->data)) {\n";
-		$actions .= "\t\t\t\$this->data = \$this->{$currentModelName}->read(null, \$id);\n";
-		$actions .= "\t\t}\n";
-
-		foreach ($modelObj->hasAndBelongsToMany as $associationName => $relation) {
-			if (!empty($associationName)) {
-				$habtmModelName = $this->_modelName($associationName);
-				$habtmSingularName = $this->_singularName($associationName);
-				$habtmPluralName = $this->_pluralName($associationName);
-				$actions .= "\t\t\${$habtmPluralName} = \$this->{$currentModelName}->{$habtmModelName}->find('list');\n";
-				$compact[] = "'{$habtmPluralName}'";
-			}
-		}
-		foreach ($modelObj->belongsTo as $associationName => $relation) {
-			if (!empty($associationName)) {
-				$belongsToModelName = $this->_modelName($associationName);
-				$belongsToPluralName = $this->_pluralName($associationName);
-				$actions .= "\t\t\${$belongsToPluralName} = \$this->{$currentModelName}->{$belongsToModelName}->find('list');\n";
-				$compact[] = "'{$belongsToPluralName}'";
-			}
-		}
-		if (!empty($compact)) {
-			$actions .= "\t\t\$this->set(compact(".join(',', $compact)."));\n";
-		}
-		$actions .= "\t}\n";
-		$actions .= "\n";
-		$actions .= "\tfunction {$admin}delete(\$id = null) {\n";
-		$actions .= "\t\tif (!\$id) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid id for {$singularHumanName}', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t}\n";
-		$actions .= "\t\tif (\$this->{$currentModelName}->delete(\$id)) {\n";
-		if ($wannaUseSession) {
-			$actions .= "\t\t\t\$this->Session->setFlash(__('{$singularHumanName} deleted', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
-		} else {
-			$actions .= "\t\t\t\$this->flash(__('{$singularHumanName} deleted', true), array('action'=>'index'));\n";
-		}
-		$actions .= "\t\t}\n";
-		$actions .= "\t}\n";
-		$actions .= "\n";
+		$this->Template->set(compact('admin', 'controllerPath', 'pluralName', 'singularName', 'singularHumanName',
+			'pluralHumanName', 'modelObj', 'wannaUseSession', 'currentModelName'));
+		$actions = $this->Template->generate('actions', 'controller_actions');
 		return $actions;
 	}
 
-
 /**
  * Assembles and writes a Controller file
  *
@@ -403,54 +309,24 @@ class ControllerTask extends Shell {
  * @return string Baked controller
  * @access private
  */
-	function bake($controllerName, $actions = '', $helpers = null, $components = null, $uses = null) {
-		$out = "<?php\n";
-		$out .= "class $controllerName" . "Controller extends {$this->plugin}AppController {\n\n";
-		$out .= "\tvar \$name = '$controllerName';\n";
+	function bake($controllerName, $actions = '', $helpers = null, $components = null) {
+		$isScaffold = ($actions === 'scaffold') ? true : false;
 
-		if (low($actions) == 'scaffold') {
-			$out .= "\tvar \$scaffold;\n";
-		} else {
-			if (count($uses)) {
-				$out .= "\tvar \$uses = array('" . $this->_modelName($controllerName) . "', ";
+		$this->Template->set('plugin', Inflector::camelize($this->plugin));
+		$this->Template->set(compact('controllerName', 'actions', 'helpers', 'components', 'isScaffold'));
+		$contents = $this->Template->generate('classes', 'controller');
 
-				foreach ($uses as $use) {
-					if ($use != $uses[count($uses) - 1]) {
-						$out .= "'" . $this->_modelName($use) . "', ";
-					} else {
-						$out .= "'" . $this->_modelName($use) . "'";
-					}
-				}
-				$out .= ");\n";
-			}
-
-			$out .= "\tvar \$helpers = array('Html', 'Form'";
-			if (count($helpers)) {
-				foreach ($helpers as $help) {
-					$out .= ", '" . Inflector::camelize($help) . "'";
-				}
-			}
-			$out .= ");\n";
-
-			if (count($components)) {
-				$out .= "\tvar \$components = array(";
-
-				foreach ($components as $comp) {
-					if ($comp != $components[count($components) - 1]) {
-						$out .= "'" . Inflector::camelize($comp) . "', ";
-					} else {
-						$out .= "'" . Inflector::camelize($comp) . "'";
-					}
-				}
-				$out .= ");\n";
-			}
-			$out .= $actions;
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'controllers' . DS;
 		}
-		$out .= "}\n";
-		$out .= "?>";
-		$filename = $this->path . $this->_controllerPath($controllerName) . '_controller.php';
-		return $this->createFile($filename, $out);
+		$filename = $path . $this->_controllerPath($controllerName) . '_controller.php';
+		if ($this->createFile($filename, $contents)) {
+			return $contents;
+		}
+		return false;
 	}
+
 /**
  * Assembles and writes a unit test file
  *
@@ -459,84 +335,93 @@ class ControllerTask extends Shell {
  * @access private
  */
 	function bakeTest($className) {
-		$import = $className;
-		if ($this->plugin) {
-			$import = $this->plugin . '.' . $className;
-		}
-		$out = "App::import('Controller', '$import');\n\n";
-		$out .= "class Test{$className} extends {$className}Controller {\n";
-		$out .= "\tvar \$autoRender = false;\n}\n\n";
-		$out .= "class {$className}ControllerTest extends CakeTestCase {\n";
-		$out .= "\tvar \${$className} = null;\n\n";
-		$out .= "\tfunction startTest() {\n\t\t\$this->{$className} = new Test{$className}();";
-		$out .= "\n\t\t\$this->{$className}->constructClasses();\n\t}\n\n";
-		$out .= "\tfunction test{$className}ControllerInstance() {\n";
-		$out .= "\t\t\$this->assertTrue(is_a(\$this->{$className}, '{$className}Controller'));\n\t}\n\n";
-		$out .= "\tfunction endTest() {\n\t\tunset(\$this->{$className});\n\t}\n}\n";
-
-		$path = CONTROLLER_TESTS;
-		if (isset($this->plugin)) {
-			$pluginPath = 'plugins' . DS . Inflector::underscore($this->plugin) . DS;
-			$path = APP . $pluginPath . 'tests' . DS . 'cases' . DS . 'controllers' . DS;
-		}
-
-		$filename = Inflector::underscore($className).'_controller.test.php';
-		$this->out("\nBaking unit test for $className...");
-
-		$header = '$Id';
-		$content = "<?php \n/* SVN FILE: $header$ */\n/* ". $className ."Controller Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
-		return $this->createFile($path . $filename, $content);
+		$this->Test->plugin = $this->plugin;
+		$this->Test->connection = $this->connection;
+		return $this->Test->bake('Controller', $className);
 	}
+
 /**
- * Outputs and gets the list of possible models or controllers from database
+ * Interact with the user and get a list of additional helpers
+ *
+ * @return array Helpers that the user wants to use.
+ **/
+	function doHelpers() {
+		return $this->_doPropertyChoices(
+			__("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?", true),
+			__("Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'", true)
+		);
+	}
+
+/**
+ * Interact with the user and get a list of additional components
+ *
+ * @return array Components the user wants to use.
+ **/
+	function doComponents() {
+		return $this->_doPropertyChoices(
+			__("Would you like this controller to use any components?", true),
+			__("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'", true)
+		);
+	}
+
+/**
+ * Common code for property choice handling.
+ *
+ * @param string $prompt A yes/no question to precede the list
+ * @param sting $example A question for a comma separated list, with examples.
+ * @return array Array of values for property.
+ **/
+	function _doPropertyChoices($prompt, $example) {
+		$proceed = $this->in($prompt, array('y','n'), 'n');
+		$property = array();
+		if (strtolower($proceed) == 'y') {
+			$propertyList = $this->in($example);
+			$propertyListTrimmed = str_replace(' ', '', $propertyList);
+			$property = explode(',', $propertyListTrimmed);
+		}
+		return array_filter($property);
+	}
+
+/**
+ * Outputs and gets the list of possible controllers from database
  *
  * @param string $useDbConfig Database configuration name
+ * @param boolean $interactive Whether you are using listAll interactively and want options output.
  * @return array Set of controllers
  * @access public
  */
-	function listAll($useDbConfig = 'default') {
-		$db =& ConnectionManager::getDataSource($useDbConfig);
-		$usePrefix = empty($db->config['prefix']) ? '' : $db->config['prefix'];
-		if ($usePrefix) {
-			$tables = array();
-			foreach ($db->listSources() as $table) {
-				if (!strncmp($table, $usePrefix, strlen($usePrefix))) {
-					$tables[] = substr($table, strlen($usePrefix));
-				}
+	function listAll($useDbConfig = null) {
+		if (is_null($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		$this->__tables = $this->Model->getAllTables($useDbConfig);
+
+		if ($this->interactive == true) {
+			$this->out(__('Possible Controllers based on your current database:', true));
+			$this->_controllerNames = array();
+			$count = count($this->__tables);
+			for ($i = 0; $i < $count; $i++) {
+				$this->_controllerNames[] = $this->_controllerName($this->_modelName($this->__tables[$i]));
+				$this->out($i + 1 . ". " . $this->_controllerNames[$i]);
 			}
-		} else {
-			$tables = $db->listSources();
+			return $this->_controllerNames;
 		}
-
-		if (empty($tables)) {
-			$this->err(__('Your database does not have any tables.', true));
-			$this->_stop();
-		}
-
-		$this->__tables = $tables;
-		$this->out('Possible Controllers based on your current database:');
-		$this->_controllerNames = array();
-		$count = count($tables);
-		for ($i = 0; $i < $count; $i++) {
-			$this->_controllerNames[] = $this->_controllerName($this->_modelName($tables[$i]));
-			$this->out($i + 1 . ". " . $this->_controllerNames[$i]);
-		}
-		return $this->_controllerNames;
+		return $this->__tables;
 	}
 
 /**
  * Forces the user to specify the controller he wants to bake, and returns the selected controller name.
  *
+ * @param string $useDbConfig Connection name to get a controller name for.
  * @return string Controller name
  * @access public
  */
-	function getName() {
-		$useDbConfig = 'default';
-		$controllers = $this->listAll($useDbConfig, 'Controllers');
+	function getName($useDbConfig = null) {
+		$controllers = $this->listAll($useDbConfig);
 		$enteredController = '';
 
 		while ($enteredController == '') {
-			$enteredController = $this->in(__("Enter a number from the list above, type in the name of another controller, or 'q' to exit", true), null, 'q');
+			$enteredController = $this->in(__("Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit", true), null, 'q');
 
 			if ($enteredController === 'q') {
 				$this->out(__("Exit", true));
@@ -544,8 +429,7 @@ class ControllerTask extends Shell {
 			}
 
 			if ($enteredController == '' || intval($enteredController) > count($controllers)) {
-				$this->out(__('Error:', true));
-				$this->out(__("The Controller name you supplied was empty, or the number \nyou selected was not an option. Please try again.", true));
+				$this->err(__("The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
 				$enteredController = '';
 			}
 		}
@@ -555,9 +439,9 @@ class ControllerTask extends Shell {
 		} else {
 			$controllerName = Inflector::camelize($enteredController);
 		}
-
 		return $controllerName;
 	}
+
 /**
  * Displays help contents
  *
@@ -568,12 +452,26 @@ class ControllerTask extends Shell {
 		$this->out("Usage: cake bake controller <arg1> <arg2>...");
 		$this->hr();
 		$this->out('Commands:');
-		$this->out("\n\tcontroller <name>\n\t\tbakes controller with var \$scaffold");
-		$this->out("\n\tcontroller <name> scaffold\n\t\tbakes controller with scaffold actions.\n\t\t(index, view, add, edit, delete)");
-		$this->out("\n\tcontroller <name> scaffold admin\n\t\tbakes a controller with scaffold actions for both public and Configure::read('Routing.admin')");
-		$this->out("\n\tcontroller <name> admin\n\t\tbakes a controller with scaffold actions only for Configure::read('Routing.admin')");
+		$this->out('');
+		$this->out("controller <name>");
+		$this->out("\tbakes controller with var \$scaffold");
+		$this->out('');
+		$this->out("controller <name> scaffold");
+		$this->out("\tbakes controller with scaffold actions.");
+		$this->out("\t(index, view, add, edit, delete)");
+		$this->out('');
+		$this->out("controller <name> scaffold admin");
+		$this->out("\tbakes a controller with scaffold actions for both public");
+		$this->out("\tand Configure::read('Routing.admin')");
+		$this->out('');
+		$this->out("controller <name> admin");
+		$this->out("\tbakes a controller with scaffold actions only for");
+		$this->out("\tConfigure::read('Routing.admin')");
+		$this->out('');
+		$this->out("controller all");
+		$this->out("\tbakes all controllers with CRUD methods.");
 		$this->out("");
 		$this->_stop();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index fcd71052e..befedb4c1 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The DbConfig Task handles creating and updating the database.php
  *
@@ -8,25 +7,20 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-if (!class_exists('File')) {
-	uses('file');
-}
+
 /**
  * Task class for creating and updating the database configuration file.
  *
@@ -34,6 +28,7 @@ if (!class_exists('File')) {
  * @subpackage    cake.cake.console.libs.tasks
  */
 class DbConfigTask extends Shell {
+
 /**
  * path to CONFIG directory
  *
@@ -41,6 +36,7 @@ class DbConfigTask extends Shell {
  * @access public
  */
 	var $path = null;
+
 /**
  * Default configuration settings to use
  *
@@ -52,6 +48,15 @@ class DbConfigTask extends Shell {
 		'login'=> 'root', 'password'=> 'password', 'database'=> 'project_name',
 		'schema'=> null, 'prefix'=> null, 'encoding' => null, 'port' => null
 	);
+
+/**
+ * String name of the database config class name.
+ * Used for testing.
+ *
+ * @var string
+ **/
+	var $databaseClassName = 'DATABASE_CONFIG';
+
 /**
  * initialization callback
  *
@@ -61,6 +66,7 @@ class DbConfigTask extends Shell {
 	function initialize() {
 		$this->path = $this->params['working'] . DS . 'config' . DS;
 	}
+
 /**
  * Execution method always used for tasks
  *
@@ -72,6 +78,7 @@ class DbConfigTask extends Shell {
 			$this->_stop();
 		}
 	}
+
 /**
  * Interactive interface
  *
@@ -92,35 +99,27 @@ class DbConfigTask extends Shell {
 				if (preg_match('/[^a-z0-9_]/i', $name)) {
 					$name = '';
 					$this->out('The name may only contain unaccented latin characters, numbers or underscores');
-				}
-				else if (preg_match('/^[^a-z_]/i', $name)) {
+				} else if (preg_match('/^[^a-z_]/i', $name)) {
 					$name = '';
 					$this->out('The name must start with an unaccented latin character or an underscore');
 				}
 			}
-			$driver = '';
 
-			while ($driver == '') {
-				$driver = $this->in('Driver:', array('db2', 'firebird', 'mssql', 'mysql', 'mysqli', 'odbc', 'oracle', 'postgres', 'sqlite', 'sybase'), 'mysql');
-			}
-			$persistent = '';
-
-			while ($persistent == '') {
-				$persistent = $this->in('Persistent Connection?', array('y', 'n'), 'n');
-			}
+			$driver = $this->in('Driver:', array('db2', 'firebird', 'mssql', 'mysql', 'mysqli', 'odbc', 'oracle', 'postgres', 'sqlite', 'sybase'), 'mysql');
 
+			$persistent = $this->in('Persistent Connection?', array('y', 'n'), 'n');
 			if (low($persistent) == 'n') {
 				$persistent = 'false';
 			} else {
 				$persistent = 'true';
 			}
-			$host = '';
 
+			$host = '';
 			while ($host == '') {
 				$host = $this->in('Database Host:', null, 'localhost');
 			}
-			$port = '';
 
+			$port = '';
 			while ($port == '') {
 				$port = $this->in('Port?', null, 'n');
 			}
@@ -128,8 +127,8 @@ class DbConfigTask extends Shell {
 			if (low($port) == 'n') {
 				$port = null;
 			}
-			$login = '';
 
+			$login = '';
 			while ($login == '') {
 				$login = $this->in('User:', null, 'root');
 			}
@@ -141,43 +140,39 @@ class DbConfigTask extends Shell {
 
 				if ($password == '') {
 					$blank = $this->in('The password you supplied was empty. Use an empty password?', array('y', 'n'), 'n');
-					if ($blank == 'y')
-					{
+					if ($blank == 'y') {
 						$blankPassword = true;
 					}
 				}
 			}
-			$database = '';
 
+			$database = '';
 			while ($database == '') {
 				$database = $this->in('Database Name:', null, 'cake');
 			}
-			$prefix = '';
 
+			$prefix = '';
 			while ($prefix == '') {
 				$prefix = $this->in('Table Prefix?', null, 'n');
 			}
-
 			if (low($prefix) == 'n') {
 				$prefix = null;
 			}
-			$encoding = '';
 
+			$encoding = '';
 			while ($encoding == '') {
 				$encoding = $this->in('Table encoding?', null, 'n');
 			}
-
 			if (low($encoding) == 'n') {
 				$encoding = null;
 			}
-			$schema = '';
 
+			$schema = '';
 			if ($driver == 'postgres') {
 				while ($schema == '') {
 					$schema = $this->in('Table schema?', null, 'n');
 				}
 			}
-
 			if (low($schema) == 'n') {
 				$schema = null;
 			}
@@ -199,6 +194,7 @@ class DbConfigTask extends Shell {
 		config('database');
 		return true;
 	}
+
 /**
  * Output verification message and bake if it looks good
  *
@@ -240,11 +236,12 @@ class DbConfigTask extends Shell {
 		$this->hr();
 		$looksGood = $this->in('Look okay?', array('y', 'n'), 'y');
 
-		if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
+		if (strtolower($looksGood) == 'y') {
 			return $config;
 		}
 		return false;
 	}
+
 /**
  * Assembles and writes database.php
  *
@@ -262,7 +259,7 @@ class DbConfigTask extends Shell {
 		$oldConfigs = array();
 
 		if (file_exists($filename)) {
-			$db = new DATABASE_CONFIG;
+			$db = new $this->databaseClassName;
 			$temp = get_class_vars(get_class($db));
 
 			foreach ($temp as $configName => $info) {
@@ -346,8 +343,28 @@ class DbConfigTask extends Shell {
 
 		$out .= "}\n";
 		$out .= "?>";
-		$filename = $this->path.'database.php';
+		$filename = $this->path . 'database.php';
 		return $this->createFile($filename, $out);
 	}
+
+/**
+ * Get a user specified Connection name
+ *
+ * @return void
+ **/
+	function getConfig() {
+		$useDbConfig = 'default';
+		$configs = get_class_vars($this->databaseClassName);
+
+		if (!is_array($configs)) {
+			return $this->execute();
+		}
+
+		$connections = array_keys($configs);
+		if (count($connections) > 1) {
+			$useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default');
+		}
+		return $useDbConfig;
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index 7918e8cd7..eda49614b 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -8,22 +7,20 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Only used when -debug option
  */
@@ -51,6 +48,7 @@
 	$categoryEcho = __c('Category string  lookup line echo __c()', 5);
 
 	ob_end_clean();
+
 /**
  * Language string extractor
  *
@@ -58,6 +56,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class ExtractTask extends Shell{
+
 /**
  * Path to use when looking for strings
  *
@@ -65,6 +64,7 @@ class ExtractTask extends Shell{
  * @access public
  */
 	var $path = null;
+
 /**
  * Files from where to extract
  *
@@ -72,6 +72,7 @@ class ExtractTask extends Shell{
  * @access public
  */
 	var $files = array();
+
 /**
  * Filename where to deposit translations
  *
@@ -79,6 +80,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__filename = 'default';
+
 /**
  * True if all strings should be merged into one file
  *
@@ -86,6 +88,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__oneFile = true;
+
 /**
  * Current file being processed
  *
@@ -93,6 +96,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__file = null;
+
 /**
  * Extracted tokens
  *
@@ -100,6 +104,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__tokens = array();
+
 /**
  * Extracted strings
  *
@@ -107,6 +112,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__strings = array();
+
 /**
  * History of file versions
  *
@@ -114,6 +120,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__fileVersions = array();
+
 /**
  * Destination path
  *
@@ -121,6 +128,7 @@ class ExtractTask extends Shell{
  * @access private
  */
 	var $__output = null;
+
 /**
  * Execution method always used for tasks
  *
@@ -180,6 +188,7 @@ class ExtractTask extends Shell{
 		}
 		$this->__extract();
 	}
+
 /**
  * Extract text
  *
@@ -212,6 +221,7 @@ class ExtractTask extends Shell{
 		}
 		$this->__extractTokens();
 	}
+
 /**
  * Show help options
  *
@@ -237,6 +247,7 @@ class ExtractTask extends Shell{
 		$this->out(__('   -debug: Perform self test.', true));
 		$this->out('');
 	}
+
 /**
  * Extract tokens out of all files to be processed
  *
@@ -281,6 +292,7 @@ class ExtractTask extends Shell{
 		$this->__writeFiles();
 		$this->out('Done.');
 	}
+
 /**
  * Will parse  __(), __c() functions
  *
@@ -316,6 +328,7 @@ class ExtractTask extends Shell{
 			$count++;
 		}
 	}
+
 /**
  * Will parse __d(), __dc(), __n(), __dn(), __dcn()
  *
@@ -402,6 +415,7 @@ class ExtractTask extends Shell{
 			$count++;
 		}
 	}
+
 /**
  * Build the translate template file contents out of obtained strings
  *
@@ -464,6 +478,7 @@ class ExtractTask extends Shell{
 			$this->__store($filename, $output, $fileList);
 		}
 	}
+
 /**
  * Prepare a file to be stored
  *
@@ -491,6 +506,7 @@ class ExtractTask extends Shell{
 			return $storage;
 		}
 	}
+
 /**
  * Write the files that need to be stored
  *
@@ -539,6 +555,7 @@ class ExtractTask extends Shell{
 			fclose($fp);
 		}
 	}
+
 /**
  * Merge output files
  *
@@ -565,6 +582,7 @@ class ExtractTask extends Shell{
 		}
 		return $output;
 	}
+
 /**
  * Build the translation template header
  *
@@ -590,6 +608,7 @@ class ExtractTask extends Shell{
 		$output .= "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n\n";
 		return $output;
 	}
+
 /**
  * Find the version number of a file looking for SVN commands
  *
@@ -604,6 +623,7 @@ class ExtractTask extends Shell{
 			$this->__fileVersions[$file] = $version;
 		}
 	}
+
 /**
  * Format a string to be added as a translateable string
  *
@@ -622,6 +642,7 @@ class ExtractTask extends Shell{
 		$string = str_replace("\r\n", "\n", $string);
 		return addcslashes($string, "\0..\37\\\"");
 	}
+
 /**
  * Indicate an invalid marker on a processed file
  *
@@ -654,6 +675,7 @@ class ExtractTask extends Shell{
 		}
 		$this->out("\n", true);
 	}
+
 /**
  * Search the specified path for files that may contain translateable strings
  *
diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
new file mode 100644
index 000000000..58a5455d0
--- /dev/null
+++ b/cake/console/libs/tasks/fixture.php
@@ -0,0 +1,427 @@
+<?php
+/**
+ * The FixtureTask handles creating and updating fixture files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+/**
+ * Task class for creating and updating fixtures files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class FixtureTask extends Shell {
+
+/**
+ * Name of plugin
+ *
+ * @var string
+ * @access public
+ */
+	var $plugin = null;
+
+/**
+ * Tasks to be loaded by this Task
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('DbConfig', 'Model', 'Template');
+
+/**
+ * path to fixtures directory
+ *
+ * @var string
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * The db connection being used for baking
+ *
+ * @var string
+ **/
+	var $connection = null;
+
+/**
+ * Schema instance
+ *
+ * @var object
+ **/
+	var $_Schema = null;
+
+/**
+ * Override initialize
+ *
+ * @access public
+ */
+	function __construct(&$dispatch) {
+		parent::__construct($dispatch);
+		$this->path = $this->params['working'] . DS . 'tests' . DS . 'fixtures' . DS;
+		if (!class_exists('CakeSchema')) {
+			App::import('Model', 'CakeSchema', false);
+		}
+	}
+
+/**
+ * Execution method always used for tasks
+ * Handles dispatching to interactive, named, or all processess.
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			$this->__interactive();
+		}
+
+		if (isset($this->args[0])) {
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
+			$model = Inflector::camelize($this->args[0]);
+			$this->bake($model);
+		}
+	}
+
+/**
+ * Bake All the Fixtures at once.  Will only bake fixtures for models that exist.
+ *
+ * @access public
+ * @return void
+ **/
+	function all() {
+		$this->interactive = false;
+		$tables = $this->Model->listAll($this->connection, false);
+		foreach ($tables as $table) {
+			$model = $this->_modelName($table);
+			$this->bake($model);
+		}
+	}
+
+/**
+ * Interactive baking function
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->interactive = true;
+		$this->hr();
+		$this->out(sprintf("Bake Fixture\nPath: %s", $this->path));
+		$this->hr();
+
+		$useDbConfig = $this->connection;
+		if (!isset($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+		$modelName = $this->Model->getName($this->connection);
+		$useTable = $this->Model->getTable($modelName, $this->connection);
+		$importOptions = $this->importOptions($modelName);
+		$this->bake($modelName, $useTable, $importOptions);
+	}
+
+/**
+ * Interacts with the User to setup an array of import options. For a fixture.
+ *
+ * @param string $modelName Name of model you are dealing with.
+ * @return array Array of import options.
+ **/
+	function importOptions($modelName) {
+		$options = array();
+		$doSchema = $this->in(__('Would you like to import schema for this fixture?', true), array('y', 'n'), 'n');
+		if ($doSchema == 'y') {
+			$options['schema'] = $modelName;
+		}
+		$doRecords = $this->in(__('Would you like to use record importing for this fixture?', true), array('y', 'n'), 'n');
+		if ($doRecords == 'y') {
+			$options['records'] = true;
+		}
+		if ($doRecords == 'n') {
+			$prompt = sprintf(__("Would you like to build this fixture with data from %s's table?", true), $modelName);
+			$fromTable = $this->in($prompt, array('y', 'n'), 'n');
+			if (strtolower($fromTable) == 'y') {
+				$options['fromTable'] = true;
+			}
+		}
+		return $options;
+	}
+
+/**
+ * Assembles and writes a Fixture file
+ *
+ * @param string $model Name of model to bake.
+ * @param string $useTable Name of table to use.
+ * @param array $importOptions Options for var $import
+ * @return string Baked fixture
+ * @access private
+ */
+	function bake($model, $useTable = false, $importOptions = array()) {
+		$table = $schema = $records = $import = $modelImport = $recordImport = null;
+		if (!$useTable) {
+			$useTable = Inflector::tableize($model);
+		} elseif ($useTable != Inflector::tableize($model)) {
+			$table = $useTable;
+		}
+
+		if (!empty($importOptions)) {
+			if (isset($importOptions['schema'])) {
+				$modelImport = "'model' => '{$importOptions['schema']}'";
+			}
+			if (isset($importOptions['records'])) {
+				$recordImport = "'records' => true";
+			}
+			if ($modelImport && $recordImport) {
+				$modelImport .= ', ';
+			}
+			if (!empty($modelImport) || !empty($recordImport)) {
+				$import = sprintf("array(%s%s)", $modelImport, $recordImport);
+			}
+		}
+
+		$this->_Schema = new CakeSchema();
+		$data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
+
+		if (!isset($data['tables'][$useTable])) {
+			$this->err('Could not find your selected table ' . $useTable);
+			return false;
+		}
+
+		$tableInfo = $data['tables'][$useTable];
+		if (is_null($modelImport)) {
+			$schema = $this->_generateSchema($tableInfo);
+		}
+
+		if (!isset($importOptions['records']) && !isset($importOptions['fromTable'])) {
+			$recordCount = 1;
+			if (isset($this->params['count'])) {
+				$recordCount = $this->params['count'];
+			}
+			$records = $this->_makeRecordString($this->_generateRecords($tableInfo, $recordCount));
+		}
+		if (isset($importOptions['fromTable'])) {
+			$records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
+		}
+		$out = $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import', 'fields'));
+		return $out;
+	}
+
+/**
+ * Generate the fixture file, and write to disk
+ *
+ * @param string $model name of the model being generated
+ * @param string $fixture Contents of the fixture file.
+ * @access public
+ * @return void
+ **/
+	function generateFixtureFile($model, $otherVars) {
+		$defaults = array('table' => null, 'schema' => null, 'records' => null, 'import' => null, 'fields' => null);
+		$vars = array_merge($defaults, $otherVars);
+
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'tests' . DS . 'fixtures' . DS;
+		}
+		$filename = Inflector::underscore($model) . '_fixture.php';
+
+		$this->Template->set('model', $model);
+		$this->Template->set($vars);
+		$content = $this->Template->generate('classes', 'fixture');
+
+		$this->out("\nBaking test fixture for $model...");
+		$this->createFile($path . $filename, $content);
+		return $content;
+	}
+
+/**
+ * Generates a string representation of a schema.
+ *
+ * @param array $table Table schema array
+ * @return string fields definitions
+ **/
+	function _generateSchema($tableInfo) {
+		$cols = array();
+		$out = "array(\n";
+		foreach ($tableInfo as $field => $fieldInfo) {
+			if (is_array($fieldInfo)) {
+				if ($field != 'indexes') {
+					$col = "\t\t'{$field}' => array('type'=>'" . $fieldInfo['type'] . "', ";
+					$col .= join(', ',  $this->_Schema->__values($fieldInfo));
+				} else {
+					$col = "\t\t'indexes' => array(";
+					$props = array();
+					foreach ((array)$fieldInfo as $key => $index) {
+						$props[] = "'{$key}' => array(".join(', ',  $this->_Schema->__values($index)).")";
+					}
+					$col .= join(', ', $props);
+				}
+				$col .= ")";
+				$cols[] = $col;
+			}
+		}
+		$out .= join(",\n", $cols);
+		$out .= "\n\t)";
+		return $out;
+	}
+
+/**
+ * Generate String representation of Records
+ *
+ * @param array $table Table schema array
+ * @return array Array of records to use in the fixture.
+ **/
+	function _generateRecords($tableInfo, $recordCount = 1) {
+		$records = array();
+		for ($i = 0; $i < $recordCount; $i++) {
+			$record = array();
+			foreach ($tableInfo as $field => $fieldInfo) {
+				if (empty($fieldInfo['type'])) {
+					continue;
+				}
+				switch ($fieldInfo['type']) {
+					case 'integer':
+						$insert = $i + 1;
+					break;
+					case 'string';
+						$isPrimaryUuid = (
+							isset($fieldInfo['key']) && strtolower($fieldInfo['key']) == 'primary' &&
+							isset($fieldInfo['length']) && $fieldInfo['length'] == 36
+						);
+						if ($isPrimaryUuid) {
+							$insert = String::uuid();
+						} else {
+							$insert = "Lorem ipsum dolor sit amet";
+							if (!empty($fieldInfo['length'])) {
+								 $insert = substr($insert, 0, (int)$fieldInfo['length'] - 2);
+							}
+						}
+						$insert = "'$insert'";
+					break;
+					case 'timestamp':
+						$ts = time();
+						$insert = "'$ts'";
+					break;
+					case 'datetime':
+						$ts = date('Y-m-d H:i:s');
+						$insert = "'$ts'";
+					break;
+					case 'date':
+						$ts = date('Y-m-d');
+						$insert = "'$ts'";
+					break;
+					case 'time':
+						$ts = date('H:i:s');
+						$insert = "'$ts'";
+					break;
+					case 'boolean':
+						$insert = 1;
+					break;
+					case 'text':
+						$insert = "'Lorem ipsum dolor sit amet, aliquet feugiat.";
+						$insert .= " Convallis morbi fringilla gravida,";
+						$insert .= " phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin";
+						$insert .= " venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla";
+						$insert .= " vestibulum massa neque ut et, id hendrerit sit,";
+						$insert .= " feugiat in taciti enim proin nibh, tempor dignissim, rhoncus";
+						$insert .= " duis vestibulum nunc mattis convallis.'";
+					break;
+				}
+				$record[$field] = $insert;
+			}
+			$records[] = $record;
+		}
+		return $records;
+	}
+
+/**
+ * Convert a $records array into a a string.
+ *
+ * @param array $records Array of records to be converted to string
+ * @return string A string value of the $records array.
+ **/
+	function _makeRecordString($records) {
+		$out = "array(\n";
+		foreach ($records as $record) {
+			$values = array();
+			foreach ($record as $field => $value) {
+				$values[] = "\t\t\t'$field' => $value";
+			}
+			$out .= "\t\tarray(\n";
+			$out .= implode(",\n", $values);
+			$out .= "\n\t\t),\n";
+		}
+		$out .= "\t)";
+		return $out;
+	}
+
+/**
+ * Interact with the user to get a custom SQL condition and use that to extract data
+ * to build a fixture.
+ *
+ * @param string $modelName name of the model to take records from.
+ * @param string $useTable Name of table to use.
+ * @return array Array of records.
+ **/
+	function _getRecordsFromTable($modelName, $useTable = null) {
+		$condition = null;
+		$prompt = __("Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10", true);
+		while (!$condition) {
+			$condition = $this->in($prompt, null, 'WHERE 1=1 LIMIT 10');
+		}
+		App::import('Model', 'Model', false);
+		$modelObject =& new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
+		$records = $modelObject->find('all', array(
+			'conditions' => $condition,
+			'recursive' => -1
+		));
+		$db =& $modelObject->getDataSource();
+		$schema = $modelObject->schema();
+		$out = array();
+		foreach ($records as $record) {
+			$row = array();
+			foreach ($record[$modelObject->alias] as $field => $value) {
+				$row[$field] = $db->value($value, $schema[$field]['type']);
+			}
+			$out[] = $row;
+		}
+		return $out;
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake fixture <arg1> <params>");
+		$this->hr();
+		$this->out('Commands:');
+		$this->out("\nfixture <name>\n\tbakes fixture with specified name.");
+		$this->out("\nfixture all\n\tbakes all fixtures.");
+		$this->out("");
+		$this->out('Parameters:');
+		$this->out("\t-count       When using generated data, the number of records to include in the fixture(s).");
+		$this->out("\t-connection  Which database configuration to use for baking.");
+		$this->out("\t-plugin      lowercased_underscored name of plugin to bake fixtures for.");
+		$this->out("");
+		$this->_stop();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index b4ae6feed..f9d7937b2 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The ModelTask handles creating and updating models files.
  *
@@ -8,23 +7,21 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Model', 'ConnectionManager');
+App::import('Model', 'Model', false);
+
 /**
  * Task class for creating and updating model files.
  *
@@ -32,6 +29,7 @@ App::import('Model', 'ConnectionManager');
  * @subpackage    cake.cake.console.libs.tasks
  */
 class ModelTask extends Shell {
+
 /**
  * Name of plugin
  *
@@ -39,6 +37,15 @@ class ModelTask extends Shell {
  * @access public
  */
 	var $plugin = null;
+
+/**
+ * Name of the db connection used.
+ *
+ * @var string
+ * @access public
+ */
+	var $connection = null;
+
 /**
  * path to MODELS directory
  *
@@ -46,13 +53,38 @@ class ModelTask extends Shell {
  * @access public
  */
 	var $path = MODELS;
+
 /**
  * tasks
  *
  * @var array
  * @access public
  */
-	var $tasks = array('DbConfig');
+	var $tasks = array('DbConfig', 'Fixture', 'Test', 'Template');
+
+/**
+ * Holds tables found on connection.
+ *
+ * @var array
+ **/
+	var $__tables = array();
+
+/**
+ * Holds validation method map.
+ *
+ * @var array
+ **/
+	var $__validations = array();
+
+/**
+ * startup method
+ *
+ * @return void
+ **/
+	function startup() {
+		parent::startup();
+	}
+
 /**
  * Execution method always used for tasks
  *
@@ -64,14 +96,80 @@ class ModelTask extends Shell {
 		}
 
 		if (!empty($this->args[0])) {
+			$this->interactive = false;
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
 			$model = Inflector::camelize($this->args[0]);
-			if ($this->bake($model)) {
+			$object = $this->_getModelObject($model);
+			if ($this->bake($object, false)) {
 				if ($this->_checkUnitTest()) {
+					$this->bakeFixture($model);
 					$this->bakeTest($model);
 				}
 			}
 		}
 	}
+
+/**
+ * Bake all models at once.
+ *
+ * @return void
+ **/
+	function all() {
+		$this->listAll($this->connection, false);
+		$unitTestExists = $this->_checkUnitTest();
+		foreach ($this->__tables as $table) {
+			$modelClass = Inflector::classify($table);
+			$this->out(sprintf(__('Baking %s', true), $modelClass));
+			$object = $this->_getModelObject($modelClass);
+			if ($this->bake($object, false) && $unitTestExists) {
+				$this->bakeFixture($modelClass);
+				$this->bakeTest($modelClass);
+			}
+		}
+	}
+
+/**
+ * Get a model object for a class name.
+ *
+ * @param string $className Name of class you want model to be.
+ * @return object Model instance
+ **/
+	function &_getModelObject($className) {
+		$object = new Model(array('name' => $className, 'ds' => $this->connection));
+		return $object;
+	}
+
+/**
+ * Generate a key value list of options and a prompt.
+ *
+ * @param array $options Array of options to use for the selections. indexes must start at 0
+ * @param string $prompt Prompt to use for options list.
+ * @param integer $default The default option for the given prompt.
+ * @return result of user choice.
+ **/
+	function inOptions($options, $prompt = null, $default = null) {
+		$valid = false;
+		$max = count($options);
+		while (!$valid) {
+			foreach ($options as $i => $option) {
+				$this->out($i + 1 .'. ' . $option);
+			}
+			if (empty($prompt)) {
+				$prompt = __('Make a selection from the choices above', true);
+			}
+			$choice = $this->in($prompt, null, $default);
+			if (intval($choice) > 0 && intval($choice) <= $max) {
+				$valid = true;
+			}
+		}
+		return $choice - 1;
+	}
+
 /**
  * Handles interactive baking
  *
@@ -83,73 +181,42 @@ class ModelTask extends Shell {
 		$this->hr();
 		$this->interactive = true;
 
-		$useTable = null;
 		$primaryKey = 'id';
-		$validate = array();
-		$associations = array('belongsTo'=> array(), 'hasOne'=> array(), 'hasMany' => array(), 'hasAndBelongsToMany'=> array());
+		$validate = $associations = array();
 
-		$useDbConfig = 'default';
-		$configs = get_class_vars('DATABASE_CONFIG');
-
-		if (!is_array($configs)) {
-			return $this->DbConfig->execute();
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
 		}
-
-		$connections = array_keys($configs);
-		if (count($connections) > 1) {
-			$useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default');
-		}
-
-		$currentModelName = $this->getName($useDbConfig);
-		$db =& ConnectionManager::getDataSource($useDbConfig);
-		$useTable = Inflector::tableize($currentModelName);
-		$fullTableName = $db->fullTableName($useTable, false);
-		$tableIsGood = false;
-
-		if (array_search($useTable, $this->__tables) === false) {
-			$this->out('');
-			$this->out(sprintf(__("Given your model named '%s', Cake would expect a database table named %s", true), $currentModelName, $fullTableName));
-			$tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y');
-		}
-
-		if (low($tableIsGood) == 'n' || low($tableIsGood) == 'no') {
-			$useTable = $this->in(__('What is the name of the table (enter "null" to use NO table)?', true));
-		}
-
-		while ($tableIsGood == false && low($useTable) != 'null') {
-			if (is_array($this->__tables) && !in_array($useTable, $this->__tables)) {
-				$fullTableName = $db->fullTableName($useTable, false);
-				$this->out($fullTableName . ' does not exist.');
-				$useTable = $this->in(__('What is the name of the table (enter "null" to use NO table)?', true));
-				$tableIsGood = false;
-			} else {
-				$tableIsGood = true;
-			}
-		}
-
-		$wannaDoValidation = $this->in(__('Would you like to supply validation criteria for the fields in your model?', true), array('y','n'), 'y');
+		$currentModelName = $this->getName();
+		$useTable = $this->getTable($currentModelName);
+		$db =& ConnectionManager::getDataSource($this->connection);
+		$fullTableName = $db->fullTableName($useTable);
 
 		if (in_array($useTable, $this->__tables)) {
-			App::import('Model');
-			$tempModel = new Model(array('name' => $currentModelName, 'table' => $useTable, 'ds' => $useDbConfig));
-
+			$tempModel = new Model(array('name' => $currentModelName, 'table' => $useTable, 'ds' => $this->connection));
 			$fields = $tempModel->schema();
 			if (!array_key_exists('id', $fields)) {
-				foreach ($fields as $name => $field) {
-					if (isset($field['key']) && $field['key'] == 'primary') {
-						break;
-					}
-				}
-				$primaryKey = $this->in(__('What is the primaryKey?', true), null, $name);
+				$primaryKey = $this->findPrimaryKey($fields);
 			}
+		} else {
+			$this->err(sprintf(__('Table %s does not exist, cannot bake a model without a table.', true), $useTable));
+			$this->_stop();
+			return false;
+		}
+		$displayField = $tempModel->hasField(array('name', 'title'));
+		if (!$displayField) {
+			$displayField = $this->findDisplayField($tempModel->schema());
 		}
 
-		if (array_search($useTable, $this->__tables) !== false && (low($wannaDoValidation) == 'y' || low($wannaDoValidation) == 'yes')) {
+		$prompt = __("Would you like to supply validation criteria \nfor the fields in your model?", true);
+		$wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
+		if (array_search($useTable, $this->__tables) !== false && strtolower($wannaDoValidation) == 'y') {
 			$validate = $this->doValidation($tempModel);
 		}
 
-		$wannaDoAssoc = $this->in(__('Would you like to define model associations (hasMany, hasOne, belongsTo, etc.)?', true), array('y','n'), 'y');
-		if ((low($wannaDoAssoc) == 'y' || low($wannaDoAssoc) == 'yes')) {
+		$prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?", true);
+		$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
+		if (strtolower($wannaDoAssoc) == 'y') {
 			$associations = $this->doAssociations($tempModel);
 		}
 
@@ -159,51 +226,35 @@ class ModelTask extends Shell {
 		$this->hr();
 		$this->out("Name:       " . $currentModelName);
 
-		if ($useDbConfig !== 'default') {
-			$this->out("DB Config:  " . $useDbConfig);
+		if ($this->connection !== 'default') {
+			$this->out(sprintf(__("DB Config:  %s", true), $this->connection));
 		}
 		if ($fullTableName !== Inflector::tableize($currentModelName)) {
-			$this->out("DB Table:   " . $fullTableName);
+			$this->out(sprintf(__("DB Table:   %s", true), $fullTableName));
 		}
 		if ($primaryKey != 'id') {
-			$this->out("Primary Key: " . $primaryKey);
+			$this->out(sprintf(__("Primary Key: %s", true), $primaryKey));
 		}
 		if (!empty($validate)) {
-			$this->out("Validation: " . print_r($validate, true));
+			$this->out(sprintf(__("Validation: %s", true), print_r($validate, true)));
 		}
 		if (!empty($associations)) {
-			$this->out("Associations:");
-
-			if (!empty($associations['belongsTo'])) {
-				for ($i = 0; $i < count($associations['belongsTo']); $i++) {
-					$this->out("			$currentModelName belongsTo {$associations['belongsTo'][$i]['alias']}");
-				}
-			}
-
-			if (!empty($associations['hasOne'])) {
-				for ($i = 0; $i < count($associations['hasOne']); $i++) {
-					$this->out("			$currentModelName hasOne	{$associations['hasOne'][$i]['alias']}");
-				}
-			}
-
-			if (!empty($associations['hasMany'])) {
-				for ($i = 0; $i < count($associations['hasMany']); $i++) {
-					$this->out("			$currentModelName hasMany	{$associations['hasMany'][$i]['alias']}");
-				}
-			}
-
-			if (!empty($associations['hasAndBelongsToMany'])) {
-				for ($i = 0; $i < count($associations['hasAndBelongsToMany']); $i++) {
-					$this->out("			$currentModelName hasAndBelongsToMany {$associations['hasAndBelongsToMany'][$i]['alias']}");
-				}
+			$this->out(__("Associations:", true));
+			$assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+			foreach ($assocKeys as $assocKey) {
+				$this->_printAssociation($currentModelName, $assocKey, $associations);
 			}
 		}
+
 		$this->hr();
 		$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
 
-		if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
-			if ($this->bake($currentModelName, $associations, $validate, $primaryKey, $useTable, $useDbConfig)) {
+		if (strtolower($looksGood) == 'y') {
+			$vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField');
+			$vars['useDbConfig'] = $this->connection;
+			if ($this->bake($currentModelName, $vars)) {
 				if ($this->_checkUnitTest()) {
+					$this->bakeFixture($currentModelName, $useTable);
 					$this->bakeTest($currentModelName, $useTable, $associations);
 				}
 			}
@@ -211,15 +262,67 @@ class ModelTask extends Shell {
 			return false;
 		}
 	}
+
 /**
- * Handles associations
+ * Print out all the associations of a particular type
  *
- * @param object $model
- * @param boolean $interactive
- * @return array $validate
+ * @param string $modelName Name of the model relations belong to.
+ * @param string $type Name of association you want to see. i.e. 'belongsTo'
+ * @param string $associations Collection of associations.
+ * @access protected
+ * @return void
+ **/
+	function _printAssociation($modelName, $type, $associations) {
+		if (!empty($associations[$type])) {
+			for ($i = 0; $i < count($associations[$type]); $i++) {
+				$out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias'];
+				$this->out($out);
+			}
+		}
+	}
+
+/**
+ * Finds a primary Key in a list of fields.
+ *
+ * @param array $fields Array of fields that might have a primary key.
+ * @return string Name of field that is a primary key.
+ * @access public
+ **/
+	function findPrimaryKey($fields) {
+		foreach ($fields as $name => $field) {
+			if (isset($field['key']) && $field['key'] == 'primary') {
+				break;
+			}
+		}
+		return $this->in(__('What is the primaryKey?', true), null, $name);
+	}
+
+/**
+ * interact with the user to find the displayField value for a model.
+ *
+ * @param array $fields Array of fields to look for and choose as a displayField
+ * @return mixed Name of field to use for displayField or false if the user declines to choose
+ **/
+	function findDisplayField($fields) {
+		$fieldNames = array_keys($fields);
+		$prompt = __("A displayField could not be automatically detected\nwould you like to choose one?", true);
+		$continue = $this->in($prompt, array('y', 'n'));
+		if (strtolower($continue) == 'n') {
+			return false;
+		}
+		$prompt = __('Choose a field from the options above:', true);
+		$choice = $this->inOptions($fieldNames, $prompt);
+		return $fieldNames[$choice];
+	}
+
+/**
+ * Handles Generation and user interaction for creating validation.
+ *
+ * @param object $model Model to have validations generated for.
+ * @return array $validate Array of user selected validations.
  * @access public
  */
-	function doValidation(&$model, $interactive = true) {
+	function doValidation(&$model) {
 		if (!is_object($model)) {
 			return false;
 		}
@@ -228,67 +331,110 @@ class ModelTask extends Shell {
 		if (empty($fields)) {
 			return false;
 		}
-
 		$validate = array();
+		$this->initValidations();
+		foreach ($fields as $fieldName => $field) {
+			$validation = $this->fieldValidation($fieldName, $field, $model->primaryKey);
+			if (!empty($validation)) {
+				$validate[$fieldName] = $validation;
+			}
+		}
+		return $validate;
+	}
 
-		$options = array();
-
+/**
+ * Populate the __validations array
+ *
+ * @return void
+ **/
+	function initValidations() {
+		$options = $choices = array();
 		if (class_exists('Validation')) {
 			$parent = get_class_methods(get_parent_class('Validation'));
 			$options = array_diff(get_class_methods('Validation'), $parent);
 		}
+		sort($options);
+		$default = 1;
+		foreach ($options as $key => $option) {
+			if ($option{0} != '_' && strtolower($option) != 'getinstance') {
+				$choices[$default] = strtolower($option);
+				$default++;
+			}
+		}
+		$this->__validations = $choices;
+		return $choices;
+	}
 
-		foreach ($fields as $fieldName => $field) {
-			$prompt = 'Field: ' . $fieldName . "\n";
-			$prompt .= 'Type: ' . $field['type'] . "\n";
-			$prompt .= '---------------------------------------------------------------'."\n";
-			$prompt .= 'Please select one of the following validation options:'."\n";
-			$prompt .= '---------------------------------------------------------------'."\n";
+/**
+ * Does individual field validation handling.
+ *
+ * @param string $fieldName Name of field to be validated.
+ * @param array $metaData metadata for field
+ * @return array Array of validation for the field.
+ **/
+	function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
+		$defaultChoice = count($this->__validations);
+		$validate = $alreadyChosen = array();
 
-			sort($options);
-
-			$skip = 1;
-			foreach ($options as $key => $option) {
-				if ($option{0} != '_' && strtolower($option) != 'getinstance') {
-					$prompt .= "{$skip} - {$option}\n";
-					$choices[$skip] = strtolower($option);
-					$skip++;
-				}
+		$anotherValidator = 'y';
+		while ($anotherValidator == 'y') {
+			if ($this->interactive) {
+				$this->out('');
+				$this->out(sprintf(__('Field: %s', true), $fieldName));
+				$this->out(sprintf(__('Type: %s', true), $metaData['type']));
+				$this->hr();
+				$this->out(__('Please select one of the following validation options:', true));
+				$this->hr();
 			}
 
-			$methods = array_flip($choices);
+			$prompt = '';
+			for ($i = 1; $i < $defaultChoice; $i++) {
+				$prompt .= $i . ' - ' . $this->__validations[$i] . "\n";
+			}
+			$prompt .=  sprintf(__("%s - Do not do any validation on this field.\n", true), $defaultChoice);
+			$prompt .= __("... or enter in a valid regex validation string.\n", true);
 
-			$prompt .=  "{$skip} - Do not do any validation on this field.\n";
-			$prompt .= "... or enter in a valid regex validation string.\n";
-
-			$guess = $skip;
-			if ($field['null'] != 1 && $fieldName != $model->primaryKey && !in_array($fieldName, array('created', 'modified', 'updated'))) {
+			$methods = array_flip($this->__validations);
+			$guess = $defaultChoice;
+			if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
 				if ($fieldName == 'email') {
 					$guess = $methods['email'];
-				} elseif ($field['type'] == 'string') {
+				} elseif ($metaData['type'] == 'string') {
 					$guess = $methods['notempty'];
-				} elseif ($field['type'] == 'integer') {
+				} elseif ($metaData['type'] == 'integer') {
 					$guess = $methods['numeric'];
-				} elseif ($field['type'] == 'boolean') {
+				} elseif ($metaData['type'] == 'boolean') {
 					$guess = $methods['numeric'];
-				} elseif ($field['type'] == 'datetime') {
+				} elseif ($metaData['type'] == 'datetime' || $metaData['type'] == 'date') {
 					$guess = $methods['date'];
+				} elseif ($metaData['type'] == 'time') {
+					$guess = $methods['time'];
 				}
 			}
 
-			if ($interactive === true) {
-				$this->out('');
+			if ($this->interactive === true) {
 				$choice = $this->in($prompt, null, $guess);
+				if (in_array($choice, $alreadyChosen)) {
+					$this->out(__("You have already chosen that validation rule,\nplease choose again", true));
+					continue;
+				}
+				$alreadyChosen[] = $choice;
 			} else {
 				$choice = $guess;
 			}
-			if ($choice != $skip) {
-				if (is_numeric($choice) && isset($choices[$choice])) {
-					$validate[$fieldName] = $choices[$choice];
+			$validatorName = $this->__validations[$choice];
+			if ($choice != $defaultChoice) {
+				if (is_numeric($choice) && isset($this->__validations[$choice])) {
+					$validate[$validatorName] = $this->__validations[$choice];
 				} else {
-					$validate[$fieldName] = $choice;
+					$validate[$validatorName] = $choice;
 				}
 			}
+			if ($this->interactive == true && $choice != $defaultChoice) {
+				$anotherValidator = $this->in(__('Would you like to add another validation rule?', true), array('y', 'n'), 'n');
+			} else {
+				$anotherValidator = 'n';
+			}
 		}
 		return $validate;
 	}
@@ -297,376 +443,312 @@ class ModelTask extends Shell {
  * Handles associations
  *
  * @param object $model
- * @param boolean $interactive
  * @return array $assocaitons
  * @access public
  */
-	function doAssociations(&$model, $interactive = true) {
-
+	function doAssociations(&$model) {
 		if (!is_object($model)) {
 			return false;
 		}
-		$this->out(__('One moment while the associations are detected.', true));
+		if ($this->interactive === true) {
+			$this->out(__('One moment while the associations are detected.', true));
+		}
 
 		$fields = $model->schema();
-
 		if (empty($fields)) {
 			return false;
 		}
 
-		$primaryKey = $model->primaryKey;
-		$foreignKey = $this->_modelKey($model->name);
-
-		$associations = array('belongsTo' => array(), 'hasMany' => array(), 'hasOne'=> array(), 'hasAndBelongsToMany' => array());
+		$associations = array(
+			'belongsTo' => array(), 'hasMany' => array(), 'hasOne'=> array(), 'hasAndBelongsToMany' => array()
+		);
 		$possibleKeys = array();
 
-		//Look for belongsTo
-		$i = 0;
-		foreach ($fields as $fieldName => $field) {
-			$offset = strpos($fieldName, '_id');
-			if ($fieldName != $model->primaryKey && $offset !== false) {
-				$tmpModelName = $this->_modelNameFromKey($fieldName);
-				$associations['belongsTo'][$i]['alias'] = $tmpModelName;
-				$associations['belongsTo'][$i]['className'] = $tmpModelName;
-				$associations['belongsTo'][$i]['foreignKey'] = $fieldName;
-				$i++;
-			}
-		}
-		//Look for hasOne and hasMany and hasAndBelongsToMany
-		$i = $j = 0;
+		$associations = $this->findBelongsTo($model, $associations);
+		$associations = $this->findHasOneAndMany($model, $associations);
+		$associations = $this->findHasAndBelongsToMany($model, $associations);
 
-		foreach ($this->__tables as $otherTable) {
-			App::import('Model');
-			$tmpModelName = $this->_modelName($otherTable);
-			$tempOtherModel = & new Model(array('name' => $tmpModelName, 'table' => $otherTable, 'ds' => $model->useDbConfig));
-			$modelFieldsTemp = $tempOtherModel->schema();
-
-			$offset = strpos($otherTable, $model->table . '_');
-			$otherOffset = strpos($otherTable, '_' . $model->table);
-
-			foreach ($modelFieldsTemp as $fieldName => $field) {
-				if ($field['type'] == 'integer' || $field['type'] == 'string') {
-					$possibleKeys[$otherTable][] = $fieldName;
-				}
-				if ($fieldName != $model->primaryKey && $fieldName == $foreignKey && $offset === false && $otherOffset === false) {
-					$associations['hasOne'][$j]['alias'] = $tempOtherModel->name;
-					$associations['hasOne'][$j]['className'] = $tempOtherModel->name;
-					$associations['hasOne'][$j]['foreignKey'] = $fieldName;
-
-					$associations['hasMany'][$j]['alias'] = $tempOtherModel->name;
-					$associations['hasMany'][$j]['className'] = $tempOtherModel->name;
-					$associations['hasMany'][$j]['foreignKey'] = $fieldName;
-					$j++;
-				}
-			}
-
-			if ($offset !== false) {
-				$offset = strlen($model->table . '_');
-				$tmpModelName = $this->_modelName(substr($otherTable, $offset));
-				$associations['hasAndBelongsToMany'][$i]['alias'] = $tmpModelName;
-				$associations['hasAndBelongsToMany'][$i]['className'] = $tmpModelName;
-				$associations['hasAndBelongsToMany'][$i]['foreignKey'] = $foreignKey;
-				$associations['hasAndBelongsToMany'][$i]['associationForeignKey'] = $this->_modelKey($tmpModelName);
-				$associations['hasAndBelongsToMany'][$i]['joinTable'] = $otherTable;
-				$i++;
-			}
-
-			if ($otherOffset !== false) {
-				$tmpModelName = $this->_modelName(substr($otherTable, 0, $otherOffset));
-				$associations['hasAndBelongsToMany'][$i]['alias'] = $tmpModelName;
-				$associations['hasAndBelongsToMany'][$i]['className'] = $tmpModelName;
-				$associations['hasAndBelongsToMany'][$i]['foreignKey'] = $foreignKey;
-				$associations['hasAndBelongsToMany'][$i]['associationForeignKey'] = $this->_modelKey($tmpModelName);
-				$associations['hasAndBelongsToMany'][$i]['joinTable'] = $otherTable;
-				$i++;
-			}
-		}
-
-		if ($interactive !== true) {
+		if ($this->interactive !== true) {
 			unset($associations['hasOne']);
 		}
 
-		if ($interactive === true) {
+		if ($this->interactive === true) {
 			$this->hr();
 			if (empty($associations)) {
 				$this->out(__('None found.', true));
 			} else {
 				$this->out(__('Please confirm the following associations:', true));
 				$this->hr();
-				foreach ($associations as $type => $settings) {
-					if (!empty($associations[$type])) {
-						$count = count($associations[$type]);
-						$response = 'y';
-						for ($i = 0; $i < $count; $i++) {
-							$prompt = "{$model->name} {$type} {$associations[$type][$i]['alias']}";
-							$response = $this->in("{$prompt}?", array('y','n'), 'y');
-
-							if ('n' == low($response) || 'no' == low($response)) {
-								unset($associations[$type][$i]);
-							} else {
-								if ($model->name === $associations[$type][$i]['alias']) {
-									if ($type === 'belongsTo') {
-										$alias = 'Parent' . $associations[$type][$i]['alias'];
-									}
-									if ($type === 'hasOne' || $type === 'hasMany') {
-										$alias = 'Child' . $associations[$type][$i]['alias'];
-									}
-
-									$alternateAlias = $this->in(sprintf(__('This is a self join. Use %s as the alias', true), $alias), array('y', 'n'), 'y');
-
-									if ('n' == low($alternateAlias) || 'no' == low($alternateAlias)) {
-										$associations[$type][$i]['alias'] = $this->in(__('Specify an alternate alias.', true));
-									} else {
-										$associations[$type][$i]['alias'] = $alias;
-									}
-								}
-							}
-						}
-						$associations[$type] = array_merge($associations[$type]);
-					}
-				}
+				$associations = $this->confirmAssociations($model, $associations);
 			}
+			$associations = $this->doMoreAssociations($model, $associations);
+		}
+		return $associations;
+	}
 
-			$wannaDoMoreAssoc = $this->in(__('Would you like to define some additional model associations?', true), array('y','n'), 'n');
-
-			while ((low($wannaDoMoreAssoc) == 'y' || low($wannaDoMoreAssoc) == 'yes')) {
-				$assocs = array(1 => 'belongsTo', 2 => 'hasOne', 3 => 'hasMany', 4 => 'hasAndBelongsToMany');
-				$bad = true;
-				while ($bad) {
-					$this->out(__('What is the association type?', true));
-					$prompt = "1. belongsTo\n";
-					$prompt .= "2. hasOne\n";
-					$prompt .= "3. hasMany\n";
-					$prompt .= "4. hasAndBelongsToMany\n";
-					$assocType = intval($this->in($prompt, null, __("Enter a number", true)));
-
-					if (intval($assocType) < 1 || intval($assocType) > 4) {
-						$this->out(__('The selection you entered was invalid. Please enter a number between 1 and 4.', true));
-					} else {
-						$bad = false;
-					}
-				}
-				$this->out(__('For the following options be very careful to match your setup exactly. Any spelling mistakes will cause errors.', true));
-				$this->hr();
-				$alias = $this->in(__('What is the alias for this association?', true));
-				$className = $this->in(sprintf(__('What className will %s use?', true), $alias), null, $alias );
-				$suggestedForeignKey = null;
-				if ($assocType == '1') {
-					$showKeys = $possibleKeys[$model->table];
-					$suggestedForeignKey = $this->_modelKey($alias);
-				} else {
-					$otherTable = Inflector::tableize($className);
-					if (in_array($otherTable, $this->__tables)) {
-						if ($assocType < '4') {
-							$showKeys = $possibleKeys[$otherTable];
-						} else {
-							$showKeys = null;
-						}
-					} else {
-						$otherTable = $this->in(__('What is the table for this model?', true));
-						$showKeys = $possibleKeys[$otherTable];
-					}
-					$suggestedForeignKey = $this->_modelKey($model->name);
-				}
-				if (!empty($showKeys)) {
-					$this->out(__('A helpful List of possible keys', true));
-					for ($i = 0; $i < count($showKeys); $i++) {
-						$this->out($i + 1 . ". " . $showKeys[$i]);
-					}
-					$foreignKey = $this->in(__('What is the foreignKey?', true), null, __("Enter a number", true));
-					if (intval($foreignKey) > 0 && intval($foreignKey) <= $i ) {
-						$foreignKey = $showKeys[intval($foreignKey) - 1];
-					}
-				}
-				if (!isset($foreignKey)) {
-					$foreignKey = $this->in(__('What is the foreignKey? Specify your own.', true), null, $suggestedForeignKey);
-				}
-				if ($assocType == '4') {
-					$associationForeignKey = $this->in(__('What is the associationForeignKey?', true), null, $this->_modelKey($model->name));
-					$joinTable = $this->in(__('What is the joinTable?', true));
-				}
-				$associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]);
-				$count = count($associations[$assocs[$assocType]]);
-				$i = ($count > 0) ? $count : 0;
-				$associations[$assocs[$assocType]][$i]['alias'] = $alias;
-				$associations[$assocs[$assocType]][$i]['className'] = $className;
-				$associations[$assocs[$assocType]][$i]['foreignKey'] = $foreignKey;
-				if ($assocType == '4') {
-					$associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey;
-					$associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable;
-				}
-				$wannaDoMoreAssoc = $this->in(__('Define another association?', true), array('y','n'), 'y');
+/**
+ * Find belongsTo relations and add them to the associations list.
+ *
+ * @param object $model Model instance of model being generated.
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with belongsTo added in.
+ **/
+	function findBelongsTo(&$model, $associations) {
+		$fields = $model->schema();
+		foreach ($fields as $fieldName => $field) {
+			$offset = strpos($fieldName, '_id');
+			if ($fieldName != $model->primaryKey && $fieldName != 'parent_id' && $offset !== false) {
+				$tmpModelName = $this->_modelNameFromKey($fieldName);
+				$associations['belongsTo'][] = array(
+					'alias' => $tmpModelName,
+					'className' => $tmpModelName,
+					'foreignKey' => $fieldName,
+				);
+			} elseif ($fieldName == 'parent_id') {
+				$associations['belongsTo'][] = array(
+					'alias' => 'Parent' . $model->name,
+					'className' => $model->name,
+					'foreignKey' => $fieldName,
+				);
 			}
 		}
 		return $associations;
 	}
+
+/**
+ * Find the hasOne and HasMany relations and add them to associations list
+ *
+ * @param object $model Model instance being generated
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with hasOne and hasMany added in.
+ **/
+	function findHasOneAndMany(&$model, $associations) {
+		$foreignKey = $this->_modelKey($model->name);
+		foreach ($this->__tables as $otherTable) {
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable));
+			$modelFieldsTemp = $tempOtherModel->schema();
+
+			$pattern = '/_' . preg_quote($model->table, '/') . '|' . preg_quote($model->table, '/') . '_/';
+			$possibleJoinTable = preg_match($pattern , $otherTable);
+			if ($possibleJoinTable == true) {
+				continue;
+			}
+			foreach ($modelFieldsTemp as $fieldName => $field) {
+				$assoc = false;
+				if ($fieldName != $model->primaryKey && $fieldName == $foreignKey) {
+					$assoc = array(
+						'alias' => $tempOtherModel->name,
+						'className' => $tempOtherModel->name,
+						'foreignKey' => $fieldName
+					);
+				} elseif ($otherTable == $model->table && $fieldName == 'parent_id') {
+					$assoc = array(
+						'alias' => 'Child' . $model->name,
+						'className' => $model->name,
+						'foreignKey' => $fieldName
+					);
+				}
+				if ($assoc) {
+					$associations['hasOne'][] = $assoc;
+					$associations['hasMany'][] = $assoc;
+				}
+
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Find the hasAndBelongsToMany relations and add them to associations list
+ *
+ * @param object $model Model instance being generated
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with hasAndBelongsToMany added in.
+ **/
+	function findHasAndBelongsToMany(&$model, $associations) {
+		$foreignKey = $this->_modelKey($model->name);
+		foreach ($this->__tables as $otherTable) {
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable));
+			$modelFieldsTemp = $tempOtherModel->schema();
+
+			$offset = strpos($otherTable, $model->table . '_');
+			$otherOffset = strpos($otherTable, '_' . $model->table);
+
+			if ($offset !== false) {
+				$offset = strlen($model->table . '_');
+				$habtmName = $this->_modelName(substr($otherTable, $offset));
+				$associations['hasAndBelongsToMany'][] = array(
+					'alias' => $habtmName,
+					'className' => $habtmName,
+					'foreignKey' => $foreignKey,
+					'associationForeignKey' => $this->_modelKey($habtmName),
+					'joinTable' => $otherTable
+				);
+			} elseif ($otherOffset !== false) {
+				$habtmName = $this->_modelName(substr($otherTable, 0, $otherOffset));
+				$associations['hasAndBelongsToMany'][] = array(
+					'alias' => $habtmName,
+					'className' => $habtmName,
+					'foreignKey' => $foreignKey,
+					'associationForeignKey' => $this->_modelKey($habtmName),
+					'joinTable' => $otherTable
+				);
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Interact with the user and confirm associations.
+ *
+ * @param array $model Temporary Model instance.
+ * @param array $associations Array of associations to be confirmed.
+ * @return array Array of confirmed associations
+ **/
+	function confirmAssociations(&$model, $associations) {
+		foreach ($associations as $type => $settings) {
+			if (!empty($associations[$type])) {
+				$count = count($associations[$type]);
+				$response = 'y';
+				for ($i = 0; $i < $count; $i++) {
+					$prompt = "{$model->name} {$type} {$associations[$type][$i]['alias']}";
+					$response = $this->in("{$prompt}?", array('y','n'), 'y');
+
+					if ('n' == low($response)) {
+						unset($associations[$type][$i]);
+					} elseif ($type == 'hasMany') {
+						unset($associations['hasOne'][$i]);
+					}
+				}
+				$associations[$type] = array_merge($associations[$type]);
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Interact with the user and generate additional non-conventional associations
+ *
+ * @param object $model Temporary model instance
+ * @param array $associations Array of associations.
+ * @return array Array of associations.
+ **/
+	function doMoreAssociations($model, $associations) {
+		$prompt = __('Would you like to define some additional model associations?', true);
+		$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
+		$possibleKeys = $this->_generatePossibleKeys();
+		while (low($wannaDoMoreAssoc) == 'y') {
+			$assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+			$this->out(__('What is the association type?', true));
+			$assocType = intval($this->inOptions($assocs, __('Enter a number',true)));
+
+			$this->out(__("For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.", true));
+			$this->hr();
+
+			$alias = $this->in(__('What is the alias for this association?', true));
+			$className = $this->in(sprintf(__('What className will %s use?', true), $alias), null, $alias );
+			$suggestedForeignKey = null;
+
+			if ($assocType == 0) {
+				$showKeys = $possibleKeys[$model->table];
+				$suggestedForeignKey = $this->_modelKey($alias);
+			} else {
+				$otherTable = Inflector::tableize($className);
+				if (in_array($otherTable, $this->__tables)) {
+					if ($assocType < 3) {
+						$showKeys = $possibleKeys[$otherTable];
+					} else {
+						$showKeys = null;
+					}
+				} else {
+					$otherTable = $this->in(__('What is the table for this model?', true));
+					$showKeys = $possibleKeys[$otherTable];
+				}
+				$suggestedForeignKey = $this->_modelKey($model->name);
+			}
+			if (!empty($showKeys)) {
+				$this->out(__('A helpful List of possible keys', true));
+				$foreignKey = $this->inOptions($showKeys, __('What is the foreignKey?', true));
+				$foreignKey = $showKeys[intval($foreignKey)];
+			}
+			if (!isset($foreignKey)) {
+				$foreignKey = $this->in(__('What is the foreignKey? Specify your own.', true), null, $suggestedForeignKey);
+			}
+			if ($assocType == 3) {
+				$associationForeignKey = $this->in(__('What is the associationForeignKey?', true), null, $this->_modelKey($model->name));
+				$joinTable = $this->in(__('What is the joinTable?', true));
+			}
+			$associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]);
+			$count = count($associations[$assocs[$assocType]]);
+			$i = ($count > 0) ? $count : 0;
+			$associations[$assocs[$assocType]][$i]['alias'] = $alias;
+			$associations[$assocs[$assocType]][$i]['className'] = $className;
+			$associations[$assocs[$assocType]][$i]['foreignKey'] = $foreignKey;
+			if ($assocType == 3) {
+				$associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey;
+				$associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable;
+			}
+			$wannaDoMoreAssoc = $this->in(__('Define another association?', true), array('y','n'), 'y');
+		}
+		return $associations;
+	}
+
+/**
+ * Finds all possible keys to use on custom associations.
+ *
+ * @return array array of tables and possible keys
+ **/
+	function _generatePossibleKeys() {
+		$possible = array();
+		foreach ($this->__tables as $otherTable) {
+			$tempOtherModel = & new Model(array('table' => $otherTable, 'ds' => $this->connection));
+			$modelFieldsTemp = $tempOtherModel->schema();
+			foreach ($modelFieldsTemp as $fieldName => $field) {
+				if ($field['type'] == 'integer' || $field['type'] == 'string') {
+					$possible[$otherTable][] = $fieldName;
+				}
+			}
+		}
+		return $possible;
+	}
+
 /**
  * Assembles and writes a Model file.
  *
  * @param mixed $name Model name or object
- * @param mixed $associations if array and $name is not an object assume Model associations array otherwise boolean interactive
- * @param array $validate Validation rules
- * @param string $primaryKey Primary key to use
- * @param string $useTable Table to use
- * @param string $useDbConfig Database configuration setting to use
+ * @param mixed $data if array and $name is not an object assume bake data, otherwise boolean.
  * @access private
  */
-	function bake($name, $associations = array(),  $validate = array(), $primaryKey = 'id', $useTable = null, $useDbConfig = 'default') {
-
+	function bake($name, $data = array()) {
 		if (is_object($name)) {
-			if (!is_array($associations)) {
-				$associations = $this->doAssociations($name, $associations);
-				$validate = $this->doValidation($name, $associations);
+			if ($data == false) {
+				$data = $associations = array();
+				$data['associations'] = $this->doAssociations($name, $associations);
+				$data['validate'] = $this->doValidation($name);
 			}
-			$primaryKey = $name->primaryKey;
-			$useTable = $name->table;
-			$useDbConfig = $name->useDbConfig;
-			$name = $name->name;
+			$data['primaryKey'] = $name->primaryKey;
+			$data['useTable'] = $name->table;
+			$data['useDbConfig'] = $name->useDbConfig;
+			$data['name'] = $name = $name->name;
+		} else {
+			$data['name'] = $name;
 		}
+		$defaults = array('associations' => array(), 'validate' => array(), 'primaryKey' => 'id',
+			'useTable' => null, 'useDbConfig' => 'default', 'displayField' => null);
+		$data = array_merge($defaults, $data);
 
-		$out = "<?php\n";
-		$out .= "class {$name} extends {$this->plugin}AppModel {\n\n";
-		$out .= "\tvar \$name = '{$name}';\n";
+		$this->Template->set($data);
+		$this->Template->set('plugin', Inflector::camelize($this->plugin));
+		$out = $this->Template->generate('classes', 'model');
 
-		if ($useDbConfig !== 'default') {
-			$out .= "\tvar \$useDbConfig = '$useDbConfig';\n";
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'models' . DS;
 		}
-
-		if (($useTable && $useTable !== Inflector::tableize($name)) || $useTable === false) {
-			$table = "'$useTable'";
-			if (!$useTable) {
-				$table = 'false';
-			}
-			$out .= "\tvar \$useTable = $table;\n";
-		}
-
-		if ($primaryKey !== 'id') {
-			$out .= "\tvar \$primaryKey = '$primaryKey';\n";
-		}
-
-		$validateCount = count($validate);
-		if (is_array($validate) && $validateCount > 0) {
-			$out .= "\tvar \$validate = array(\n";
-			$keys = array_keys($validate);
-			for ($i = 0; $i < $validateCount; $i++) {
-				$val = "'" . $validate[$keys[$i]] . "'";
-				$out .= "\t\t'" . $keys[$i] . "' => array({$val})";
-				if ($i + 1 < $validateCount) {
-					$out .= ",";
-				}
-				$out .= "\n";
-			}
-			$out .= "\t);\n";
-		}
-		$out .= "\n";
-
-		if (!empty($associations)) {
-			if (!empty($associations['belongsTo']) || !empty($associations['hasOne']) || !empty($associations['hasMany']) || !empty($associations['hasAndBelongsToMany'])) {
-				$out.= "\t//The Associations below have been created with all possible keys, those that are not needed can be removed\n";
-			}
-
-			if (!empty($associations['belongsTo'])) {
-				$out .= "\tvar \$belongsTo = array(\n";
-				$belongsToCount = count($associations['belongsTo']);
-
-				for ($i = 0; $i < $belongsToCount; $i++) {
-					$out .= "\t\t'{$associations['belongsTo'][$i]['alias']}' => array(\n";
-					$out .= "\t\t\t'className' => '{$associations['belongsTo'][$i]['className']}',\n";
-					$out .= "\t\t\t'foreignKey' => '{$associations['belongsTo'][$i]['foreignKey']}',\n";
-					$out .= "\t\t\t'conditions' => '',\n";
-					$out .= "\t\t\t'fields' => '',\n";
-					$out .= "\t\t\t'order' => ''\n";
-					$out .= "\t\t)";
-					if ($i + 1 < $belongsToCount) {
-						$out .= ",";
-					}
-					$out .= "\n";
-
-				}
-				$out .= "\t);\n\n";
-			}
-
-			if (!empty($associations['hasOne'])) {
-				$out .= "\tvar \$hasOne = array(\n";
-				$hasOneCount = count($associations['hasOne']);
-
-				for ($i = 0; $i < $hasOneCount; $i++) {
-					$out .= "\t\t'{$associations['hasOne'][$i]['alias']}' => array(\n";
-					$out .= "\t\t\t'className' => '{$associations['hasOne'][$i]['className']}',\n";
-					$out .= "\t\t\t'foreignKey' => '{$associations['hasOne'][$i]['foreignKey']}',\n";
-					$out .= "\t\t\t'dependent' => false,\n";
-					$out .= "\t\t\t'conditions' => '',\n";
-					$out .= "\t\t\t'fields' => '',\n";
-					$out .= "\t\t\t'order' => ''\n";
-					$out .= "\t\t)";
-					if ($i + 1 < $hasOneCount) {
-						$out .= ",";
-					}
-					$out .= "\n";
-
-				}
-				$out .= "\t);\n\n";
-			}
-
-			if (!empty($associations['hasMany'])) {
-				$out .= "\tvar \$hasMany = array(\n";
-				$hasManyCount = count($associations['hasMany']);
-
-				for ($i = 0; $i < $hasManyCount; $i++) {
-					$out .= "\t\t'{$associations['hasMany'][$i]['alias']}' => array(\n";
-					$out .= "\t\t\t'className' => '{$associations['hasMany'][$i]['className']}',\n";
-					$out .= "\t\t\t'foreignKey' => '{$associations['hasMany'][$i]['foreignKey']}',\n";
-					$out .= "\t\t\t'dependent' => false,\n";
-					$out .= "\t\t\t'conditions' => '',\n";
-					$out .= "\t\t\t'fields' => '',\n";
-					$out .= "\t\t\t'order' => '',\n";
-					$out .= "\t\t\t'limit' => '',\n";
-					$out .= "\t\t\t'offset' => '',\n";
-					$out .= "\t\t\t'exclusive' => '',\n";
-					$out .= "\t\t\t'finderQuery' => '',\n";
-					$out .= "\t\t\t'counterQuery' => ''\n";
-					$out .= "\t\t)";
-					if ($i + 1 < $hasManyCount) {
-						$out .= ",";
-					}
-					$out .= "\n";
-				}
-				$out .= "\t);\n\n";
-			}
-
-			if (!empty($associations['hasAndBelongsToMany'])) {
-				$out .= "\tvar \$hasAndBelongsToMany = array(\n";
-				$hasAndBelongsToManyCount = count($associations['hasAndBelongsToMany']);
-
-				for ($i = 0; $i < $hasAndBelongsToManyCount; $i++) {
-					$out .= "\t\t'{$associations['hasAndBelongsToMany'][$i]['alias']}' => array(\n";
-					$out .= "\t\t\t'className' => '{$associations['hasAndBelongsToMany'][$i]['className']}',\n";
-					$out .= "\t\t\t'joinTable' => '{$associations['hasAndBelongsToMany'][$i]['joinTable']}',\n";
-					$out .= "\t\t\t'foreignKey' => '{$associations['hasAndBelongsToMany'][$i]['foreignKey']}',\n";
-					$out .= "\t\t\t'associationForeignKey' => '{$associations['hasAndBelongsToMany'][$i]['associationForeignKey']}',\n";
-					$out .= "\t\t\t'unique' => true,\n";
-					$out .= "\t\t\t'conditions' => '',\n";
-					$out .= "\t\t\t'fields' => '',\n";
-					$out .= "\t\t\t'order' => '',\n";
-					$out .= "\t\t\t'limit' => '',\n";
-					$out .= "\t\t\t'offset' => '',\n";
-					$out .= "\t\t\t'finderQuery' => '',\n";
-					$out .= "\t\t\t'deleteQuery' => '',\n";
-					$out .= "\t\t\t'insertQuery' => ''\n";
-					$out .= "\t\t)";
-					if ($i + 1 < $hasAndBelongsToManyCount) {
-						$out .= ",";
-					}
-					$out .= "\n";
-				}
-				$out .= "\t);\n\n";
-			}
-		}
-		$out .= "}\n";
-		$out .= "?>";
-		$filename = $this->path . Inflector::underscore($name) . '.php';
+		$filename = $path . Inflector::underscore($name) . '.php';
 		$this->out("\nBaking model class for $name...");
-		return $this->createFile($filename, $out);
+		$this->createFile($filename, $out);
+		return $out;
 	}
 
 /**
@@ -675,80 +757,75 @@ class ModelTask extends Shell {
  * @param string $className Model class name
  * @access private
  */
-	function bakeTest($className, $useTable = null, $associations = array()) {
-		$results = $this->fixture($className, $useTable);
-
-		if ($results) {
-			$fixtureInc = 'app';
-			if ($this->plugin) {
-				$fixtureInc = 'plugin.'.Inflector::underscore($this->plugin);
-			}
-
-			$fixture[] = "'{$fixtureInc}." . Inflector::underscore($className) ."'";
-
-			if (!empty($associations)) {
-				$assoc[] = Set::extract($associations, 'belongsTo.{n}.className');
-				$assoc[] = Set::extract($associations, 'hasOne.{n}.className');
-				$assoc[] = Set::extract($associations, 'hasMany.{n}.className');
-				foreach ($assoc as $key => $value) {
-					if (is_array($value)) {
-						foreach ($value as $class) {
-							$fixture[] = "'{$fixtureInc}." . Inflector::underscore($class) ."'";
-						}
-					}
-				}
-			}
-			$fixture = join(", ", $fixture);
-
-			$import = $className;
-			if (isset($this->plugin)) {
-				$import = $this->plugin . '.' . $className;
-			}
-
-			$out = "App::import('Model', '$import');\n\n";
-			$out .= "class {$className}TestCase extends CakeTestCase {\n";
-			$out .= "\tvar \${$className} = null;\n";
-			$out .= "\tvar \$fixtures = array($fixture);\n\n";
-			$out .= "\tfunction startTest() {\n";
-			$out .= "\t\t\$this->{$className} =& ClassRegistry::init('{$className}');\n";
-			$out .= "\t}\n\n";
-			$out .= "\tfunction test{$className}Instance() {\n";
-			$out .= "\t\t\$this->assertTrue(is_a(\$this->{$className}, '{$className}'));\n";
-			$out .= "\t}\n\n";
-			$out .= "\tfunction test{$className}Find() {\n";
-			$out .= "\t\t\$this->{$className}->recursive = -1;\n";
-			$out .= "\t\t\$results = \$this->{$className}->find('first');\n\t\t\$this->assertTrue(!empty(\$results));\n\n";
-			$out .= "\t\t\$expected = array('$className' => array(\n$results\n\t\t));\n";
-			$out .= "\t\t\$this->assertEqual(\$results, \$expected);\n";
-			$out .= "\t}\n";
-			$out .= "}\n";
-
-			$path = MODEL_TESTS;
-			if (isset($this->plugin)) {
-				$pluginPath = 'plugins' . DS . Inflector::underscore($this->plugin) . DS;
-				$path = APP . $pluginPath . 'tests' . DS . 'cases' . DS . 'models' . DS;
-			}
-
-			$filename = Inflector::underscore($className).'.test.php';
-			$this->out("\nBaking unit test for $className...");
-
-			$header = '$Id';
-			$content = "<?php \n/* SVN FILE: $header$ */\n/* ". $className ." Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
-			return $this->createFile($path . $filename, $content);
-		}
-		return false;
+	function bakeTest($className) {
+		$this->Test->plugin = $this->plugin;
+		$this->Test->connection = $this->connection;
+		return $this->Test->bake('Model', $className);
 	}
+
 /**
  * outputs the a list of possible models or controllers from database
  *
  * @param string $useDbConfig Database configuration name
  * @access public
  */
-	function listAll($useDbConfig = 'default', $interactive = true) {
+	function listAll($useDbConfig = null) {
+		$this->__tables = $this->getAllTables($useDbConfig);
+
+		if ($this->interactive === true) {
+			$this->out(__('Possible Models based on your current database:', true));
+			$this->_modelNames = array();
+			$count = count($this->__tables);
+			for ($i = 0; $i < $count; $i++) {
+				$this->_modelNames[] = $this->_modelName($this->__tables[$i]);
+				$this->out($i + 1 . ". " . $this->_modelNames[$i]);
+			}
+		}
+		return $this->__tables;
+	}
+
+/**
+ * Interact with the user to determine the table name of a particular model
+ *
+ * @param string $modelName Name of the model you want a table for.
+ * @param string $useDbConfig Name of the database config you want to get tables from.
+ * @return void
+ **/
+	function getTable($modelName, $useDbConfig = null) {
+		if (!isset($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		$db =& ConnectionManager::getDataSource($useDbConfig);
+		$useTable = Inflector::tableize($modelName);
+		$fullTableName = $db->fullTableName($useTable, false);
+		$tableIsGood = false;
+
+		if (array_search($useTable, $this->__tables) === false) {
+			$this->out('');
+			$this->out(sprintf(__("Given your model named '%s',\nCake would expect a database table named '%s'", true), $modelName, $fullTableName));
+			$tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y');
+		}
+		if (strtolower($tableIsGood) == 'n') {
+			$useTable = $this->in(__('What is the name of the table?', true));
+		}
+		return $useTable;
+	}
+
+/**
+ * Get an Array of all the tables in the supplied connection
+ * will halt the script if no tables are found.
+ *
+ * @param string $useDbConfig Connection name to scan.
+ * @return array Array of tables in the database.
+ **/
+	function getAllTables($useDbConfig = null) {
+		if (!isset($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		$tables = array();
 		$db =& ConnectionManager::getDataSource($useDbConfig);
 		$usePrefix = empty($db->config['prefix']) ? '' : $db->config['prefix'];
 		if ($usePrefix) {
-			$tables = array();
 			foreach ($db->listSources() as $table) {
 				if (!strncmp($table, $usePrefix, strlen($usePrefix))) {
 					$tables[] = substr($table, strlen($usePrefix));
@@ -761,32 +838,22 @@ class ModelTask extends Shell {
 			$this->err(__('Your database does not have any tables.', true));
 			$this->_stop();
 		}
-
-		$this->__tables = $tables;
-
-		if ($interactive === true) {
-			$this->out(__('Possible Models based on your current database:', true));
-			$this->_modelNames = array();
-			$count = count($tables);
-			for ($i = 0; $i < $count; $i++) {
-				$this->_modelNames[] = $this->_modelName($tables[$i]);
-				$this->out($i + 1 . ". " . $this->_modelNames[$i]);
-			}
-		}
+		return $tables;
 	}
+
 /**
  * Forces the user to specify the model he wants to bake, and returns the selected model name.
  *
  * @return string the model name
  * @access public
  */
-	function getName($useDbConfig) {
+	function getName($useDbConfig = null) {
 		$this->listAll($useDbConfig);
 
 		$enteredModel = '';
 
 		while ($enteredModel == '') {
-			$enteredModel = $this->in(__("Enter a number from the list above, type in the name of another model, or 'q' to exit", true), null, 'q');
+			$enteredModel = $this->in(__("Enter a number from the list above,\ntype in the name of another model, or 'q' to exit", true), null, 'q');
 
 			if ($enteredModel === 'q') {
 				$this->out(__("Exit", true));
@@ -794,19 +861,18 @@ class ModelTask extends Shell {
 			}
 
 			if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) {
-				$this->err(__("The model name you supplied was empty, or the number you selected was not an option. Please try again.", true));
+				$this->err(__("The model name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
 				$enteredModel = '';
 			}
 		}
-
 		if (intval($enteredModel) > 0 && intval($enteredModel) <= count($this->_modelNames)) {
 			$currentModelName = $this->_modelNames[intval($enteredModel) - 1];
 		} else {
 			$currentModelName = $enteredModel;
 		}
-
 		return $currentModelName;
 	}
+
 /**
  * Displays help contents
  *
@@ -817,122 +883,32 @@ class ModelTask extends Shell {
 		$this->out("Usage: cake bake model <arg1>");
 		$this->hr();
 		$this->out('Commands:');
-		$this->out("\n\tmodel\n\t\tbakes model in interactive mode.");
-		$this->out("\n\tmodel <name>\n\t\tbakes model file with no associations or validation");
+		$this->out('');
+		$this->out("model");
+		$this->out("\tbakes model in interactive mode.");
+		$this->out('');
+		$this->out("model <name>");
+		$this->out("\tbakes model file with no associations or validation");
+		$this->out('');
+		$this->out("model all");
+		$this->out("\tbakes all model files with associations and validation");
 		$this->out("");
 		$this->_stop();
 	}
+
 /**
- * Builds the tests fixtures for the model and create the file
+ * Interact with FixtureTask to automatically bake fixtures when baking models.
  *
- * @param string $model the name of the model
- * @param string $useTable table name
- * @return array $records, used in ModelTask::bakeTest() to create $expected
- * @todo move this to a task
- */
-	function fixture($model, $useTable = null) {
-		if (!class_exists('CakeSchema')) {
-			App::import('Model', 'CakeSchema');
-		}
-		$out = "\nclass {$model}Fixture extends CakeTestFixture {\n";
-		$out .= "\tvar \$name = '$model';\n";
-
-		if (!$useTable) {
-			$useTable = Inflector::tableize($model);
-		} else {
-			$out .= "\tvar \$table = '$useTable';\n";
-		}
-		$schema = new CakeSchema();
-		$data = $schema->read(array('models' => false));
-
-		if (!isset($data['tables'][$useTable])) {
-			return false;
-		}
-		$tables[$model] = $data['tables'][$useTable];
-
-		foreach ($tables as $table => $fields) {
-			if (!is_numeric($table) && $table !== 'missing') {
-				$out .= "\tvar \$fields = array(\n";
-				$records = array();
-				if (is_array($fields)) {
-					$cols = array();
-					foreach ($fields as $field => $value) {
-						if ($field != 'indexes') {
-							if (is_string($value)) {
-								$type = $value;
-								$value = array('type'=> $type);
-							}
-							$col = "\t\t'{$field}' => array('type'=>'" . $value['type'] . "', ";
-
-							switch ($value['type']) {
-								case 'integer':
-									$insert = 1;
-								break;
-								case 'string';
-									$insert = "Lorem ipsum dolor sit amet";
-									if (!empty($value['length'])) {
-										$insert = substr($insert, 0, (int)$value['length'] - 2);
-									}
-									$insert = "'$insert'";
-								break;
-								case 'datetime':
-									$ts = date('Y-m-d H:i:s');
-									$insert = "'$ts'";
-								break;
-								case 'date':
-									$ts = date('Y-m-d');
-									$insert = "'$ts'";
-								break;
-								case 'time':
-									$ts = date('H:i:s');
-									$insert = "'$ts'";
-								break;
-								case 'boolean':
-									$insert = 1;
-								break;
-								case 'text':
-									$insert =
-									"'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida,";
-									$insert .= "phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam,";
-									$insert .= "vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit,";
-									$insert .= "feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.'";
-								break;
-							}
-							$records[] = "\t\t'$field'  => $insert";
-							unset($value['type']);
-							$col .= join(', ',  $schema->__values($value));
-						} else {
-							$col = "\t\t'indexes' => array(";
-							$props = array();
-							foreach ((array)$value as $key => $index) {
-								$props[] = "'{$key}' => array(".join(', ',  $schema->__values($index)).")";
-							}
-							$col .= join(', ', $props);
-						}
-						$col .= ")";
-						$cols[] = $col;
-					}
-					$out .= join(",\n", $cols);
-				}
-				$out .= "\n\t);\n";
-			}
-		}
-		$records = join(",\n", $records);
-		$out .= "\tvar \$records = array(array(\n$records\n\t));\n";
-		$out .= "}\n";
-		$path = TESTS . DS . 'fixtures' . DS;
-		if (isset($this->plugin)) {
-			$pluginPath = 'plugins' . DS . Inflector::underscore($this->plugin) . DS;
-			$path = APP . $pluginPath . 'tests' . DS . 'fixtures' . DS;
-		}
-		$filename = Inflector::underscore($model).'_fixture.php';
-		$header = '$Id';
-		$content = "<?php \n/* SVN FILE: $header$ */\n/* ". $model ." Fixture generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
-		$this->out("\nBaking test fixture for $model...");
-		if ($this->createFile($path . $filename, $content)) {
-			return str_replace("\t\t", "\t\t\t", $records);
-		}
-		return false;
+ * @param string $className Name of class to bake fixture for
+ * @param string $useTable Optional table name for fixture to use.
+ * @access public
+ * @return void
+ * @see FixtureTask::bake
+ **/
+	function bakeFixture($className, $useTable = null) {
+		$this->Fixture->connection = $this->connection;
+		$this->Fixture->plugin = $this->plugin;
+		$this->Fixture->bake($className, $useTable);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index 1fc81374b..833f67be6 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The Plugin Task handles creating an empty plugin, ready to be used
  *
@@ -8,25 +7,20 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-if (!class_exists('File')) {
-	uses('file');
-}
+
 /**
  * Task class for creating a plugin
  *
@@ -34,11 +28,13 @@ if (!class_exists('File')) {
  * @subpackage    cake.cake.console.libs.tasks
  */
 class PluginTask extends Shell {
+
 /**
  * Tasks
  *
  */
 	var $tasks = array('Model', 'Controller', 'View');
+
 /**
  * path to CONTROLLERS directory
  *
@@ -46,6 +42,7 @@ class PluginTask extends Shell {
  * @access public
  */
 	var $path = null;
+
 /**
  * initialize
  *
@@ -54,6 +51,7 @@ class PluginTask extends Shell {
 	function initialize() {
 		$this->path = APP . 'plugins' . DS;
 	}
+
 /**
  * Execution method always used for tasks
  *
@@ -62,27 +60,27 @@ class PluginTask extends Shell {
 	function execute() {
 		if (empty($this->params['skel'])) {
 			$this->params['skel'] = '';
-			if (is_dir(CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'console'.DS.'libs'.DS.'templates'.DS.'skel') === true) {
-				$this->params['skel'] = CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'console'.DS.'libs'.DS.'templates'.DS.'skel';
+			if (is_dir(CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS . 'templates' . DS . 'skel') === true) {
+				$this->params['skel'] = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS . 'templates' . DS . 'skel';
 			}
 		}
-
 		$plugin = null;
 
 		if (isset($this->args[0])) {
 			$plugin = Inflector::camelize($this->args[0]);
-			$pluginPath = Inflector::underscore($plugin) . DS;
+			$pluginPath = $this->_pluginPath($plugin);
 			$this->Dispatch->shiftArgs();
-			if (is_dir($this->path . $pluginPath)) {
-				$this->out(sprintf('Plugin: %s', $plugin));
-				$this->out(sprintf('Path: %s', $this->path . $pluginPath));
-				$this->hr();
+			if (is_dir($pluginPath)) {
+				$this->out(sprintf(__('Plugin: %s', true), $plugin));
+				$this->out(sprintf(__('Path: %s', true), $pluginPath));
 			} elseif (isset($this->args[0])) {
-				$this->err(sprintf('%s in path %s not found.', $plugin, $this->path . $pluginPath));
+				$this->err(sprintf(__('%s in path %s not found.', true), $plugin, $pluginPath));
 				$this->_stop();
 			} else {
 				$this->__interactive($plugin);
 			}
+		} else {
+			return $this->__interactive();
 		}
 
 		if (isset($this->args[0])) {
@@ -90,13 +88,13 @@ class PluginTask extends Shell {
 			$this->Dispatch->shiftArgs();
 			if (in_array($task, $this->tasks)) {
 				$this->{$task}->plugin = $plugin;
-				$this->{$task}->path = $this->path . $pluginPath . Inflector::underscore(Inflector::pluralize($task)) . DS;
+				$this->{$task}->path = $pluginPath . Inflector::underscore(Inflector::pluralize($task)) . DS;
 
 				if (!is_dir($this->{$task}->path)) {
 					$this->err(sprintf(__("%s directory could not be found.\nBe sure you have created %s", true), $task, $this->{$task}->path));
 				}
 				$this->{$task}->loadTasks();
-				$this->{$task}->execute();
+				return $this->{$task}->execute();
 			}
 		}
 	}
@@ -125,28 +123,49 @@ class PluginTask extends Shell {
  * @return bool
  */
 	function bake($plugin) {
-
 		$pluginPath = Inflector::underscore($plugin);
 
+		$pathOptions = App::path('plugins');
+		if (count($pathOptions) > 1) {
+			$this->findPath($pathOptions);
+		}
+
 		$this->hr();
-		$this->out("Plugin Name: $plugin");
-		$this->out("Plugin Directory: {$this->path}{$pluginPath}");
+		$this->out(sprintf(__("Plugin Name: %s", true),  $plugin));
+		$this->out(sprintf(__("Plugin Directory: %s", true), $this->path . $pluginPath));
 		$this->hr();
 
+		$looksGood = $this->in(__('Look okay?', true), array('y', 'n', 'q'), 'y');
 
-		$looksGood = $this->in('Look okay?', array('y', 'n', 'q'), 'y');
-
-		if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
+		if (strtolower($looksGood) == 'y') {
 			$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
 
-			$Folder = new Folder($this->path . $pluginPath);
-			$directories = array('models' . DS . 'behaviors', 'controllers' . DS . 'components', 'views' . DS . 'helpers');
+			$Folder =& new Folder($this->path . $pluginPath);
+			$directories = array(
+				'config' . DS . 'sql',
+				'models' . DS . 'behaviors',
+				'controllers' . DS . 'components',
+				'views' . DS . 'helpers',
+				'tests' . DS . 'cases' . DS . 'components',
+				'tests' . DS . 'cases' . DS . 'helpers',
+				'tests' . DS . 'cases' . DS . 'behaviors',
+				'tests' . DS . 'cases' . DS . 'controllers',
+				'tests' . DS . 'cases' . DS . 'models',
+				'tests' . DS . 'groups',
+				'tests' . DS . 'fixtures',
+				'vendors' . DS . 'img',
+				'vendors' . DS . 'js',
+				'vendors' . DS . 'css',
+				'vendors' . DS . 'shells'
+			);
 
 			foreach ($directories as $directory) {
-				$Folder->create($this->path . $pluginPath . DS . $directory);
+				$dirPath = $this->path . $pluginPath . DS . $directory;
+				$Folder->create($dirPath);
+				$File =& new File($dirPath . DS . 'empty', true);
 			}
 
-			if (low($verbose) == 'y' || low($verbose) == 'yes') {
+			if (strtolower($verbose) == 'y') {
 				foreach ($Folder->messages() as $message) {
 					$this->out($message);
 				}
@@ -180,6 +199,28 @@ class PluginTask extends Shell {
 
 		return true;
 	}
+
+/**
+ * find and change $this->path to the user selection
+ *
+ * @return void
+ **/
+	function findPath($pathOptions) {
+		$valid = false;
+		$max = count($pathOptions);
+		while (!$valid) {
+			foreach ($pathOptions as $i => $option) {
+				$this->out($i + 1 .'. ' . $option);
+			}
+			$prompt = __('Choose a plugin path from the paths above.', true);
+			$choice = $this->in($prompt);
+			if (intval($choice) > 0 && intval($choice) <= $max) {
+				$valid = true;
+			}
+		}
+		$this->path = $pathOptions[$choice - 1];
+	}
+
 /**
  * Help
  *
@@ -191,10 +232,18 @@ class PluginTask extends Shell {
 		$this->out("Usage: cake bake plugin <arg1> <arg2>...");
 		$this->hr();
 		$this->out('Commands:');
-		$this->out("\n\tplugin <name>\n\t\tbakes plugin directory structure");
-		$this->out("\n\tplugin <name> model\n\t\tbakes model. Run 'cake bake model help' for more info.");
-		$this->out("\n\tplugin <name> controller\n\t\tbakes controller. Run 'cake bake controller help' for more info.");
-		$this->out("\n\tplugin <name> view\n\t\tbakes view. Run 'cake bake view help' for more info.");
+		$this->out('');
+		$this->out("plugin <name>");
+		$this->out("\tbakes plugin directory structure");
+		$this->out('');
+		$this->out("plugin <name> model");
+		$this->out("\tbakes model. Run 'cake bake model help' for more info.");
+		$this->out('');
+		$this->out("plugin <name> controller");
+		$this->out("\tbakes controller. Run 'cake bake controller help' for more info.");
+		$this->out('');
+		$this->out("plugin <name> view");
+		$this->out("\tbakes view. Run 'cake bake view help' for more info.");
 		$this->out("");
 		$this->_stop();
 	}
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 0502f8429..e14b5af78 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -1,32 +1,25 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The Project Task handles creating the base application
  *
- * Long description for file
  *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake.scripts.bake
+ * @subpackage    cake.cake.console.bake
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-if (!class_exists('File')) {
-	uses('file');
-}
+
 /**
  * Task class for creating new project apps and plugins
  *
@@ -34,6 +27,14 @@ if (!class_exists('File')) {
  * @subpackage    cake.cake.console.libs.tasks
  */
 class ProjectTask extends Shell {
+
+/**
+ * configs path (used in testing).
+ *
+ * @var string
+ **/
+	var $configPath = null;
+
 /**
  * Checks that given project path does not already exist, and
  * finds the app directory in it. Then it calls bake() with that information.
@@ -68,7 +69,7 @@ class ProjectTask extends Shell {
 		if ($project) {
 			$response = false;
 			while ($response == false && is_dir($project) === true && file_exists($project . 'config' . 'core.php')) {
-				$response = $this->in('A project already exists in this location: '.$project.' Overwrite?', array('y','n'), 'n');
+				$response = $this->in('A project already exists in this location: ' . $project . ' Overwrite?', array('y','n'), 'n');
 				if (strtolower($response) === 'n') {
 					$response = $project = false;
 				}
@@ -108,6 +109,7 @@ class ProjectTask extends Shell {
 			return true;
 		}
 	}
+
 /**
  * Looks for a skeleton template of a Cake application,
  * and if not found asks the user for a path. When there is a path
@@ -144,7 +146,7 @@ class ProjectTask extends Shell {
 
 		$looksGood = $this->in('Look okay?', array('y', 'n', 'q'), 'y');
 
-		if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
+		if (strtolower($looksGood) == 'y') {
 			$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
 
 			$Folder = new Folder($skel);
@@ -153,24 +155,25 @@ class ProjectTask extends Shell {
 				$this->out(sprintf(__("Created: %s in %s", true), $app, $path));
 				$this->hr();
 			} else {
-				$this->err(" '".$app."' could not be created properly");
+				$this->err(" '" . $app . "' could not be created properly");
 				return false;
 			}
 
-			if (low($verbose) == 'y' || low($verbose) == 'yes') {
+			if (strtolower($verbose) == 'y') {
 				foreach ($Folder->messages() as $message) {
 					$this->out($message);
 				}
 			}
 
 			return true;
-		} elseif (low($looksGood) == 'q' || low($looksGood) == 'quit') {
+		} elseif (strtolower($looksGood) == 'q') {
 			$this->out('Bake Aborted.');
 		} else {
 			$this->execute(false);
 			return false;
 		}
 	}
+
 /**
  * Writes a file with a default home page to the project.
  *
@@ -181,9 +184,10 @@ class ProjectTask extends Shell {
 	function createHome($dir) {
 		$app = basename($dir);
 		$path = $dir . 'views' . DS . 'pages' . DS;
-		include(CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'console'.DS.'libs'.DS.'templates'.DS.'views'.DS.'home.ctp');
+		include(CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'console'.DS.'libs'.DS.'templates'.DS.'default'.DS.'views'.DS.'home.ctp');
 		return $this->createFile($path.'home.ctp', $output);
 	}
+
 /**
  * Generates and writes 'Security.salt'
  *
@@ -207,6 +211,7 @@ class ProjectTask extends Shell {
 		}
 		return false;
 	}
+
 /**
  * Generates and writes CAKE_CORE_INCLUDE_PATH
  *
@@ -219,7 +224,7 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'index.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '".CAKE_CORE_INCLUDE_PATH."');", $contents);
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}
@@ -230,7 +235,7 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'test.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '".CAKE_CORE_INCLUDE_PATH."');", $contents);
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}
@@ -240,6 +245,7 @@ class ProjectTask extends Shell {
 			return true;
 		}
 	}
+
 /**
  * Enables Configure::read('Routing.admin') in /app/config/core.php
  *
@@ -248,7 +254,8 @@ class ProjectTask extends Shell {
  * @access public
  */
 	function cakeAdmin($name) {
-		$File =& new File(CONFIGS . 'core.php');
+		$path = (empty($this->configPath)) ? CONFIGS : $this->configPath;
+		$File =& new File($path . 'core.php');
 		$contents = $File->read();
 		if (preg_match('%([/\\t\\x20]*Configure::write\(\'Routing.admin\',[\\t\\x20\'a-z]*\\);)%', $contents, $match)) {
 			$result = str_replace($match[0], "\t" . 'Configure::write(\'Routing.admin\', \''.$name.'\');', $contents);
@@ -262,6 +269,34 @@ class ProjectTask extends Shell {
 			return false;
 		}
 	}
+
+/**
+ * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled
+ *
+ * @return string Admin route to use
+ * @access public
+ */
+	function getAdmin() {
+		$admin = '';
+		$cakeAdmin = null;
+		$adminRoute = Configure::read('Routing.admin');
+		if (!empty($adminRoute)) {
+		 	return $adminRoute . '_';
+		}
+		$this->out('You need to enable Configure::write(\'Routing.admin\',\'admin\') in /app/config/core.php to use admin routing.');
+		$this->out('What would you like the admin route to be?');
+		$this->out('Example: www.example.com/admin/controller');
+		while ($admin == '') {
+			$admin = $this->in("What would you like the admin route to be?", null, 'admin');
+		}
+		if ($this->cakeAdmin($admin) !== true) {
+			$this->out('Unable to write to /app/config/core.php.');
+			$this->out('You need to enable Configure::write(\'Routing.admin\',\'admin\') in /app/config/core.php to use admin routing.');
+			$this->_stop();
+		}
+		return $admin . '_';
+	}
+
 /**
  * Help
  *
@@ -273,7 +308,10 @@ class ProjectTask extends Shell {
 		$this->out("Usage: cake bake project <arg1>");
 		$this->hr();
 		$this->out('Commands:');
-		$this->out("\n\tproject <name>\n\t\tbakes app directory structure.\n\t\tif <name> begins with '/' path is absolute.");
+		$this->out('');
+		$this->out("project <name>");
+		$this->out("\tbakes app directory structure.");
+		$this->out("\tif <name> begins with '/' path is absolute.");
 		$this->out("");
 		$this->_stop();
 	}
diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php
new file mode 100644
index 000000000..2fa426ddb
--- /dev/null
+++ b/cake/console/libs/tasks/template.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Template Task can generate templated output Used in other Tasks
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class TemplateTask extends Shell {
+
+/**
+ * variables to add to template scope
+ *
+ * @var array
+ **/
+	var $templateVars = array();
+
+/**
+ * Paths to look for templates on.
+ * Contains a list of $theme => $path
+ *
+ * @var array
+ **/
+	var $templatePaths = array();
+
+/**
+ * Initialize callback.  Setup paths for the template task.
+ *
+ * @access public
+ * @return void
+ **/
+	function initialize() {
+		$this->templatePaths = $this->_findThemes();
+	}
+
+/**
+ * Find the paths to all the installed shell themes in the app.
+ *
+ * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
+ *
+ * @return array Array of bake themes that are installed.
+ **/
+	function _findThemes() {
+		$paths = $this->Dispatch->shellPaths;
+		$themes = array();
+		foreach ($paths as $path) {
+			$Folder =& new Folder($path . 'templates', false);
+			$contents = $Folder->read();
+			$subDirs = $contents[0];
+			foreach ($subDirs as $dir) {
+				if (empty($dir) || $dir == 'skel') {
+					continue;
+				}
+				$templateDir = $path . 'templates' . DS . $dir . DS;
+				$themes[$dir] = $templateDir;
+			}
+		}
+		return $themes;
+	}
+
+/**
+ * Set variable values to the template scope
+ *
+ * @param mixed $one A string or an array of data.
+ * @param mixed $two Value in case $one is a string (which then works as the key).
+ *   Unused if $one is an associative array, otherwise serves as the values to $one's keys.
+ * @return void
+ */
+	function set($one, $two = null) {
+		$data = null;
+		if (is_array($one)) {
+			if (is_array($two)) {
+				$data = array_combine($one, $two);
+			} else {
+				$data = $one;
+			}
+		} else {
+			$data = array($one => $two);
+		}
+
+		if ($data == null) {
+			return false;
+		}
+
+		foreach ($data as $name => $value) {
+			$this->templateVars[$name] = $value;
+		}
+	}
+
+/**
+ * Runs the template
+ *
+ * @param string $directory directory / type of thing you want
+ * @param string $filename template name
+ * @param string $vars Additional vars to set to template scope.
+ * @access public
+ * @return contents of generated code template
+ **/
+	function generate($directory, $filename, $vars = null) {
+		if ($vars !== null) {
+			$this->set($vars);
+		}
+		if (empty($this->templatePaths)) {
+			$this->initialize();
+		}
+		$themePath = $this->getThemePath();
+		$templateFile = $this->_findTemplate($themePath, $directory, $filename);
+		if ($templateFile) {
+			extract($this->templateVars);
+			ob_start();
+			ob_implicit_flush(0);
+			include($templateFile);
+			$content = ob_get_clean();
+			return $content;
+		}
+		return '';
+	}
+
+/**
+ * Find the theme name for the current operation.
+ * If there is only one theme in $templatePaths it will be used.
+ * If there is a -theme param in the cli args, it will be used.
+ * If there is more than one installed theme user interaction will happen
+ *
+ * @return string returns the path to the selected theme.
+ **/
+	function getThemePath() {
+		if (count($this->templatePaths) == 1) {
+			$paths = array_values($this->templatePaths);
+			return $paths[0];
+		}
+		if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
+			return $this->templatePaths[$this->params['theme']];
+		}
+
+		$this->hr();
+		$this->out(__('You have more than one set of templates installed.', true));
+		$this->out(__('Please choose the template set you wish to use:', true));
+		$this->hr();
+
+		$i = 1;
+		$indexedPaths = array();
+		foreach ($this->templatePaths as $key => $path) {
+			$this->out($i . '. ' . $key);
+			$indexedPaths[$i] = $path;
+			$i++;
+		}
+		$index = $this->in(__('Which bake theme would you like to use?', true), range(1, $i - 1), 1);
+		$themeNames = array_keys($this->templatePaths);
+		$this->Dispatch->params['theme'] = $themeNames[$index - 1];
+		return $indexedPaths[$index];
+	}
+
+/**
+ * Find a template inside a directory inside a path.
+ * Will scan all other theme dirs if the template is not found in the first directory.
+ *
+ * @param string $path The initial path to look for the file on. If it is not found fallbacks will be used.
+ * @param string $directory Subdirectory to look for ie. 'views', 'objects'
+ * @param string $filename lower_case_underscored filename you want.
+ * @access public
+ * @return string filename will exit program if template is not found.
+ **/
+	function _findTemplate($path, $directory, $filename) {
+		$themeFile = $path . $directory . DS . $filename . '.ctp';
+		if (file_exists($themeFile)) {
+			return $themeFile;
+		}
+		foreach ($this->templatePaths as $path) {
+			$templatePath = $path . $directory . DS . $filename . '.ctp';
+			if (file_exists($templatePath)) {
+				return $templatePath;
+			}
+		}
+		$this->err(sprintf(__('Could not find template for %s', true), $filename));
+		$this->_stop();
+		return false;
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index 45b853448..9978c66e4 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -1,29 +1,24 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The TestTask handles creating and updating test files.
  *
- * Long description for file
- *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
- * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
+ * @since         CakePHP(tm) v 1.3
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Task class for creating and updating test files.
  *
@@ -31,6 +26,7 @@
  * @subpackage    cake.cake.console.libs.tasks
  */
 class TestTask extends Shell {
+
 /**
  * Name of plugin
  *
@@ -38,6 +34,7 @@ class TestTask extends Shell {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * path to TESTS directory
  *
@@ -45,6 +42,35 @@ class TestTask extends Shell {
  * @access public
  */
 	var $path = TESTS;
+
+/**
+ * Tasks used.
+ *
+ * @var array
+ **/
+	var $tasks = array('Template');
+
+/**
+ * class types that methods can be generated for
+ *
+ * @var array
+ **/
+	var $classTypes =  array('Model', 'Controller', 'Component', 'Behavior', 'Helper');
+
+/**
+ * Internal list of fixtures that have been added so far.
+ *
+ * @var string
+ **/
+	var $_fixtures = array();
+
+/**
+ * Flag for interactive mode
+ *
+ * @var boolean
+ **/
+	var $interactive = false;
+
 /**
  * Execution method always used for tasks
  *
@@ -60,144 +86,332 @@ class TestTask extends Shell {
 		}
 
 		if (count($this->args) > 1) {
-			$class = Inflector::underscore($this->args[0]);
-			if ($this->bake($class, $this->args[1])) {
+			$type = Inflector::underscore($this->args[0]);
+			if ($this->bake($type, $this->args[1])) {
 				$this->out('done');
 			}
 		}
 	}
+
 /**
  * Handles interactive baking
  *
  * @access private
  */
-	function __interactive($class = null) {
+	function __interactive($type = null) {
+		$this->interactive = true;
 		$this->hr();
-		$this->out(sprintf("Bake Tests\nPath: %s", $this->path));
+		$this->out(__('Bake Tests', true));
+		$this->out(sprintf(__("Path: %s", true), $this->path));
 		$this->hr();
 
-		$key = null;
-		$options = array('Behavior', 'Helper', 'Component', 'Model', 'Controller');
-
-		if ($class !== null) {
-			$class = Inflector::camelize($class);
-			if (in_array($class, $options)) {
-				$key = array_search($class);
+		$selection = null;
+		if ($type) {
+			$type = Inflector::camelize($type);
+			if (!in_array($type, $this->classTypes)) {
+				unset($type);
 			}
 		}
-
-		while ($class == null) {
-			$cases = array();
-			$this->hr();
-			$this->out("Select a class:");
-			$this->hr();
-
-			$keys = array();
-			foreach ($options as $key => $option) {
-				$this->out(++$key . '. ' . $option);
-				$keys[] = $key;
-			}
-			$keys[] = 'q';
-
-			$key = $this->in(__("Enter the class to test or (q)uit", true), $keys, 'q');
-
-			if ($key != 'q') {
-				if (isset($options[--$key])) {
-					$class = $options[$key];
-				}
-
-				if ($class) {
-					$name = $this->in(__("Enter the name for the test or (q)uit", true), null, 'q');
-					if ($name !== 'q') {
-						$case = null;
-						while ($case !== 'q') {
-							$case = $this->in(__("Enter a test case or (q)uit", true), null, 'q');
-							if ($case !== 'q') {
-								$cases[] = $case;
-							}
-						}
-						if ($this->bake($class, $name, $cases)) {
-							$this->out(__("Test baked\n", true));
-							$type = null;
-						}
-						$class = null;
-					}
-				}
-			} else {
-				$this->_stop();
-			}
+		if (!$type) {
+			$type = $this->getObjectType();
 		}
+		$className = $this->getClassName($type);
+		return $this->bake($type, $className);
 	}
+
 /**
- * Writes File
+ * Completes final steps for generating data to create test case.
  *
+ * @param string $type Type of object to bake test case for ie. Model, Controller
+ * @param string $className the 'cake name' for the class ie. Posts for the PostsController
  * @access public
  */
-	function bake($class, $name = null, $cases = array()) {
-		if (!$name) {
-			return false;
+	function bake($type, $className) {
+		if ($this->typeCanDetectFixtures($type) && $this->isLoadableClass($type, $className)) {
+			$this->out(__('Bake is detecting possible fixtures..', true));
+			$testSubject =& $this->buildTestSubject($type, $className);
+			$this->generateFixtureList($testSubject);
+		} elseif ($this->interactive) {
+			$this->getUserFixtures();
+		}
+		$fullClassName = $this->getRealClassName($type, $className);
+
+		$methods = array();
+		if (class_exists($fullClassName)) {
+			$methods = $this->getTestableMethods($fullClassName);
+		}
+		$mock = $this->hasMockClass($type, $fullClassName);
+		$construction = $this->generateConstructor($type, $fullClassName);
+
+		$plugin = null;
+		if ($this->plugin) {
+			$plugin = $this->plugin . '.';
 		}
 
-		if (!is_array($cases)) {
-			$cases = array($cases);
-		}
+		$this->Template->set('fixtures', $this->_fixtures);
+		$this->Template->set('plugin', $plugin);
+		$this->Template->set(compact('className', 'methods', 'type', 'fullClassName', 'mock', 'construction'));
+		$out = $this->Template->generate('classes', 'test');
 
-		if (strpos($this->path, $class) === false) {
-			$this->filePath = $this->path . 'cases' . DS . Inflector::tableize($class) . DS;
+		$filename = $this->testCaseFileName($type, $className);
+		$made = $this->createFile($filename, $out);
+		if ($made) {
+			return $out;
 		}
-
-		$class = Inflector::classify($class);
-		$name = Inflector::classify($name);
-
-		$import = $name;
-		if (isset($this->plugin)) {
-			$import = $this->plugin . '.' . $name;
-		}
-		$extras = $this->__extras($class);
-		$out = "App::import('$class', '$import');\n";
-		if ($class == 'Model') {
-			$class = null;
-		}
-		$out .= "class Test{$name} extends {$name}{$class} {\n";
-		$out .= "{$extras}";
-		$out .= "}\n\n";
-		$out .= "class {$name}{$class}Test extends CakeTestCase {\n";
-		$out .= "\n\tfunction startTest() {";
-		$out .= "\n\t\t\$this->{$name} = new Test{$name}();";
-		$out .= "\n\t}\n";
-		$out .= "\n\tfunction test{$name}Instance() {\n";
-		$out .= "\t\t\$this->assertTrue(is_a(\$this->{$name}, '{$name}{$class}'));\n\t}\n";
-		foreach ($cases as $case) {
-			$case = Inflector::classify($case);
-			$out .= "\n\tfunction test{$case}() {\n\n\t}\n";
-		}
-		$out .= "}\n";
-
-		$this->out("Baking unit test for $name...");
-		$this->out($out);
-		$ok = $this->in(__('Is this correct?', true), array('y', 'n'), 'y');
-		if ($ok == 'n') {
-			return false;
-		}
-
-		$header = '$Id';
-		$content = "<?php \n/* SVN FILE: $header$ */\n/* ". $name ." Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
-		return $this->createFile($this->filePath . Inflector::underscore($name) . '.test.php', $content);
+		return false;
 	}
+
 /**
- * Handles the extra stuff needed
+ * Interact with the user and get their chosen type. Can exit the script.
  *
- * @access private
- */
-	function __extras($class) {
-		$extras = null;
-		switch ($class) {
-			case 'Model':
-				$extras = "\n\tvar \$cacheSources = false;";
-				$extras .= "\n\tvar \$useDbConfig = 'test_suite';\n";
-			break;
+ * @return string Users chosen type.
+ **/
+	function getObjectType() {
+		$this->hr();
+		$this->out(__("Select an object type:", true));
+		$this->hr();
+
+		$keys = array();
+		foreach ($this->classTypes as $key => $option) {
+			$this->out(++$key . '. ' . $option);
+			$keys[] = $key;
 		}
-		return $extras;
+		$keys[] = 'q';
+		$selection = $this->in(__("Enter the type of object to bake a test for or (q)uit", true), $keys, 'q');
+		if ($selection == 'q') {
+			return $this->_stop();
+		}
+		return $this->classTypes[$selection - 1];
+	}
+
+/**
+ * Get the user chosen Class name for the chosen type
+ *
+ * @param string $objectType Type of object to list classes for i.e. Model, Controller.
+ * @return string Class name the user chose.
+ **/
+	function getClassName($objectType) {
+		$options = Configure::listObjects(strtolower($objectType));
+		$this->out(sprintf(__('Choose a %s class', true), $objectType));
+		$keys = array();
+		foreach ($options as $key => $option) {
+			$this->out(++$key . '. ' . $option);
+			$keys[] = $key;
+		}
+		$selection = $this->in(__('Choose an existing class, or enter the name of a class that does not exist', true));
+		if (isset($options[$selection - 1])) {
+			return $options[$selection - 1];
+		}
+		return $selection;
+	}
+
+/**
+ * Checks whether the chosen type can find its own fixtures.
+ * Currently only model, and controller are supported
+ *
+ * @return boolean
+ **/
+	function typeCanDetectFixtures($type) {
+		$type = strtolower($type);
+		return ($type == 'controller' || $type == 'model');
+	}
+
+/**
+ * Check if a class with the given type is loaded or can be loaded.
+ *
+ * @return boolean
+ **/
+	function isLoadableClass($type, $class) {
+		return App::import($type, $class);
+	}
+
+/**
+ * Construct an instance of the class to be tested.
+ * So that fixtures can be detected
+ *
+ * @return object
+ **/
+	function &buildTestSubject($type, $class) {
+		ClassRegistry::flush();
+		App::import($type, $class);
+		$class = $this->getRealClassName($type, $class);
+		if (strtolower($type) == 'model') {
+			$instance =& ClassRegistry::init($class);
+		} else {
+			$instance =& new $class();
+		}
+		return $instance;
+	}
+
+/**
+ * Gets the real class name from the cake short form.
+ *
+ * @return string Real classname
+ **/
+	function getRealClassName($type, $class) {
+		if (strtolower($type) == 'model') {
+			return $class;
+		}
+		return $class . $type;
+	}
+
+/**
+ * Get methods declared in the class given.
+ * No parent methods will be returned
+ *
+ * @param string $className Name of class to look at.
+ * @return array Array of method names.
+ **/
+	function getTestableMethods($className) {
+		$classMethods = get_class_methods($className);
+		$parentMethods = get_class_methods(get_parent_class($className));
+		$thisMethods = array_diff($classMethods, $parentMethods);
+		$out = array();
+		foreach ($thisMethods as $method) {
+			if (substr($method, 0, 1) != '_') {
+				$out[] = $method;
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate the list of fixtures that will be required to run this test based on
+ * loaded models.
+ *
+ * @param object The object you want to generate fixtures for.
+ * @return array Array of fixtures to be included in the test.
+ **/
+	function generateFixtureList(&$subject) {
+		$this->_fixtures = array();
+		if (is_a($subject, 'Model')) {
+			$this->_processModel($subject);
+		} elseif (is_a($subject, 'Controller')) {
+			$this->_processController($subject);
+		}
+		return array_values($this->_fixtures);
+	}
+
+/**
+ * Process a model recursively and pull out all the
+ * model names converting them to fixture names.
+ *
+ * @return void
+ * @access protected
+ **/
+	function _processModel(&$subject) {
+		$this->_addFixture($subject->name);
+		$associated = $subject->getAssociated();
+		foreach ($associated as $alias => $type) {
+			$className = $subject->{$alias}->name;
+			if (!isset($this->_fixtures[$className])) {
+				$this->_processModel($subject->{$alias});
+			}
+			if ($type == 'hasAndBelongsToMany') {
+				$joinModel = Inflector::classify($subject->hasAndBelongsToMany[$alias]['joinTable']);
+				if (!isset($this->_fixtures[$joinModel])) {
+					$this->_processModel($subject->{$joinModel});
+				}
+			}
+		}
+	}
+
+/**
+ * Process all the models attached to a controller
+ * and generate a fixture list.
+ *
+ * @return void
+ * @access protected
+ **/
+	function _processController(&$subject) {
+		$subject->constructClasses();
+		$models = array(Inflector::classify($subject->name));
+		if (!empty($subject->uses)) {
+			$models = $subject->uses;
+		}
+		foreach ($models as $model) {
+			$this->_processModel($subject->{$model});
+		}
+	}
+
+/**
+ * Add classname to the fixture list.
+ * Sets the app. or plugin.plugin_name. prefix.
+ *
+ * @return void
+ * @access protected
+ **/
+	function _addFixture($name) {
+		$parent = get_parent_class($name);
+		$prefix = 'app.';
+		if (strtolower($parent) != 'appmodel' && strtolower(substr($parent, -8)) == 'appmodel') {
+			$pluginName = substr($parent, 0, strlen($parent) -8);
+			$prefix = 'plugin.' . Inflector::underscore($pluginName) . '.';
+		}
+		$fixture = $prefix . Inflector::underscore($name);
+		$this->_fixtures[$name] = $fixture;
+	}
+
+/**
+ * Interact with the user to get additional fixtures they want to use.
+ *
+ * @return void
+ **/
+	function getUserFixtures() {
+		$proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?', true), array('y','n'), 'n');
+		$fixtures = array();
+		if (strtolower($proceed) == 'y') {
+			$fixtureList = $this->in(__("Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'", true));
+			$fixtureListTrimmed = str_replace(' ', '', $fixtureList);
+			$fixtures = explode(',', $fixtureListTrimmed);
+		}
+		$this->_fixtures = array_merge($this->_fixtures, $fixtures);
+		return $fixtures;
+	}
+
+/**
+ * Is a mock class required for this type of test?
+ * Controllers require a mock class.
+ *
+ * @return boolean
+ **/
+	function hasMockClass($type) {
+		$type = strtolower($type);
+		return $type == 'controller';
+	}
+
+/**
+ * Generate a constructor code snippet for the type and classname
+ *
+ * @return string Constructor snippet for the thing you are building.
+ **/
+	function generateConstructor($type, $fullClassName) {
+		$type = strtolower($type);
+		if ($type == 'model') {
+			return "ClassRegistry::init('$fullClassName');\n";
+		}
+		if ($type == 'controller') {
+			return "new Test$fullClassName();\n\t\t\$this->{$fullClassName}->constructClasses();\n";
+		}
+		return "new $fullClassName()\n";
+	}
+
+/**
+ * make the filename for the test case. resolve the suffixes for controllers
+ * and get the plugin path if needed.
+ *
+ * @return string filename the test should be created on
+ **/
+	function testCaseFileName($type, $className) {
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'tests' . DS;
+		}
+		$path .= 'cases' . DS . Inflector::tableize($type) . DS;
+		if (strtolower($type) == 'controller') {
+			$className = $this->getRealClassName($type, $className);
+		}
+		return $path . Inflector::underscore($className) . '.test.php';
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 4dfdc5089..18e86b995 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * The View Tasks handles creating and updating view files.
  *
@@ -8,23 +7,21 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Controller');
+App::import('Controller', 'Controller', false);
+
 /**
  * Task class for creating and updating view files.
  *
@@ -32,6 +29,7 @@ App::import('Core', 'Controller');
  * @subpackage    cake.cake.console.libs.tasks
  */
 class ViewTask extends Shell {
+
 /**
  * Name of plugin
  *
@@ -39,13 +37,15 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * Tasks to be loaded by this Task
  *
  * @var array
  * @access public
  */
-	var $tasks = array('Project', 'Controller');
+	var $tasks = array('Project', 'Controller', 'DbConfig', 'Template');
+
 /**
  * path to VIEWS directory
  *
@@ -53,6 +53,7 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $path = VIEWS;
+
 /**
  * Name of the controller being used
  *
@@ -60,6 +61,7 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $controllerName = null;
+
 /**
  * Path to controller to put views
  *
@@ -67,6 +69,7 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $controllerPath = null;
+
 /**
  * The template file to use
  *
@@ -74,6 +77,7 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $template = null;
+
 /**
  * Actions to use for scaffolding
  *
@@ -81,6 +85,7 @@ class ViewTask extends Shell {
  * @access public
  */
 	var $scaffoldActions = array('index', 'view', 'add', 'edit');
+
 /**
  * Override initialize
  *
@@ -88,6 +93,7 @@ class ViewTask extends Shell {
  */
 	function initialize() {
 	}
+
 /**
  * Execution method always used for tasks
  *
@@ -99,6 +105,9 @@ class ViewTask extends Shell {
 		}
 
 		if (isset($this->args[0])) {
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
 			$controller = $action = $alias = null;
 			$this->controllerName = Inflector::camelize($this->args[0]);
 			$this->controllerPath = Inflector::underscore($this->controllerName);
@@ -115,37 +124,92 @@ class ViewTask extends Shell {
 				$action = $this->template;
 			}
 
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
+
 			if (in_array($action, $this->scaffoldActions)) {
 				$this->bake($action, true);
 			} elseif ($action) {
 				$this->bake($action, true);
 			} else {
 				$vars = $this->__loadController();
-				if ($vars) {
-
-					$methods =  array_diff(
-						array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
-						array_map('strtolower', get_class_methods('appcontroller'))
-					);
-					if (empty($methods)) {
-						$methods = $this->scaffoldActions;
-					}
-					$adminDelete = null;
-
-					$adminRoute = Configure::read('Routing.admin');
-					if (!empty($adminRoute)) {
-						$adminDelete = $adminRoute.'_delete';
-					}
-					foreach ($methods as $method) {
-						if ($method{0} != '_' && !in_array($method, array('delete', $adminDelete))) {
-							$content = $this->getContent($method, $vars);
-							$this->bake($method, $content);
+				$methods = $this->_methodsToBake();
+				$methods =  array_diff(
+					array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
+					array_map('strtolower', get_class_methods('appcontroller'))
+				);
+				if (empty($methods)) {
+					$methods = $this->scaffoldActions;
+				}
+				$adminRoute = Configure::read('Routing.admin');
+				if ($adminRoute && isset($this->params['admin'])) {
+					foreach ($methods as $i => $method) {
+						if (strpos($method, $adminRoute . '_') === false) {
+							unset($methods[$i]);
 						}
 					}
 				}
+				$adminDelete = null;
+				if (!empty($adminRoute)) {
+					$adminDelete = $adminRoute . '_delete';
+				}
+				foreach ($methods as $method) {
+					if ($method{0} != '_' && !in_array($method, array('delete', $adminDelete))) {
+						$content = $this->getContent($method, $vars);
+						$this->bake($method, $content);
+					}
+				}
 			}
 		}
 	}
+
+/**
+ * Get a list of actions that can / should have views baked for them.
+ *
+ * @return array Array of action names that should be baked
+ **/
+	function _methodsToBake() {
+		$methods =  array_diff(
+			array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
+			array_map('strtolower', get_class_methods('appcontroller'))
+		);
+		if (empty($methods)) {
+			$methods = $this->scaffoldActions;
+		}
+		$adminRoute = Configure::read('Routing.admin');
+		foreach ($methods as $i => $method) {
+			if ($method == 'delete' || $method = $adminRoute . '_delete' || $method{0} == '_') {
+				unset($methods[$i]);
+			}
+			if ($adminRoute && isset($this->params['admin']) && strpos($method, $adminRoute . '_') === false) {
+				unset($methods[$i]);
+			}
+		}
+		return $methods;
+	}
+
+/**
+ * Bake All views for All controllers.
+ *
+ * @return void
+ **/
+	function all() {
+		$actions = $this->scaffoldActions;
+		$this->Controller->interactive = false;
+		$tables = $this->Controller->listAll($this->connection, false);
+		$this->interactive = false;
+		foreach ($tables as $table) {
+			$model = $this->_modelName($table);
+			$this->controllerName = $this->_controllerName($model);
+			$this->controllerPath = Inflector::underscore($this->controllerName);
+			if (App::import('Model', $model)) {
+				$vars = $this->__loadController();
+				$this->bakeActions($actions, $vars);
+			}
+		}
+	}
+
 /**
  * Handles interactive baking
  *
@@ -155,72 +219,51 @@ class ViewTask extends Shell {
 		$this->hr();
 		$this->out(sprintf("Bake View\nPath: %s", $this->path));
 		$this->hr();
-		$wannaDoAdmin = 'n';
-		$wannaDoScaffold = 'y';
-		$this->interactive = false;
 
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+
+		$this->Controller->connection = $this->connection;
 		$this->controllerName = $this->Controller->getName();
 
-		$this->controllerPath = low(Inflector::underscore($this->controllerName));
+		$this->controllerPath = strtolower(Inflector::underscore($this->controllerName));
 
-		$interactive = $this->in("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite {$this->controllerName} views if it exist.", array('y','n'), 'y');
+		$prompt = sprintf(__("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", true),  $this->controllerName);
+		$interactive = $this->in($prompt, array('y', 'n'), 'n');
 
-		if (low($interactive) == 'y' || low($interactive) == 'yes') {
-			$this->interactive = true;
-			$wannaDoScaffold = $this->in("Would you like to create some scaffolded views (index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller and model classes (including associated models).", array('y','n'), 'n');
+		if (strtolower($interactive) == 'n') {
+			$this->interactive = false;
 		}
 
-		if (low($wannaDoScaffold) == 'y' || low($wannaDoScaffold) == 'yes') {
-			$wannaDoAdmin = $this->in("Would you like to create the views for admin routing?", array('y','n'), 'y');
-		}
-		$admin = false;
+		$prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).", true);
+		$wannaDoScaffold = $this->in($prompt, array('y','n'), 'y');
 
-		if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) {
-			$admin = $this->getAdmin();
-		}
+		$wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?", true), array('y','n'), 'n');
 
-		if (low($wannaDoScaffold) == 'y' || low($wannaDoScaffold) == 'yes') {
-			$actions = $this->scaffoldActions;
-			if ($admin) {
-				foreach ($actions as $action) {
-					$actions[] = $admin . $action;
-				}
-			}
+		if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
 			$vars = $this->__loadController();
-			if ($vars) {
-				foreach ($actions as $action) {
-					$content = $this->getContent($action, $vars);
-					$this->bake($action, $content);
+			if (strtolower($wannaDoScaffold) == 'y') {
+				$actions = $this->scaffoldActions;
+				$this->bakeActions($actions, $vars);
+			}
+			if (strtolower($wannaDoAdmin) == 'y') {
+				$admin = $this->Project->getAdmin();
+				$regularActions = $this->scaffoldActions;
+				$adminActions = array();
+				foreach ($regularActions as $action) {
+					$adminActions[] = $admin . $action;
 				}
+				$this->bakeActions($adminActions, $vars);
 			}
 			$this->hr();
 			$this->out('');
-			$this->out('View Scaffolding Complete.'."\n");
+			$this->out(__("View Scaffolding Complete.\n", true));
 		} else {
-			$action = '';
-			while ($action == '') {
-				$action = $this->in('Action Name? (use camelCased function name)');
-				if ($action == '') {
-					$this->out('The action name you supplied was empty. Please try again.');
-				}
-			}
-			$this->out('');
-			$this->hr();
-			$this->out('The following view will be created:');
-			$this->hr();
-			$this->out("Controller Name: {$this->controllerName}");
-			$this->out("Action Name:	 {$action}");
-			$this->out("Path:			 ".$this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp");
-			$this->hr();
-			$looksGood = $this->in('Look okay?', array('y','n'), 'y');
-			if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
-				$this->bake($action);
-				$this->_stop();
-			} else {
-				$this->out('Bake Aborted.');
-			}
+			$this->customAction();
 		}
 	}
+
 /**
  * Loads Controller and sets variables for the template
  * Available template variables
@@ -247,7 +290,7 @@ class ViewTask extends Shell {
 			$this->_stop();
 		}
 		$controllerClassName = $this->controllerName . 'Controller';
-		$controllerObj = & new $controllerClassName();
+		$controllerObj =& new $controllerClassName();
 		$controllerObj->constructClasses();
 		$modelClass = $controllerObj->modelClass;
 		$modelObj =& ClassRegistry::getObject($controllerObj->modelKey);
@@ -277,6 +320,50 @@ class ViewTask extends Shell {
 		return compact('modelClass', 'schema', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
 				'singularHumanName', 'pluralHumanName', 'fields','associations');
 	}
+
+/**
+ * Bake a view file for each of the supplied actions
+ *
+ * @param array $actions Array of actions to make files for.
+ * @return void
+ **/
+	function bakeActions($actions, $vars) {
+		foreach ($actions as $action) {
+			$content = $this->getContent($action, $vars);
+			$this->bake($action, $content);
+		}
+	}
+
+/**
+ * handle creation of baking a custom action view file
+ *
+ * @return void
+ **/
+	function customAction() {
+		$action = '';
+		while ($action == '') {
+			$action = $this->in(__('Action Name? (use lowercase_underscored function name)', true));
+			if ($action == '') {
+				$this->out(__('The action name you supplied was empty. Please try again.', true));
+			}
+		}
+		$this->out('');
+		$this->hr();
+		$this->out(__('The following view will be created:', true));
+		$this->hr();
+		$this->out(sprintf(__('Controller Name: %s', true), $this->controllerName));
+		$this->out(sprintf(__('Action Name:     %s', true), $action));
+		$this->out(sprintf(__('Path:            %s', true), $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp"));
+		$this->hr();
+		$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
+		if (strtolower($looksGood) == 'y') {
+			$this->bake($action);
+			$this->_stop();
+		} else {
+			$this->out(__('Bake Aborted.', true));
+		}
+	}
+
 /**
  * Assembles and writes bakes the view file.
  *
@@ -287,21 +374,16 @@ class ViewTask extends Shell {
  */
 	function bake($action, $content = '') {
 		if ($content === true) {
-			$content = $this->getContent();
+			$content = $this->getContent($action);
 		}
-		$filename = $this->path . $this->controllerPath . DS . Inflector::underscore($action) . '.ctp';
-		$Folder =& new Folder($this->path . $this->controllerPath, true);
-		$errors = $Folder->errors();
-		if (empty($errors)) {
-			$path = $Folder->slashTerm($Folder->pwd());
-			return $this->createFile($filename, $content);
-		} else {
-			foreach ($errors as $error) {
-				$this->err($error);
-			}
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'views' . DS;
 		}
-		return false;
+		$filename = $path . $this->controllerPath . DS . Inflector::underscore($action) . '.ctp';
+		return $this->createFile($filename, $content);
 	}
+
 /**
  * Builds content from template and variables
  *
@@ -318,35 +400,29 @@ class ViewTask extends Shell {
 
 		$adminRoute = Configure::read('Routing.admin');
 		if (!empty($adminRoute) && strpos($template, $adminRoute) !== false) {
-			$template = str_replace($adminRoute.'_', '', $template);
+			$template = str_replace($adminRoute . '_', '', $template);
 		}
 		if (in_array($template, array('add', 'edit'))) {
 			$action = $template;
 			$template = 'form';
 		}
-		$loaded = false;
-		foreach ($this->Dispatch->shellPaths as $path) {
-			$templatePath = $path . 'templates' . DS . 'views' . DS .Inflector::underscore($template).'.ctp';
-			if (file_exists($templatePath) && is_file($templatePath)) {
-				$loaded = true;
-				break;
-			}
-		}
 		if (!$vars) {
 			$vars = $this->__loadController();
 		}
-		if ($loaded) {
-			extract($vars);
-			ob_start();
-			ob_implicit_flush(0);
-			include($templatePath);
-			$content = ob_get_clean();
-			return $content;
+
+		$this->Template->set('action', $action);
+		$this->Template->set('plugin', $this->plugin);
+		$this->Template->set($vars);
+		$output = $this->Template->generate('views', $template);
+
+		if (!empty($output)) {
+			return $output;
 		}
 		$this->hr();
 		$this->err(sprintf(__('Template for %s could not be found', true), $template));
 		return false;
 	}
+
 /**
  * Displays help contents
  *
@@ -357,12 +433,28 @@ class ViewTask extends Shell {
 		$this->out("Usage: cake bake view <arg1> <arg2>...");
 		$this->hr();
 		$this->out('Commands:');
-		$this->out("\n\tview <controller>\n\t\twill read the given controller for methods\n\t\tand bake corresponding views.\n\t\tIf var scaffold is found it will bake the scaffolded actions\n\t\t(index,view,add,edit)");
-		$this->out("\n\tview <controller> <action>\n\t\twill bake a template. core templates: (index, add, edit, view)");
-		$this->out("\n\tview <controller> <template> <alias>\n\t\twill use the template specified but name the file based on the alias");
-		$this->out("");
+		$this->out('');
+		$this->out("view <controller>");
+		$this->out("\tWill read the given controller for methods");
+		$this->out("\tand bake corresponding views.");
+		$this->out("\tUsing the -admin flag will only bake views for actions");
+		$this->out("\tthat begin with Routing.admin.");
+		$this->out("\tIf var scaffold is found it will bake the CRUD actions");
+		$this->out("\t(index,view,add,edit)");
+		$this->out('');
+		$this->out("view <controller> <action>");
+		$this->out("\tWill bake a template. core templates: (index, add, edit, view)");
+		$this->out('');
+		$this->out("view <controller> <template> <alias>");
+		$this->out("\tWill use the template specified");
+		$this->out("\tbut name the file based on the alias");
+		$this->out('');
+		$this->out("view all");
+		$this->out("\tBake all CRUD action views for all controllers.");
+		$this->out("\tRequires that models and controllers exist.");
 		$this->_stop();
 	}
+
 /**
  * Returns associations for controllers models.
  *
diff --git a/cake/console/libs/templates/default/actions/controller_actions.ctp b/cake/console/libs/templates/default/actions/controller_actions.ctp
new file mode 100644
index 000000000..30b1e1459
--- /dev/null
+++ b/cake/console/libs/templates/default/actions/controller_actions.ctp
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Bake Template for Controller action generation.
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.console.libs.template.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+
+	function <?php echo $admin ?>index() {
+		$this-><?php echo $currentModelName ?>->recursive = 0;
+		$this->set('<?php echo $pluralName ?>', $this->paginate());
+	}
+
+	function <?php echo $admin ?>view($id = null) {
+		if (!$id) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid <?php echo $singularHumanName ?>', true));
+			$this->redirect(array('action' => 'index'));
+<?php else: ?>
+			$this->flash(__('Invalid <?php echo $singularHumanName; ?>', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+		$this->set('<?php echo $singularName; ?>', $this-><?php echo $currentModelName; ?>->read(null, $id));
+	}
+
+<?php $compact = array(); ?>
+	function <?php echo $admin ?>add() {
+		if (!empty($this->data)) {
+			$this-><?php echo $currentModelName; ?>->create();
+			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo $singularHumanName; ?> has been saved', true));
+				$this->redirect(array('action' => 'index'));
+<?php else: ?>
+				$this->flash(__('<?php echo $currentModelName; ?> saved.', true), array('action' => 'index'));
+<?php endif; ?>
+			} else {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo $singularHumanName; ?> could not be saved. Please, try again.', true));
+<?php endif; ?>
+			}
+		}
+<?php
+	foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):
+		foreach ($modelObj->{$assoc} as $associationName => $relation):
+			if (!empty($associationName)):
+				$otherModelName = $this->_modelName($associationName);
+				$otherPluralName = $this->_pluralName($associationName);
+				echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
+				$compact[] = "'{$otherPluralName}'";
+			endif;
+		endforeach;
+	endforeach;
+	if (!empty($compact)):
+		echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
+	endif;
+?>
+	}
+
+<?php $compact = array(); ?>
+	function <?php echo $admin; ?>edit($id = null) {
+		if (!$id && empty($this->data)) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid <?php echo $singularHumanName; ?>', true));
+			$this->redirect(array('action' => 'index'));
+<?php else: ?>
+			$this->flash(__('Invalid <?php echo $singularHumanName; ?>', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+		if (!empty($this->data)) {
+			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo $singularHumanName; ?> has been saved', true));
+				$this->redirect(array('action' => 'index'));
+<?php else: ?>
+				$this->flash(__('The <?php echo $singularHumanName; ?> has been saved.', true), array('action' => 'index'));
+<?php endif; ?>
+			} else {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo $singularHumanName; ?> could not be saved. Please, try again.', true));
+<?php endif; ?>
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this-><?php echo $currentModelName; ?>->read(null, $id);
+		}
+<?php
+		foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):
+			foreach ($modelObj->{$assoc} as $associationName => $relation):
+				if (!empty($associationName)):
+					$otherModelName = $this->_modelName($associationName);
+					$otherPluralName = $this->_pluralName($associationName);
+					echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
+					$compact[] = "'{$otherPluralName}'";
+				endif;
+			endforeach;
+		endforeach;
+		if (!empty($compact)):
+			echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
+		endif;
+	?>
+	}
+
+	function <?php echo $admin; ?>delete($id = null) {
+		if (!$id) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid id for <?php echo $singularHumanName; ?>', true));
+			$this->redirect(array('action'=>'index'));
+<?php else: ?>
+			$this->flash(__('Invalid <?php echo $singularHumanName; ?>', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+		if ($this-><?php echo $currentModelName; ?>->del($id)) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('<?php echo $singularHumanName; ?> deleted', true));
+			$this->redirect(array('action'=>'index'));
+<?php else: ?>
+			$this->flash(__('<?php echo $singularHumanName; ?> deleted', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+<?php if ($wannaUseSession): ?>
+		$this->Session->setFlash(__('<?php echo $singularHumanName; ?> was not deleted', true));
+<?php else: ?>
+		$this->flash(__('<?php echo $singularHumanName; ?> was not deleted', true), array('action' => 'index'));
+<?php endif; ?>
+		$this->redirect(array('action' => 'index'));
+	}
\ No newline at end of file
diff --git a/cake/console/libs/templates/default/classes/controller.ctp b/cake/console/libs/templates/default/classes/controller.ctp
new file mode 100644
index 000000000..539210d2e
--- /dev/null
+++ b/cake/console/libs/templates/default/classes/controller.ctp
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Controller bake template file
+ *
+ * Allows templating of Controllers generated from bake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+echo "<?php\n";
+?>
+class <?php echo $controllerName; ?>Controller extends <?php echo $plugin; ?>AppController {
+
+	var $name = '<?php echo $controllerName; ?>';
+<?php if ($isScaffold): ?>
+	var $scaffold;
+<?php else: ?>
+<?php
+
+echo "\tvar \$helpers = array('Html', 'Form'";
+if (count($helpers)):
+	foreach ($helpers as $help):
+		echo ", '" . Inflector::camelize($help) . "'";
+	endforeach;
+endif;
+echo ");\n";
+
+if (count($components)):
+	echo "\tvar \$components = array(";
+	for ($i = 0, $len = count($components); $i < $len; $i++):
+		if ($i != $len - 1):
+			echo "'" . Inflector::camelize($components[$i]) . "', ";
+		else:
+			echo "'" . Inflector::camelize($components[$i]) . "'";
+		endif;
+	endfor;
+	echo ");\n";
+endif;
+
+echo $actions;
+
+endif; ?>
+}
+<?php echo "?>"; ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/default/classes/fixture.ctp b/cake/console/libs/templates/default/classes/fixture.ctp
new file mode 100644
index 000000000..aa8c0678c
--- /dev/null
+++ b/cake/console/libs/templates/default/classes/fixture.ctp
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Fixture Template file
+ *
+ * Fixture Template used when baking fixtures with bake
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo '<?php' . "\n"; ?>
+/* <?php echo $model; ?> Fixture generated on: <?php echo  date('Y-m-d H:m:s') . " : ". time(); ?> */
+class <?php echo $model; ?>Fixture extends CakeTestFixture {
+	var $name = '<?php echo $model; ?>';
+<?php if ($table): ?>
+	var $table = '<?php echo $table; ?>';
+<?php endif; ?>
+<?php if ($import): ?>
+	var $import = <?php echo $import; ?>;
+<?php endif; ?>
+
+<?php if ($schema): ?>
+	var $fields = <?php echo $schema; ?>;
+<?php endif;?>
+
+<?php if ($records): ?>
+	var $records = <?php echo $records; ?>;
+<?php endif;?>
+}
+<?php echo '?>'; ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/default/classes/model.ctp b/cake/console/libs/templates/default/classes/model.ctp
new file mode 100644
index 000000000..7ca0c8c80
--- /dev/null
+++ b/cake/console/libs/templates/default/classes/model.ctp
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Model template file.
+ *
+ * Used by bake to create new Model files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.console.libs.templates.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+echo "<?php\n"; ?>
+class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
+	var $name = '<?php echo $name; ?>';
+<?php if ($useDbConfig != 'default'): ?>
+	var $useDbConfig = '<?php echo $useDbConfig; ?>';
+<?php endif;?>
+<?php if ($useTable && $useTable !== Inflector::tableize($name)):
+	$table = "'$useTable'";
+	echo "\tvar \$useTable = $table;\n";
+endif;
+if ($primaryKey !== 'id'): ?>
+	var $primaryKey = '<?php echo $primaryKey; ?>';
+<?php endif;
+if ($displayField): ?>
+	var $displayField = '<?php echo $displayField; ?>';
+<?php endif;
+
+if (!empty($validate)):
+	echo "\tvar \$validate = array(\n";
+	foreach ($validate as $field => $validations):
+		echo "\t\t'$field' => array(\n";
+		foreach ($validations as $key => $validator):
+			echo "\t\t\t'$key' => array('rule' => array('$validator')),\n";
+		endforeach;
+		echo "\t\t),\n";
+	endforeach;
+	echo "\t);\n";
+endif;
+
+?>
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+<?php
+
+foreach (array('hasOne', 'belongsTo') as $assocType):
+	if (!empty($associations[$assocType])):
+		$typeCount = count($associations[$assocType]);
+		echo "\n\tvar \$$assocType = array(";
+		foreach ($associations[$assocType] as $i => $relation):
+			$out = "\n\t\t'{$relation['alias']}' => array(\n";
+			$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+			$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+			$out .= "\t\t\t'conditions' => '',\n";
+			$out .= "\t\t\t'fields' => '',\n";
+			$out .= "\t\t\t'order' => ''\n";
+			$out .= "\t\t)";
+			if ($i + 1 < $typeCount) {
+				$out .= ",";
+			}
+			echo $out;
+		endforeach;
+		echo "\n\t);\n";
+	endif;
+endforeach;
+
+if (!empty($associations['hasMany'])):
+	$belongsToCount = count($associations['hasMany']);
+	echo "\n\tvar \$hasMany = array(";
+	foreach ($associations['hasMany'] as $i => $relation):
+		$out = "\n\t\t'{$relation['alias']}' => array(\n";
+		$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+		$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+		$out .= "\t\t\t'dependent' => false,\n";
+		$out .= "\t\t\t'conditions' => '',\n";
+		$out .= "\t\t\t'fields' => '',\n";
+		$out .= "\t\t\t'order' => '',\n";
+		$out .= "\t\t\t'limit' => '',\n";
+		$out .= "\t\t\t'offset' => '',\n";
+		$out .= "\t\t\t'exclusive' => '',\n";
+		$out .= "\t\t\t'finderQuery' => '',\n";
+		$out .= "\t\t\t'counterQuery' => ''\n";
+		$out .= "\t\t)";
+		if ($i + 1 < $belongsToCount) {
+			$out .= ",";
+		}
+		echo $out;
+	endforeach;
+	echo "\n\t);\n\n";
+endif;
+
+if (!empty($associations['hasAndBelongsToMany'])):
+	$habtmCount = count($associations['hasAndBelongsToMany']);
+	echo "\n\tvar \$hasAndBelongsToMany = array(";
+	foreach ($associations['hasAndBelongsToMany'] as $i => $relation):
+		$out = "\n\t\t'{$relation['alias']}' => array(\n";
+		$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+		$out .= "\t\t\t'joinTable' => '{$relation['joinTable']}',\n";
+		$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+		$out .= "\t\t\t'associationForeignKey' => '{$relation['associationForeignKey']}',\n";
+		$out .= "\t\t\t'unique' => true,\n";
+		$out .= "\t\t\t'conditions' => '',\n";
+		$out .= "\t\t\t'fields' => '',\n";
+		$out .= "\t\t\t'order' => '',\n";
+		$out .= "\t\t\t'limit' => '',\n";
+		$out .= "\t\t\t'offset' => '',\n";
+		$out .= "\t\t\t'finderQuery' => '',\n";
+		$out .= "\t\t\t'deleteQuery' => '',\n";
+		$out .= "\t\t\t'insertQuery' => ''\n";
+		$out .= "\t\t)";
+		if ($i + 1 < $habtmCount) {
+			$out .= ",";
+		}
+		echo $out;
+	endforeach;
+	echo "\n\t);\n\n";
+endif;
+?>
+}
+<?php echo '?>'; ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/default/classes/test.ctp b/cake/console/libs/templates/default/classes/test.ctp
new file mode 100644
index 000000000..f84220c30
--- /dev/null
+++ b/cake/console/libs/templates/default/classes/test.ctp
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Test Case bake template
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.console.libs.templates.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+echo "<?php\n";
+echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n";
+?>
+App::import('<?php echo $type; ?>', '<?php echo $plugin . $className;?>');
+
+<?php if ($mock and strtolower($type) == 'controller'): ?>
+class Test<?php echo $fullClassName; ?> extends <?php echo $fullClassName; ?> {
+	var $autoRender = false;
+
+	function redirect($url, $status = null, $exit = true) {
+		$this->redirectUrl = $url;
+	}
+}
+
+<?php endif; ?>
+class <?php echo $fullClassName; ?>TestCase extends CakeTestCase {
+<?php if (!empty($fixtures)): ?>
+	var $fixtures = array('<?php echo join("', '", $fixtures); ?>');
+
+<?php endif; ?>
+	function startTest() {
+		$this-><?php echo $className . ' =& ' . $construction; ?>
+	}
+
+	function endTest() {
+		unset($this-><?php echo $className;?>);
+		ClassRegistry::flush();
+	}
+
+<?php foreach ($methods as $method): ?>
+	function test<?php echo Inflector::classify($method); ?>() {
+
+	}
+
+<?php endforeach;?>
+}
+<?php echo '?>'; ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/default/views/form.ctp
similarity index 81%
rename from cake/console/libs/templates/views/form.ctp
rename to cake/console/libs/templates/default/views/form.ctp
index 78ebdda7b..264221c3d 100644
--- a/cake/console/libs/templates/views/form.ctp
+++ b/cake/console/libs/templates/default/views/form.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,7 +26,7 @@
 <div class="<?php echo $pluralVar;?> form">
 <?php echo "<?php echo \$form->create('{$modelClass}');?>\n";?>
 	<fieldset>
- 		<legend><?php echo "<?php __('".Inflector::humanize($action)." {$singularHumanName}');?>";?></legend>
+ 		<legend><?php echo "<?php __('" . Inflector::humanize($action) . " {$singularHumanName}');?>";?></legend>
 <?php
 		echo "\t<?php\n";
 		foreach ($fields as $field) {
@@ -58,12 +59,12 @@
 		foreach ($associations as $type => $data) {
 			foreach ($data as $alias => $details) {
 				if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-					echo "\t\t<li><?php echo \$html->link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
-					echo "\t\t<li><?php echo \$html->link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+					echo "\t\t<li><?php echo \$html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+					echo "\t\t<li><?php echo \$html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
 					$done[] = $details['controller'];
 				}
 			}
 		}
 ?>
 	</ul>
-</div>
+</div>
\ No newline at end of file
diff --git a/cake/console/libs/templates/views/home.ctp b/cake/console/libs/templates/default/views/home.ctp
similarity index 96%
rename from cake/console/libs/templates/views/home.ctp
rename to cake/console/libs/templates/default/views/home.ctp
index 39020d488..f97a8a4ef 100644
--- a/cake/console/libs/templates/views/home.ctp
+++ b/cake/console/libs/templates/default/views/home.ctp
@@ -1,5 +1,5 @@
 <?php
-$output = "<h2>Sweet, \"".Inflector::humanize($app)."\" got Baked by CakePHP!</h2>\n";
+$output = "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
 $output .="
 <?php
 if (Configure::read() > 0):
@@ -79,4 +79,4 @@ $output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\
 $output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
 $output .= "?>\n";
 $output .= "</p>\n";
-?>
+?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/views/index.ctp b/cake/console/libs/templates/default/views/index.ctp
similarity index 90%
rename from cake/console/libs/templates/views/index.ctp
rename to cake/console/libs/templates/default/views/index.ctp
index af2c5acb5..e68fea588 100644
--- a/cake/console/libs/templates/views/index.ctp
+++ b/cake/console/libs/templates/default/views/index.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -88,12 +89,12 @@ echo "<?php endforeach; ?>\n";
 	foreach ($associations as $type => $data) {
 		foreach ($data as $alias => $details) {
 			if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-				echo "\t\t<li><?php echo \$html->link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
-				echo "\t\t<li><?php echo \$html->link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
 				$done[] = $details['controller'];
 			}
 		}
 	}
 ?>
 	</ul>
-</div>
+</div>
\ No newline at end of file
diff --git a/cake/console/libs/templates/views/view.ctp b/cake/console/libs/templates/default/views/view.ctp
similarity index 81%
rename from cake/console/libs/templates/views/view.ctp
rename to cake/console/libs/templates/default/views/view.ctp
index a25b7574c..e79f06d81 100644
--- a/cake/console/libs/templates/views/view.ctp
+++ b/cake/console/libs/templates/default/views/view.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -32,14 +33,14 @@ foreach ($fields as $field) {
 		foreach ($associations['belongsTo'] as $alias => $details) {
 			if ($field === $details['foreignKey']) {
 				$isKey = true;
-				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('".Inflector::humanize(Inflector::underscore($alias))."'); ?></dt>\n";
+				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize(Inflector::underscore($alias)) . "'); ?></dt>\n";
 				echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \$html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
 				break;
 			}
 		}
 	}
 	if ($isKey !== true) {
-		echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('".Inflector::humanize($field)."'); ?></dt>\n";
+		echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "'); ?></dt>\n";
 		echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
 	}
 }
@@ -58,8 +59,8 @@ foreach ($fields as $field) {
 	foreach ($associations as $type => $data) {
 		foreach ($data as $alias => $details) {
 			if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-				echo "\t\t<li><?php echo \$html->link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
-				echo "\t\t<li><?php echo \$html->link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
 				$done[] = $details['controller'];
 			}
 		}
@@ -71,12 +72,12 @@ foreach ($fields as $field) {
 if (!empty($associations['hasOne'])) :
 	foreach ($associations['hasOne'] as $alias => $details): ?>
 	<div class="related">
-		<h3><?php echo "<?php  __('Related ".Inflector::humanize($details['controller'])."');?>";?></h3>
+		<h3><?php echo "<?php  __('Related " . Inflector::humanize($details['controller']) . "');?>";?></h3>
 	<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
 		<dl><?php echo "\t<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?>
 	<?php
 			foreach ($details['fields'] as $field) {
-				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('".Inflector::humanize($field)."');?></dt>\n";
+				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "');?></dt>\n";
 				echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t<?php echo \${$singularVar}['{$alias}']['{$field}'];?>\n&nbsp;</dd>\n";
 			}
 	?>
@@ -84,7 +85,7 @@ if (!empty($associations['hasOne'])) :
 	<?php echo "<?php endif; ?>\n";?>
 		<div class="actions">
 			<ul>
-				<li><?php echo "<?php echo \$html->link(__('Edit ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n";?>
+				<li><?php echo "<?php echo \$html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n";?>
 			</ul>
 		</div>
 	</div>
@@ -110,7 +111,7 @@ foreach ($relations as $alias => $details):
 	<tr>
 <?php
 			foreach ($details['fields'] as $field) {
-				echo "\t\t<th><?php __('".Inflector::humanize($field)."'); ?></th>\n";
+				echo "\t\t<th><?php __('" . Inflector::humanize($field) . "'); ?></th>\n";
 			}
 ?>
 		<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
@@ -143,7 +144,7 @@ echo "\t<?php endforeach; ?>\n";
 <?php echo "<?php endif; ?>\n\n";?>
 	<div class="actions">
 		<ul>
-			<li><?php echo "<?php echo \$html->link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?> </li>
+			<li><?php echo "<?php echo \$html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?> </li>
 		</ul>
 	</div>
 </div>
diff --git a/cake/console/libs/templates/skel/app_controller.php b/cake/console/libs/templates/skel/app_controller.php
index 2412447bc..96c7ac334 100644
--- a/cake/console/libs/templates/skel/app_controller.php
+++ b/cake/console/libs/templates/skel/app_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
diff --git a/cake/console/libs/templates/skel/app_helper.php b/cake/console/libs/templates/skel/app_helper.php
index c57f438b8..66762cb58 100644
--- a/cake/console/libs/templates/skel/app_helper.php
+++ b/cake/console/libs/templates/skel/app_helper.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,7 +26,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Helper');
+App::import('Helper', 'Helper', false);
+
 /**
  * This is a placeholder class.
  * Create the same file in app/app_helper.php
diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index a9868e685..d124b27f3 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -71,4 +71,4 @@ allow = aco3, aco4
 
 [groupname-goes-here]
 deny = aco5, aco6
-allow = aco7, aco8
\ No newline at end of file
+allow = aco7, aco8
diff --git a/cake/console/libs/templates/skel/config/bootstrap.php b/cake/console/libs/templates/skel/config/bootstrap.php
index b817172c7..d0dcb91e5 100644
--- a/cake/console/libs/templates/skel/config/bootstrap.php
+++ b/cake/console/libs/templates/skel/config/bootstrap.php
@@ -1,44 +1,51 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
- * Short description for file.
+ * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php
  *
- * Long description for file
+ * This is an application wide file to load any function that is not used within a class
+ * define. You can also use this to include or require any files in your application.
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.10.8.2117
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-/**
- *
- * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php is loaded
- * This is an application wide file to load any function that is not used within a class define.
- * You can also use this to include or require any files in your application.
- *
- */
+
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
  * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
  *
- * $modelPaths = array('full path to models', 'second full path to models', 'etc...');
- * $viewPaths = array('this path to views', 'second full path to views', 'etc...');
- * $controllerPaths = array('this path to controllers', 'second full path to controllers', 'etc...');
+ * App::build(array(
+ *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
+ *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ *     'controllers' => array(/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ *     'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ *     'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ *     'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ *     'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * ));
+ *
+ */
+
+/**
+ * As of 1.3, additional rules for the inflector are added below
+ *
+ * Inflector::rule('singular', array('rules' => array(), irregular' => array(), 'uninflected' => array()));
+ * Inflector::rule('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
  *
  */
-//EOF
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index fbd02e74a..8108c1999 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * This is core configuration file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * CakePHP Debug Level:
  *
@@ -39,10 +41,12 @@
  * In development mode, you need to click the flash message to continue.
  */
 	Configure::write('debug', 2);
+
 /**
  * Application wide charset encoding
  */
 	Configure::write('App.encoding', 'UTF-8');
+
 /**
  * To configure CakePHP *not* to use mod_rewrite and to
  * use CakePHP pretty URLs, remove these .htaccess
@@ -55,6 +59,7 @@
  * And uncomment the App.baseUrl below:
  */
 	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+
 /**
  * Uncomment the define below to use CakePHP admin routes.
  *
@@ -71,6 +76,7 @@
  *
  */
 	//Configure::write('Cache.disable', true);
+
 /**
  * Enable cache checking.
  *
@@ -81,11 +87,13 @@
  *
  */
 	//Configure::write('Cache.check', true);
+
 /**
  * Defines the default error type when using the log() function. Used for
  * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
  */
 	define('LOG_ERROR', 2);
+
 /**
  * The preferred session handling method. Valid values:
  *
@@ -100,6 +108,7 @@
  *
  */
 	Configure::write('Session.save', 'php');
+
 /**
  * The name of the table used to store CakePHP database sessions.
  *
@@ -108,30 +117,36 @@
  * The table name set here should *not* include any table prefix defined elsewhere.
  */
 	//Configure::write('Session.table', 'cake_sessions');
+
 /**
  * The DATABASE_CONFIG::$var to use for database session handling.
  *
  * 'Session.save' must be set to 'database' in order to utilize this constant.
  */
 	//Configure::write('Session.database', 'default');
+
 /**
  * The name of CakePHP's session cookie.
  */
 	Configure::write('Session.cookie', 'CAKEPHP');
+
 /**
  * Session time out time (in seconds).
  * Actual value depends on 'Security.level' setting.
  */
 	Configure::write('Session.timeout', '120');
+
 /**
  * If set to false, sessions are not automatically started.
  */
 	Configure::write('Session.start', true);
+
 /**
  * When set to false, HTTP_USER_AGENT will not be checked
  * in the session
  */
 	Configure::write('Session.checkAgent', true);
+
 /**
  * The level of CakePHP security. The session timeout time defined
  * in 'Session.timeout' is multiplied according to the settings here.
@@ -145,10 +160,12 @@
  * 'Security.level' is set to 'high'.
  */
 	Configure::write('Security.level', 'high');
+
 /**
  * A random string used in security hashing methods.
  */
 	Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
+
 /**
  * Compress CSS output by removing comments, whitespace, repeating tags, etc.
  * This requires a/var/cache directory to be writable by the web server for caching.
@@ -157,6 +174,7 @@
  * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
  */
 	//Configure::write('Asset.filter.css', 'css.php');
+
 /**
  * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
  * output, and setting the config below to the name of the script.
@@ -164,12 +182,14 @@
  * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
  */
 	//Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
+
 /**
  * The classname and database used in CakePHP's
  * access control lists.
  */
 	Configure::write('Acl.classname', 'DbAcl');
 	Configure::write('Acl.database', 'default');
+
 /**
  * If you are on PHP 5.3 uncomment this line and correct your server timezone
  * to fix the date & time related errors.
diff --git a/cake/console/libs/templates/skel/config/inflections.php b/cake/console/libs/templates/skel/config/inflections.php
index ed8c08b3d..69857fe89 100644
--- a/cake/console/libs/templates/skel/config/inflections.php
+++ b/cake/console/libs/templates/skel/config/inflections.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Custom Inflected Words.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * This is a key => value array of regex used to match words.
  * If key matches then the value is returned.
@@ -32,6 +34,7 @@
  *  $pluralRules = array('/(s)tatus$/i' => '\1\2tatuses', '/^(ox)$/i' => '\1\2en', '/([m|l])ouse$/i' => '\1ice');
  */
 	$pluralRules = array();
+
 /**
  * This is a key only array of plural words that should not be inflected.
  * Notice the last comma
@@ -39,6 +42,7 @@
  * $uninflectedPlural = array('.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox');
  */
 	$uninflectedPlural = array();
+
 /**
  * This is a key => value array of plural irregular words.
  * If key matches then the value is returned.
@@ -46,6 +50,7 @@
  *  $irregularPlural = array('atlas' => 'atlases', 'beef' => 'beefs', 'brother' => 'brothers')
  */
 	$irregularPlural = array();
+
 /**
  * This is a key => value array of regex used to match words.
  * If key matches then the value is returned.
@@ -53,12 +58,14 @@
  *  $singularRules = array('/(s)tatuses$/i' => '\1\2tatus', '/(matr)ices$/i' =>'\1ix','/(vert|ind)ices$/i')
  */
 	$singularRules = array();
+
 /**
  * This is a key only array of singular words that should not be inflected.
  * You should not have to change this value below if you do change it use same format
  * as the $uninflectedPlural above.
  */
 	$uninflectedSingular = $uninflectedPlural;
+
 /**
  * This is a key => value array of singular irregular words.
  * Most of the time this will be a reverse of the above $irregularPlural array
diff --git a/cake/console/libs/templates/skel/config/routes.php b/cake/console/libs/templates/skel/config/routes.php
index b14e435c3..77168cb45 100644
--- a/cake/console/libs/templates/skel/config/routes.php
+++ b/cake/console/libs/templates/skel/config/routes.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -26,12 +27,14 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Here, we are connecting '/' (base path) to controller called 'Pages',
  * its action called 'display', and we pass a param to select the view file
  * to use (in this case, /app/views/pages/home.ctp)...
  */
 	Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+
 /**
  * ...and connect the rest of 'Pages' controller's urls.
  */
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.php b/cake/console/libs/templates/skel/config/sql/db_acl.php
index 19434d0c6..99fe1d64e 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.php
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.php
@@ -1,6 +1,8 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
+
 /**
  * This is Acl Schema file
  *
@@ -25,6 +27,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /*
  *
  * Using the Schema command line utility
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.php b/cake/console/libs/templates/skel/config/sql/i18n.php
index b8158dd5a..83f274d81 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.php
+++ b/cake/console/libs/templates/skel/config/sql/i18n.php
@@ -1,6 +1,8 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
+
 /**
  * This is i18n Schema file
  *
@@ -25,6 +27,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /*
  *
  * Using the Schema command line utility
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.php b/cake/console/libs/templates/skel/config/sql/sessions.php
index 197366108..37582f7cd 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.php
+++ b/cake/console/libs/templates/skel/config/sql/sessions.php
@@ -1,6 +1,8 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
+
 /**
  * This is Sessions Schema file
  *
@@ -25,6 +27,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /*
  *
  * Using the Schema command line utility
diff --git a/cake/console/libs/templates/skel/controllers/pages_controller.php b/cake/console/libs/templates/skel/controllers/pages_controller.php
index 8196616ba..04c72218f 100644
--- a/cake/console/libs/templates/skel/controllers/pages_controller.php
+++ b/cake/console/libs/templates/skel/controllers/pages_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Static content controller.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Static content controller
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.controller
  */
 class PagesController extends AppController {
+
 /**
  * Controller name
  *
@@ -40,6 +43,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $name = 'Pages';
+
 /**
  * Default helper
  *
@@ -47,6 +51,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $helpers = array('Html');
+
 /**
  * This controller does not use a model
  *
@@ -54,6 +59,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * Displays a view
  *
diff --git a/cake/console/libs/templates/skel/index.php b/cake/console/libs/templates/skel/index.php
index 5724a1c4b..a5b65fe05 100644
--- a/cake/console/libs/templates/skel/index.php
+++ b/cake/console/libs/templates/skel/index.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * PHP versions 4 and 5
  *
diff --git a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
index 6e51c0fd4..b6afa3e66 100644
--- a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
index cbb261c64..bd5f1aca6 100644
--- a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/console/libs/templates/skel/views/layouts/ajax.ctp b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
index ca3459af8..4da27c73a 100644
--- a/cake/console/libs/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/console/libs/templates/skel/views/layouts/default.ctp b/cake/console/libs/templates/skel/views/layouts/default.ctp
index 8cc346713..641425bfb 100644
--- a/cake/console/libs/templates/skel/views/layouts/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
index 1853a7b3a..b596254f2 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -34,4 +35,4 @@
 
 	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
index 77fda3bd6..bfc1ef552 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -26,4 +27,3 @@
 <?php echo $content_for_layout;?>
 
 This email was sent using the CakePHP Framework, http://cakephp.org.
-
diff --git a/cake/console/libs/templates/skel/views/layouts/flash.ctp b/cake/console/libs/templates/skel/views/layouts/flash.ctp
index ddd63085f..e59354eed 100644
--- a/cake/console/libs/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/flash.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index 52b57fee7..735e4586c 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -28,12 +29,14 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	header('HTTP/1.1 404 Not Found');
 	exit('File Not Found');
 }
+
 /**
  * Enter description here...
  */
 if (!class_exists('File')) {
 	uses('file');
 }
+
 /**
  * Enter description here...
  *
@@ -50,6 +53,7 @@ if (!class_exists('File')) {
 		$output = " /* file: $name, ratio: $ratio% */ " . $output;
 		return $output;
 	}
+
 /**
  * Enter description here...
  *
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index efdc5b680..37b6fee49 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,12 +25,14 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Use the DS to separate the directories in other defines
  */
 	if (!defined('DS')) {
 		define('DS', DIRECTORY_SEPARATOR);
 	}
+
 /**
  * These defines should only be edited if you have cake installed in
  * a directory layout other than the way it is distributed.
@@ -43,6 +46,7 @@
 	if (!defined('ROOT')) {
 		define('ROOT', dirname(dirname(dirname(__FILE__))));
 	}
+
 /**
  * The actual directory name for the "app".
  *
@@ -50,6 +54,7 @@
 	if (!defined('APP_DIR')) {
 		define('APP_DIR', basename(dirname(dirname(__FILE__))));
 	}
+
 /**
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
diff --git a/cake/console/libs/templates/skel/webroot/js/vendors.php b/cake/console/libs/templates/skel/webroot/js/vendors.php
index 5fda0b7b4..e089eef58 100644
--- a/cake/console/libs/templates/skel/webroot/js/vendors.php
+++ b/cake/console/libs/templates/skel/webroot/js/vendors.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Enter description here...
  */
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index 725469d93..c64220950 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -35,12 +36,14 @@ error_reporting(E_ALL & ~E_DEPRECATED);
 set_time_limit(0);
 ini_set('memory_limit','128M');
 ini_set('display_errors', 1);
+
 /**
  * Use the DS to separate the directories in other defines
  */
 	if (!defined('DS')) {
 		define('DS', DIRECTORY_SEPARATOR);
 	}
+
 /**
  * These defines should only be edited if you have cake installed in
  * a directory layout other than the way it is distributed.
@@ -54,6 +57,7 @@ ini_set('display_errors', 1);
 	if (!defined('ROOT')) {
 		define('ROOT', dirname(dirname(dirname(__FILE__))));
 	}
+
 /**
  * The actual directory name for the "app".
  *
@@ -61,6 +65,7 @@ ini_set('display_errors', 1);
 	if (!defined('APP_DIR')) {
 		define('APP_DIR', basename(dirname(dirname(__FILE__))));
 	}
+
 /**
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
@@ -93,7 +98,7 @@ if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
-$corePath = Configure::corePaths('cake');
+$corePath = App::core('cake');
 if (isset($corePath[0])) {
 	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
 } else {
@@ -112,6 +117,7 @@ if (!isset($_SERVER['SERVER_NAME'])) {
 if (empty( $_GET['output'])) {
 	$_GET['output'] = 'html';
 }
+
 /**
  *
  * Used to determine output to display
diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
index caf760609..4915412e6 100644
--- a/cake/console/libs/testsuite.php
+++ b/cake/console/libs/testsuite.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test Suite Shell
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class TestSuiteShell extends Shell {
+
 /**
  * The test category, "app", "core" or the name of a plugin
  *
@@ -32,6 +34,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $category = '';
+
 /**
  * "group", "case" or "all"
  *
@@ -39,6 +42,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $type = '';
+
 /**
  * Path to the test case/group file
  *
@@ -46,6 +50,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $file = '';
+
 /**
  * Storage for plugins that have tests
  *
@@ -53,6 +58,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $plugins = array();
+
 /**
  * Convenience variable to avoid duplicated code
  *
@@ -60,6 +66,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $isPluginTest = false;
+
 /**
  * Stores if the user wishes to get a code coverage analysis report
  *
@@ -67,6 +74,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $doCoverage = false;
+
 /**
  * The headline for the test output
  *
@@ -74,6 +82,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	var $headline = 'CakePHP Test Shell';
+
 /**
  * Initialization method installs Simpletest and loads all plugins
  *
@@ -81,7 +90,7 @@ class TestSuiteShell extends Shell {
  * @access public
  */
 	function initialize() {
-		$corePath = Configure::corePaths('cake');
+		$corePath = App::core('cake');
 		if (isset($corePath[0])) {
 			define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
 		} else {
@@ -98,6 +107,7 @@ class TestSuiteShell extends Shell {
 			$this->plugins[] = Inflector::underscore($p);
 		}
 	}
+
 /**
  * Main entry point to this shell
  *
@@ -147,6 +157,7 @@ class TestSuiteShell extends Shell {
 			exit(1);
 		}
 	}
+
 /**
  * Help screen
  *
@@ -184,6 +195,7 @@ class TestSuiteShell extends Shell {
 		$this->out('Code Coverage Analysis: ');
 		$this->out("\n\nAppend 'cov' to any of the above in order to enable code coverage analysis");
 	}
+
 /**
  * Checks if the arguments supplied point to a valid test file and thus the shell can be run.
  *
@@ -237,6 +249,7 @@ class TestSuiteShell extends Shell {
 		$this->err($this->category.' '.$this->type.' '.$this->file.' is an invalid test identifier');
 		return false;
 	}
+
 /**
  * Executes the tests depending on our settings
  *
@@ -298,6 +311,7 @@ class TestSuiteShell extends Shell {
 
 		return $result;
 	}
+
 /**
  * Finds the correct folder to look for tests for based on the input category
  *
@@ -326,6 +340,7 @@ class TestSuiteShell extends Shell {
 		}
 		return $folder;
 	}
+
 /**
  * Sets some get vars needed for TestManager
  *
@@ -344,6 +359,7 @@ class TestSuiteShell extends Shell {
 			$_GET['group'] = true;
 		}
 	}
+
 /**
  * tries to install simpletest and exits gracefully if it is not there
  *
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 3752fdcd8..1d1dca562 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Dispatcher takes the URL information, parses it for paramters and
  * tells the involved controllers what to do.
@@ -25,10 +26,13 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * List of helpers to include
  */
-App::import('Core', array('Router', 'Controller'));
+App::import('Core', 'Router');
+App::import('Controller', 'Controller', false);
+
 /**
  * Dispatcher translates URLs to controller-action-paramter triads.
  *
@@ -38,6 +42,7 @@ App::import('Core', array('Router', 'Controller'));
  * @subpackage    cake.cake
  */
 class Dispatcher extends Object {
+
 /**
  * Base URL
  *
@@ -45,6 +50,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $base = false;
+
 /**
  * webroot path
  *
@@ -52,6 +58,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $webroot = '/';
+
 /**
  * Current URL
  *
@@ -59,6 +66,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $here = false;
+
 /**
  * Admin route (if on it)
  *
@@ -66,6 +74,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $admin = false;
+
 /**
  * Plugin being served (if any)
  *
@@ -73,6 +82,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * the params for this request
  *
@@ -80,6 +90,7 @@ class Dispatcher extends Object {
  * @access public
  */
 	var $params = null;
+
 /**
  * Constructor.
  */
@@ -91,6 +102,7 @@ class Dispatcher extends Object {
 			return $this->dispatch($url);
 		}
 	}
+
 /**
  * Dispatches and invokes given URL, handing over control to the involved controllers, and then renders the results (if autoRender is set).
  *
@@ -193,6 +205,7 @@ class Dispatcher extends Object {
 		}
 		return $this->_invoke($controller, $this->params);
 	}
+
 /**
  * Invokes given controller's render action if autoRender option is set. Otherwise the
  * contents of the operation are returned as a string.
@@ -213,7 +226,7 @@ class Dispatcher extends Object {
 
 		if (!isset($methods[strtolower($params['action'])])) {
 			if ($controller->scaffold !== false) {
-				App::import('Core', 'Scaffold');
+				App::import('Controller', 'Scaffold', false);
 				return new Scaffold($controller, $params);
 			}
 			return $this->cakeError('missingAction', array(array(
@@ -239,6 +252,7 @@ class Dispatcher extends Object {
 		}
 		echo($controller->output);
 	}
+
 /**
  * Sets the params when $url is passed as an array to Object::requestAction();
  *
@@ -252,6 +266,7 @@ class Dispatcher extends Object {
 		$this->params = array_merge($defaults, $url, $additionalParams);
 		return Router::url($url);
 	}
+
 /**
  * Returns array of GET and POST parameters. GET parameters are taken from given URL.
  *
@@ -325,6 +340,7 @@ class Dispatcher extends Object {
 		}
 		return $params;
 	}
+
 /**
  * Returns a base URL and sets the proper webroot
  *
@@ -382,6 +398,7 @@ class Dispatcher extends Object {
 		}
 		return false;
 	}
+
 /**
  * Restructure params in case we're serving a plugin.
  *
@@ -412,6 +429,7 @@ class Dispatcher extends Object {
 		}
 		return $params;
 	}
+
 /**
  * Get controller to use, either plugin controller or application controller
  *
@@ -454,6 +472,7 @@ class Dispatcher extends Object {
 		}
 		return $controller;
 	}
+
 /**
  * Load controller and return controller class
  *
@@ -481,6 +500,7 @@ class Dispatcher extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the REQUEST_URI from the server environment, or, failing that,
  * constructs a new one, using the PHP_SELF constant and other variables.
@@ -515,10 +535,10 @@ class Dispatcher extends Object {
 				parse_str($uri[1], $_GET);
 			}
 			$uri = $uri[0];
-		} elseif (empty($uri) && is_string(env('QUERY_STRING'))) {
+		} else {
 			$uri = env('QUERY_STRING');
 		}
-		if (strpos($uri, 'index.php') !== false) {
+		if (is_string($uri) && strpos($uri, 'index.php') !== false) {
 			list(, $uri) = explode('index.php', $uri, 2);
 		}
 		if (empty($uri) || $uri == '/' || $uri == '//') {
@@ -526,6 +546,7 @@ class Dispatcher extends Object {
 		}
 		return str_replace('//', '/', '/' . $uri);
 	}
+
 /**
  * Returns and sets the $_GET[url] derived from the REQUEST_URI
  *
@@ -576,6 +597,7 @@ class Dispatcher extends Object {
 		}
 		return $url;
 	}
+
 /**
  * Outputs cached dispatch for js, css, img, view cache
  *
@@ -671,7 +693,7 @@ class Dispatcher extends Object {
 
 			if (file_exists($filename)) {
 				if (!class_exists('View')) {
-					App::import('Core', 'View');
+					App::import('View', 'View', false);
 				}
 				$controller = null;
 				$view =& new View($controller, false);
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index aabd27951..36e7aa15d 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Caching for CakePHP.
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Caching for CakePHP.
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.cake.libs
  */
 class Cache extends Object {
+
 /**
  * Cache engine to use
  *
@@ -37,6 +40,7 @@ class Cache extends Object {
  * @access protected
  */
 	var $_Engine = null;
+
 /**
  * Cache configuration stack
  *
@@ -44,6 +48,7 @@ class Cache extends Object {
  * @access private
  */
 	var $__config = array();
+
 /**
  * Holds name of the current configuration being used
  *
@@ -51,6 +56,7 @@ class Cache extends Object {
  * @access private
  */
 	var $__name = 'default';
+
 /**
  * whether to reset the settings with the next call to self::set();
  *
@@ -58,6 +64,7 @@ class Cache extends Object {
  * @access private
  */
 	var $__reset = false;
+
 /**
  * Returns a singleton instance
  *
@@ -72,6 +79,7 @@ class Cache extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Tries to find and include a file for a cache engine and returns object instance
  *
@@ -85,6 +93,7 @@ class Cache extends Object {
 		}
 		return true;
 	}
+
 /**
  * Set the cache configuration to use
  *
@@ -132,6 +141,7 @@ class Cache extends Object {
 		}
 		return compact('engine', 'settings');
 	}
+
 /**
  * Set the cache engine to use or modify settings for one instance
  *
@@ -160,6 +170,7 @@ class Cache extends Object {
 		$_this->_Engine[$name] = null;
 		return false;
 	}
+
 /**
  * Temporarily change settings to current config options. if no params are passed, resets settings if needed
  * Cache::write() will reset the configuration changes made
@@ -192,11 +203,12 @@ class Cache extends Object {
 				}
 				$settings = array_merge($_this->__config[$_this->__name], $settings);
 			}
-			$_this->_Engine[$engine]->init($settings);
+			$_this->engine($engine, $settings);
 		}
 
 		return $_this->settings($engine);
 	}
+
 /**
  * Garbage collection
  *
@@ -211,6 +223,7 @@ class Cache extends Object {
 		$config = $_this->config();
 		$_this->_Engine[$config['engine']]->gc();
 	}
+
 /**
  * Write data for key into cache
  *
@@ -261,6 +274,7 @@ class Cache extends Object {
 		$settings = $_this->set();
 		return $success;
 	}
+
 /**
  * Read a key from the cache
  *
@@ -297,6 +311,7 @@ class Cache extends Object {
 		}
 		return $success;
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -331,6 +346,7 @@ class Cache extends Object {
 		$settings = $_this->set();
 		return $success;
 	}
+
 /**
  * Delete all keys from the cache
  *
@@ -360,6 +376,7 @@ class Cache extends Object {
 		$settings = $_this->set();
 		return $success;
 	}
+
 /**
  * Check if Cache has initialized a working storage engine
  *
@@ -400,6 +417,7 @@ class Cache extends Object {
 		return array();
 	}
 }
+
 /**
  * Storage engine for CakePHP caching
  *
@@ -407,6 +425,7 @@ class Cache extends Object {
  * @subpackage    cake.cake.libs
  */
 class CacheEngine extends Object {
+
 /**
  * settings of current engine instance
  *
@@ -414,6 +433,7 @@ class CacheEngine extends Object {
  * @access public
  */
 	var $settings = array();
+
 /**
  * Iitialize the cache engine
  *
@@ -430,6 +450,7 @@ class CacheEngine extends Object {
 		}
 		return true;
 	}
+
 /**
  * Garbage collection
  *
@@ -439,6 +460,7 @@ class CacheEngine extends Object {
  */
 	function gc() {
 	}
+
 /**
  * Write value for a key into cache
  *
@@ -451,6 +473,7 @@ class CacheEngine extends Object {
 	function write($key, &$value, $duration) {
 		trigger_error(sprintf(__('Method write() not implemented in %s', true), get_class($this)), E_USER_ERROR);
 	}
+
 /**
  * Read a key from the cache
  *
@@ -461,6 +484,7 @@ class CacheEngine extends Object {
 	function read($key) {
 		trigger_error(sprintf(__('Method read() not implemented in %s', true), get_class($this)), E_USER_ERROR);
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -470,6 +494,7 @@ class CacheEngine extends Object {
  */
 	function delete($key) {
 	}
+
 /**
  * Delete all keys from the cache
  *
@@ -479,6 +504,7 @@ class CacheEngine extends Object {
  */
 	function clear($check) {
 	}
+
 /**
  * Cache Engine settings
  *
@@ -488,6 +514,7 @@ class CacheEngine extends Object {
 	function settings() {
 		return $this->settings;
 	}
+
 /**
  * generates a safe key
  *
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index 8e2a781a5..74725455b 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * APC storage engine for cache.
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * APC storage engine for cache
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.cake.libs.cache
  */
 class ApcEngine extends CacheEngine {
+
 /**
  * Initialize the Cache Engine
  *
@@ -45,6 +48,7 @@ class ApcEngine extends CacheEngine {
 		parent::init(array_merge(array('engine' => 'Apc', 'prefix' => Inflector::slug(APP_DIR) . '_'), $settings));
 		return function_exists('apc_cache_info');
 	}
+
 /**
  * Write data for key into cache
  *
@@ -59,6 +63,7 @@ class ApcEngine extends CacheEngine {
 		apc_store($key.'_expires', $expires, $duration);
 		return apc_store($key, $value, $duration);
 	}
+
 /**
  * Read a key from the cache
  *
@@ -74,6 +79,7 @@ class ApcEngine extends CacheEngine {
 		}
 		return apc_fetch($key);
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -84,6 +90,7 @@ class ApcEngine extends CacheEngine {
 	function delete($key) {
 		return apc_delete($key);
 	}
+
 /**
  * Delete all keys from the cache
  *
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index abbd5a0e6..308924892 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * File Storage engine for cache
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * File Storage engine for cache
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.libs.cache
  */
 class FileEngine extends CacheEngine {
+
 /**
  * Instance of File class
  *
@@ -38,6 +41,7 @@ class FileEngine extends CacheEngine {
  * @access private
  */
 	var $__File = null;
+
 /**
  * settings
  * 		path = absolute path to cache directory, default => CACHE
@@ -50,6 +54,7 @@ class FileEngine extends CacheEngine {
  * @access public
  */
 	var $settings = array();
+
 /**
  * Set to true if FileEngine::init(); and FileEngine::__active(); do not fail.
  *
@@ -57,6 +62,7 @@ class FileEngine extends CacheEngine {
  * @access private
  */
 	var $__active = false;
+
 /**
  * True unless FileEngine::__active(); fails
  *
@@ -64,6 +70,7 @@ class FileEngine extends CacheEngine {
  * @access private
  */
 	var $__init = true;
+
 /**
  * Initialize the Cache Engine
  *
@@ -99,6 +106,7 @@ class FileEngine extends CacheEngine {
 		}
 		return $this->__active();
 	}
+
 /**
  * Garbage collection. Permanently remove all expired and deleted data
  *
@@ -108,6 +116,7 @@ class FileEngine extends CacheEngine {
 	function gc() {
 		return $this->clear(true);
 	}
+
 /**
  * Write data for key into cache
  *
@@ -149,6 +158,7 @@ class FileEngine extends CacheEngine {
 		$this->__File->close();
 		return $success;
 	}
+
 /**
  * Read a key from the cache
  *
@@ -181,6 +191,7 @@ class FileEngine extends CacheEngine {
 		$this->__File->close();
 		return $data;
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -194,6 +205,7 @@ class FileEngine extends CacheEngine {
 		}
 		return $this->__File->delete();
 	}
+
 /**
  * Delete all values from the cache
  *
@@ -233,6 +245,7 @@ class FileEngine extends CacheEngine {
 		$dir->close();
 		return true;
 	}
+
 /**
  * Get absolute file for a given key
  *
@@ -250,6 +263,7 @@ class FileEngine extends CacheEngine {
 			return false;
 		}
 	}
+
 /**
  * Determine is cache directory is writable
  *
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 2d70a6e86..3623f9a87 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Memcache storage engine for cache
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Memcache storage engine for cache
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.cake.libs.cache
  */
 class MemcacheEngine extends CacheEngine {
+
 /**
  * Memcache wrapper.
  *
@@ -37,6 +40,7 @@ class MemcacheEngine extends CacheEngine {
  * @access private
  */
 	var $__Memcache = null;
+
 /**
  * settings
  * 		servers = string or array of memcache servers, default => 127.0.0.1
@@ -46,6 +50,7 @@ class MemcacheEngine extends CacheEngine {
  * @access public
  */
 	var $settings = array();
+
 /**
  * Initialize the Cache Engine
  *
@@ -89,6 +94,7 @@ class MemcacheEngine extends CacheEngine {
 		}
 		return true;
 	}
+
 /**
  * Write data for key into cache
  *
@@ -103,6 +109,7 @@ class MemcacheEngine extends CacheEngine {
 		$this->__Memcache->set($key.'_expires', $expires, $this->settings['compress'], $expires);
 		return $this->__Memcache->set($key, $value, $this->settings['compress'], $expires);
 	}
+
 /**
  * Read a key from the cache
  *
@@ -118,6 +125,7 @@ class MemcacheEngine extends CacheEngine {
 		}
 		return $this->__Memcache->get($key);
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -128,6 +136,7 @@ class MemcacheEngine extends CacheEngine {
 	function delete($key) {
 		return $this->__Memcache->delete($key);
 	}
+
 /**
  * Delete all keys from the cache
  *
@@ -137,6 +146,7 @@ class MemcacheEngine extends CacheEngine {
 	function clear() {
 		return $this->__Memcache->flush();
 	}
+
 /**
  * Connects to a server in connection pool
  *
@@ -155,4 +165,4 @@ class MemcacheEngine extends CacheEngine {
 		return true;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 1ed9b0b5a..53701f781 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Xcache storage engine for cache.
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Xcache storage engine for cache
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.libs.cache
  */
 class XcacheEngine extends CacheEngine {
+
 /**
  * settings
  * 		PHP_AUTH_USER = xcache.admin.user, default cake
@@ -40,6 +43,7 @@ class XcacheEngine extends CacheEngine {
  * @access public
  */
 	var $settings = array();
+
 /**
  * Initialize the Cache Engine
  *
@@ -57,6 +61,7 @@ class XcacheEngine extends CacheEngine {
 		);
 		return function_exists('xcache_info');
 	}
+
 /**
  * Write data for key into cache
  *
@@ -71,6 +76,7 @@ class XcacheEngine extends CacheEngine {
 		xcache_set($key.'_expires', $expires, $duration);
 		return xcache_set($key, $value, $duration);
 	}
+
 /**
  * Read a key from the cache
  *
@@ -89,6 +95,7 @@ class XcacheEngine extends CacheEngine {
 		}
 		return false;
 	}
+
 /**
  * Delete a key from the cache
  *
@@ -99,6 +106,7 @@ class XcacheEngine extends CacheEngine {
 	function delete($key) {
 		return xcache_unset($key);
 	}
+
 /**
  * Delete all keys from the cache
  *
@@ -114,6 +122,7 @@ class XcacheEngine extends CacheEngine {
 		$this->__auth(true);
 		return true;
 	}
+
 /**
  * Populates and reverses $_SERVER authentication values
  * Makes necessary changes (and reverting them back) in $_SERVER
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index da779b2af..0161d47c6 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Logging.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  *
@@ -31,6 +33,7 @@
 	if (!class_exists('File')) {
 		require LIBS . 'file.php';
 	}
+
 /**
  * Set up error level constants to be used within the framework if they are not defined within the
  * system.
@@ -48,6 +51,7 @@
 	if (!defined('LOG_INFO')) {
 		define('LOG_INFO', 6);
 	}
+
 /**
  * Logs messages to text files
  *
@@ -55,6 +59,7 @@
  * @subpackage    cake.cake.libs
  */
 class CakeLog {
+
 /**
  * Writes given message to a log file in the logs directory.
  *
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index f9b990e21..387f6088a 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Session class for Cake.
  *
@@ -38,6 +39,7 @@
  * @subpackage    cake.cake.libs
  */
 class CakeSession extends Object {
+
 /**
  * True if the Session is still valid
  *
@@ -45,6 +47,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $valid = false;
+
 /**
  * Error messages for this session
  *
@@ -52,6 +55,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $error = false;
+
 /**
  * User agent string
  *
@@ -59,6 +63,7 @@ class CakeSession extends Object {
  * @access protected
  */
 	var $_userAgent = '';
+
 /**
  * Path to where the session is active.
  *
@@ -66,6 +71,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $path = '/';
+
 /**
  * Error number of last occurred error
  *
@@ -73,6 +79,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $lastError = null;
+
 /**
  * 'Security.level' setting, "high", "medium", or "low".
  *
@@ -80,6 +87,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $security = null;
+
 /**
  * Start time for this session.
  *
@@ -87,6 +95,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $time = false;
+
 /**
  * Time when this session becomes invalid.
  *
@@ -94,6 +103,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $sessionTime = false;
+
 /**
  * Keeps track of keys to watch for writes on
  *
@@ -101,6 +111,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $watchKeys = array();
+
 /**
  * Current Session id
  *
@@ -108,6 +119,7 @@ class CakeSession extends Object {
  * @access public
  */
 	var $id = null;
+
 /**
  * Constructor.
  *
@@ -116,7 +128,7 @@ class CakeSession extends Object {
  * @access public
  */
 	function __construct($base = null, $start = true) {
-		App::import('Core', 'Security');
+		App::import('Core', 'Set', 'Security');
 		$this->time = time();
 
 		if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
@@ -167,6 +179,7 @@ class CakeSession extends Object {
 		}
 		parent::__construct();
 	}
+
 /**
  * Starts the Session.
  *
@@ -181,6 +194,7 @@ class CakeSession extends Object {
 		$this->__initSession();
 		return $this->__startSession();
 	}
+
 /**
  * Determine if Session has been started.
  *
@@ -193,6 +207,7 @@ class CakeSession extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns true if given variable is set in session.
  *
@@ -208,6 +223,7 @@ class CakeSession extends Object {
 		$result = Set::extract($_SESSION, $var);
 		return isset($result);
 	}
+
 /**
  * Returns the Session id
  *
@@ -226,6 +242,7 @@ class CakeSession extends Object {
 			return $this->id;
 		}
 	}
+
 /**
  * Removes a variable from session.
  *
@@ -246,6 +263,7 @@ class CakeSession extends Object {
 		$this->__setError(2, "$name doesn't exist");
 		return false;
 	}
+
 /**
  * Used to write new data to _SESSION, since PHP doesn't like us setting the _SESSION var itself
  *
@@ -265,6 +283,7 @@ class CakeSession extends Object {
 			$old[$key] = $var;
 		}
 	}
+
 /**
  * Return error description for given error number.
  *
@@ -279,6 +298,7 @@ class CakeSession extends Object {
 			return $this->error[$errorNumber];
 		}
 	}
+
 /**
  * Returns last occurred error as a string, if any.
  *
@@ -292,6 +312,7 @@ class CakeSession extends Object {
 			return false;
 		}
 	}
+
 /**
  * Returns true if session is valid.
  *
@@ -311,6 +332,7 @@ class CakeSession extends Object {
 		}
 		return $this->valid;
 	}
+
 /**
  * Returns given session variable, or all of them, if no parameters given.
  *
@@ -333,6 +355,7 @@ class CakeSession extends Object {
 		$this->__setError(2, "$name doesn't exist");
 		return null;
 	}
+
 /**
  * Returns all session variables.
  *
@@ -346,6 +369,7 @@ class CakeSession extends Object {
 		$this->__setError(2, "No Session vars set");
 		return false;
 	}
+
 /**
  * Tells Session to write a notification when a certain session path or subpath is written to
  *
@@ -362,6 +386,7 @@ class CakeSession extends Object {
 			$this->watchKeys[] = $var;
 		}
 	}
+
 /**
  * Tells Session to stop watching a given key path
  *
@@ -382,6 +407,7 @@ class CakeSession extends Object {
 			}
 		}
 	}
+
 /**
  * Writes value to given session variable name.
  *
@@ -402,6 +428,7 @@ class CakeSession extends Object {
 		$this->__overwrite($_SESSION, Set::insert($_SESSION, $var, $value));
 		return (Set::extract($_SESSION, $var) === $value);
 	}
+
 /**
  * Helper method to destroy invalid sessions.
  *
@@ -415,6 +442,7 @@ class CakeSession extends Object {
 		$this->renew();
 		$this->_checkValid();
 	}
+
 /**
  * Helper method to initialize a session, based on Cake core settings.
  *
@@ -502,7 +530,7 @@ class CakeSession extends Object {
 			case 'cache':
 				if (empty($_SESSION)) {
 					if (!class_exists('Cache')) {
-						uses('Cache');
+						require LIBS . 'cache.php';
 					}
 					if ($iniSet) {
 						ini_set('session.use_trans_sid', 0);
@@ -532,6 +560,7 @@ class CakeSession extends Object {
 			break;
 		}
 	}
+
 /**
  * Helper method to start a session
  *
@@ -553,6 +582,7 @@ class CakeSession extends Object {
 			return true;
 		}
 	}
+
 /**
  * Helper method to create a new session.
  *
@@ -589,6 +619,7 @@ class CakeSession extends Object {
 			$this->__setError(1, 'Session is valid');
 		}
 	}
+
 /**
  * Helper method to restart a session.
  *
@@ -624,6 +655,7 @@ class CakeSession extends Object {
 			}
 		}
 	}
+
 /**
  * Restarts this session.
  *
@@ -632,6 +664,7 @@ class CakeSession extends Object {
 	function renew() {
 		$this->__regenerateId();
 	}
+
 /**
  * Validate that the $name is in correct dot notation
  * example: $name = 'ControllerName.key';
@@ -647,6 +680,7 @@ class CakeSession extends Object {
 		$this->__setError(3, "$name is not a string");
 		return false;
 	}
+
 /**
  * Helper method to set an internal error message.
  *
@@ -662,6 +696,7 @@ class CakeSession extends Object {
 		$this->error[$errorNumber] = $errorMessage;
 		$this->lastError = $errorNumber;
 	}
+
 /**
  * Method called on open of a database session.
  *
@@ -671,6 +706,7 @@ class CakeSession extends Object {
 	function __open() {
 		return true;
 	}
+
 /**
  * Method called on close of a database session.
  *
@@ -691,6 +727,7 @@ class CakeSession extends Object {
 		}
 		return true;
 	}
+
 /**
  * Method used to read from a database session.
  *
@@ -711,6 +748,7 @@ class CakeSession extends Object {
 
         return $row[$model->alias]['data'];
 	}
+
 /**
  * Helper function called on write for database sessions.
  *
@@ -740,6 +778,7 @@ class CakeSession extends Object {
 
 		return $return;
 	}
+
 /**
  * Method called on the destruction of a database session.
  *
@@ -753,6 +792,7 @@ class CakeSession extends Object {
 
 		return $return;
 	}
+
 /**
  * Helper function called on gc for database sessions.
  *
diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php
index fb50940d0..b31efab18 100644
--- a/cake/libs/cake_socket.php
+++ b/cake/libs/cake_socket.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Cake Socket connection class.
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Core', 'Validation');
+
 /**
  * Cake network socket connection class.
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Validation');
  * @subpackage    cake.cake.libs
  */
 class CakeSocket extends Object {
+
 /**
  * Object description
  *
@@ -39,6 +42,7 @@ class CakeSocket extends Object {
  * @access public
  */
 	var $description = 'Remote DataSource Network Socket Interface';
+
 /**
  * Base configuration settings for the socket connection
  *
@@ -52,6 +56,7 @@ class CakeSocket extends Object {
 		'port'			=> 80,
 		'timeout'		=> 30
 	);
+
 /**
  * Configuration settings for the socket connection
  *
@@ -59,6 +64,7 @@ class CakeSocket extends Object {
  * @access public
  */
 	var $config = array();
+
 /**
  * Reference to socket connection resource
  *
@@ -66,6 +72,7 @@ class CakeSocket extends Object {
  * @access public
  */
 	var $connection = null;
+
 /**
  * This boolean contains the current state of the CakeSocket class
  *
@@ -73,6 +80,7 @@ class CakeSocket extends Object {
  * @access public
  */
 	var $connected = false;
+
 /**
  * This variable contains an array with the last error number (num) and string (str)
  *
@@ -80,6 +88,7 @@ class CakeSocket extends Object {
  * @access public
  */
 	var $lastError = array();
+
 /**
  * Constructor.
  *
@@ -93,6 +102,7 @@ class CakeSocket extends Object {
 			$this->config['protocol'] = getprotobyname($this->config['protocol']);
 		}
 	}
+
 /**
  * Connect the socket to the given host and port.
  *
@@ -120,7 +130,11 @@ class CakeSocket extends Object {
 			$this->setLastError($errStr, $errNum);
 		}
 
-		return $this->connected = is_resource($this->connection);
+		$this->connected = is_resource($this->connection);
+		if ($this->connected) {
+			stream_set_timeout($this->connection, $this->config['timeout']);
+		}
+		return $this->connected;
 	}
 
 /**
@@ -136,6 +150,7 @@ class CakeSocket extends Object {
 			return gethostbyaddr($this->address());
 		}
 	}
+
 /**
  * Get the IP address of the current connection.
  *
@@ -149,6 +164,7 @@ class CakeSocket extends Object {
 			return gethostbyname($this->config['host']);
 		}
 	}
+
 /**
  * Get all IP addresses associated with the current connection.
  *
@@ -162,6 +178,7 @@ class CakeSocket extends Object {
 			return gethostbynamel($this->config['host']);
 		}
 	}
+
 /**
  * Get the last error as a string.
  *
@@ -175,6 +192,7 @@ class CakeSocket extends Object {
 			return null;
 		}
 	}
+
 /**
  * Set the last error.
  *
@@ -185,6 +203,7 @@ class CakeSocket extends Object {
 	function setLastError($errNum, $errStr) {
 		$this->lastError = array('num' => $errNum, 'str' => $errStr);
 	}
+
 /**
  * Write data to the socket.
  *
@@ -218,11 +237,18 @@ class CakeSocket extends Object {
 		}
 
 		if (!feof($this->connection)) {
-			return fread($this->connection, $length);
+			$buffer = fread($this->connection, $length);
+			$info = stream_get_meta_data($this->connection);
+			if ($info['timed_out']) {
+				$this->setLastError(E_WARNING, __('Connection timed out', true));
+				return false;
+			}
+			return $buffer;
 		} else {
 			return false;
 		}
 	}
+
 /**
  * Abort socket operation.
  *
@@ -231,6 +257,7 @@ class CakeSocket extends Object {
  */
 	function abort() {
 	}
+
 /**
  * Disconnect the socket from the current connection.
  *
@@ -249,6 +276,7 @@ class CakeSocket extends Object {
 		}
 		return !$this->connected;
 	}
+
 /**
  * Destructor, used to disconnect from current connection.
  *
@@ -257,6 +285,7 @@ class CakeSocket extends Object {
 	function __destruct() {
 		$this->disconnect();
 	}
+
 /**
  * Resets the state of this Socket instance to it's initial state (before Object::__construct got executed)
  *
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index 5ff5ec320..c0206f2fa 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Class collections.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Class Collections.
  *
@@ -35,6 +37,7 @@
  * @subpackage    cake.cake.libs
  */
 class ClassRegistry {
+
 /**
  * Names of classes with their objects.
  *
@@ -42,6 +45,7 @@ class ClassRegistry {
  * @access private
  */
 	var $__objects = array();
+
 /**
  * Names of class names mapped to the object in the registry.
  *
@@ -49,6 +53,7 @@ class ClassRegistry {
  * @access private
  */
 	var $__map = array();
+
 /**
  * Default constructor parameter settings, indexed by type
  *
@@ -56,6 +61,7 @@ class ClassRegistry {
  * @access private
  */
 	var $__config = array();
+
 /**
  * Return a singleton instance of the ClassRegistry.
  *
@@ -69,16 +75,17 @@ class ClassRegistry {
 		}
 		return $instance[0];
 	}
+
 /**
  * Loads a class, registers the object in the registry and returns instance of the object.
  *
  * Examples
  * Simple Use: Get a Post model instance ```ClassRegistry::init('Post');```
- * 
+ *
  * Exapanded: ```array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry', 'type' => 'TypeOfClass');```
- * 
+ *
  * Model Classes can accept optional ```array('id' => $id, 'table' => $table, 'ds' => $ds, 'alias' => $alias);```
- * 
+ *
  * When $class is a numeric keyed array, multiple class instances will be stored in the registry,
  *  no instance of the object will be returned
  * {{{
@@ -169,6 +176,7 @@ class ClassRegistry {
 		}
 		return ${$class};
 	}
+
 /**
  * Add $object to the registry, associating it with the name $key.
  *
@@ -187,6 +195,7 @@ class ClassRegistry {
 		}
 		return false;
 	}
+
 /**
  * Remove object which corresponds to given key.
  *
@@ -202,6 +211,7 @@ class ClassRegistry {
 			unset($_this->__objects[$key]);
 		}
 	}
+
 /**
  * Returns true if given key is present in the ClassRegistry.
  *
@@ -220,6 +230,7 @@ class ClassRegistry {
 		}
 		return false;
 	}
+
 /**
  * Get all keys from the registry.
  *
@@ -231,6 +242,7 @@ class ClassRegistry {
 		$_this =& ClassRegistry::getInstance();
 		return array_keys($_this->__objects);
 	}
+
 /**
  * Return object which corresponds to given key.
  *
@@ -253,6 +265,7 @@ class ClassRegistry {
 		}
 		return $return;
 	}
+
 /**
  * Sets the default constructor parameter for an object type
  *
@@ -277,6 +290,7 @@ class ClassRegistry {
 		}
 		$_this->__config[$type] = $param;
 	}
+
 /**
  * Checks to see if $alias is a duplicate $class Object
  *
@@ -297,6 +311,7 @@ class ClassRegistry {
 		}
 		return $duplicate;
 	}
+
 /**
  * Add a key name pair to the registry to map name to class in the registry.
  *
@@ -313,6 +328,7 @@ class ClassRegistry {
 			$_this->__map[$key] = $name;
 		}
 	}
+
 /**
  * Get all keys from the map in the registry.
  *
@@ -324,6 +340,7 @@ class ClassRegistry {
 		$_this =& ClassRegistry::getInstance();
 		return array_keys($_this->__map);
 	}
+
 /**
  * Return the name of a class in the registry.
  *
@@ -337,6 +354,7 @@ class ClassRegistry {
 			return $this->__map[$key];
 		}
 	}
+
 /**
  * Flushes all objects from the ClassRegistry.
  *
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 7fc6d3492..02f49bc9b 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Configuration class (singleton). Used for managing runtime configuration information.
  *
@@ -32,6 +34,7 @@
  * @link          http://book.cakephp.org/view/42/The-Configuration-Class
  */
 class Configure extends Object {
+
 /**
  * Current debug level.
  *
@@ -40,13 +43,7 @@ class Configure extends Object {
  * @access public
  */
 	var $debug = null;
-/**
- * Determines if $__objects cache should be written.
- *
- * @var boolean
- * @access private
- */
-	var $__cache = false;
+
 /**
  * Returns a singleton instance of the Configure class.
  *
@@ -56,11 +53,15 @@ class Configure extends Object {
 	function &getInstance($boot = true) {
 		static $instance = array();
 		if (!$instance) {
+			if (!class_exists('Set')) {
+				require LIBS . 'set.php';
+			}
 			$instance[0] =& new Configure();
 			$instance[0]->__loadBootstrap($boot);
 		}
 		return $instance[0];
 	}
+
 /**
  * Used to store a dynamic variable in the Configure instance.
  *
@@ -92,19 +93,15 @@ class Configure extends Object {
 			$config = array($config => $value);
 		}
 
-		foreach ($config as $names => $value) {
-			$name = $_this->__configVarNames($names);
-
-			switch (count($name)) {
-				case 3:
-					$_this->{$name[0]}[$name[1]][$name[2]] = $value;
-				break;
-				case 2:
-					$_this->{$name[0]}[$name[1]] = $value;
-				break;
-				case 1:
-					$_this->{$name[0]} = $value;
-				break;
+		foreach ($config as $name => $value) {
+			if (strpos($name, '.') === false) {
+				$_this->{$name} = $value;
+			} else {
+				$names = explode('.', $name, 2);
+				if (!isset($_this->{$names[0]})) {
+					$_this->{$names[0]} = array();
+				}
+				$_this->{$names[0]} = Set::insert($_this->{$names[0]}, $names[1], $value);
 			}
 		}
 
@@ -129,6 +126,7 @@ class Configure extends Object {
 			}
 		}
 	}
+
 /**
  * Used to read information stored in the Configure instance.
  *
@@ -154,27 +152,22 @@ class Configure extends Object {
 			}
 			return $_this->debug;
 		}
-		$name = $_this->__configVarNames($var);
 
-		switch (count($name)) {
-			case 3:
-				if (isset($_this->{$name[0]}[$name[1]][$name[2]])) {
-					return $_this->{$name[0]}[$name[1]][$name[2]];
-				}
-			break;
-			case 2:
-				if (isset($_this->{$name[0]}[$name[1]])) {
-					return $_this->{$name[0]}[$name[1]];
-				}
-			break;
-			case 1:
-				if (isset($_this->{$name[0]})) {
-					return $_this->{$name[0]};
-				}
-			break;
+		if (strpos($var, '.') !== false) {
+			$names = explode('.', $var, 2);
+			$var = $names[0];
 		}
-		return null;
+		if (!isset($_this->{$var})) {
+			return null;
+		}
+
+		if (!empty($names[1])) {
+			return Set::extract($_this->{$var}, $names[1]);
+		}
+
+		return $_this->{$var};
 	}
+
 /**
  * Used to delete a variable from the Configure instance.
  *
@@ -189,14 +182,16 @@ class Configure extends Object {
  */
 	function delete($var = null) {
 		$_this =& Configure::getInstance();
-		$name = $_this->__configVarNames($var);
 
-		if (count($name) > 1) {
-			unset($_this->{$name[0]}[$name[1]]);
-		} else {
-			unset($_this->{$name[0]});
+		if (strpos($var, '.') === false) {
+			unset($_this->{$var});
+			return;
 		}
+
+		$names = explode('.', $var, 2);
+		$_this->{$names[0]} = Set::remove($_this->{$names[0]}, $names[1]);
 	}
+
 /**
  * Loads a file from app/config/configure_file.php.
  * Config file variables should be formated like:
@@ -241,6 +236,7 @@ class Configure extends Object {
 		}
 		return Configure::write($config);
 	}
+
 /**
  * Used to determine the current version of CakePHP.
  *
@@ -259,6 +255,7 @@ class Configure extends Object {
 		}
 		return $_this->Cake['version'];
 	}
+
 /**
  * Used to write a config file to disk.
  *
@@ -297,6 +294,7 @@ class Configure extends Object {
 		}
 		Configure::__writeConfig($content, $name, $write);
 	}
+
 /**
  * Creates a cached version of a configuration file.
  * Appends values passed from Configure::store() to the cached file
@@ -332,22 +330,7 @@ class Configure extends Object {
 			}
 		}
 	}
-/**
- * Checks $name for dot notation to create dynamic Configure::$var as an array when needed.
- *
- * @param mixed $name Name to split
- * @return array Name separated in items through dot notation
- * @access private
- */
-	function __configVarNames($name) {
-		if (is_string($name)) {
-			if (strpos($name, ".")) {
-				return explode(".", $name);
-			}
-			return array($name);
-		}
-		return $name;
-	}
+
 /**
  * @deprecated
  * @see App::objects()
@@ -355,6 +338,7 @@ class Configure extends Object {
 	function listObjects($type, $path = null, $cache = true) {
 		return App::objects($type, $path, $cache);
 	}
+
 /**
  * @deprecated
  * @see App::core()
@@ -362,6 +346,7 @@ class Configure extends Object {
 	function corePaths($type = null) {
 		return App::core($type);
 	}
+
 /**
  * @deprecated
  * @see App::build()
@@ -369,6 +354,7 @@ class Configure extends Object {
 	function buildPaths($paths) {
 		return App::build($paths);
 	}
+
 /**
  * Loads app/config/bootstrap.php.
  * If the alternative paths are set in this file
@@ -414,37 +400,32 @@ class Configure extends Object {
 				}
 
 				if (Cache::config('_cake_core_') === false) {
-					Cache::config('_cake_core_', array_merge($cache['settings'], array(
+					Cache::config('_cake_core_', array_merge((array)$cache['settings'], array(
 						'prefix' => $prefix . 'cake_core_', 'path' => $path . DS . 'persistent' . DS,
 						'serialize' => true, 'duration' => $duration
 					)));
 				}
 
 				if (Cache::config('_cake_model_') === false) {
-					Cache::config('_cake_model_', array_merge($cache['settings'], array(
+					Cache::config('_cake_model_', array_merge((array)$cache['settings'], array(
 						'prefix' => $prefix . 'cake_model_', 'path' => $path . DS . 'models' . DS,
 						'serialize' => true, 'duration' => $duration
 					)));
 				}
 				Cache::config('default');
 			}
-			App::build(compact(
-				'models', 'views', 'controllers', 'helpers', 'components',
-				'behaviors', 'plugins', 'vendors', 'locales', 'shells'
-			));
-		}
-	}
-/**
- * Caches the object map when the instance of the Configure class is destroyed
- *
- * @access public
- */
-	function __destruct() {
-		if ($this->__cache) {
-			Cache::write('object_map', array_filter($this->__objects), '_cake_core_');
+			if (App::path('controllers') == array()) {
+				App::build(array(
+					'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths,
+					'helpers' => $helperPaths, 'components' => $componentPaths, 'behaviors' => $behaviorPaths,
+					'plugins' => $pluginPaths, 'vendors' => $vendorPaths, 'locales' => $localePaths,
+					'shells' => $shellPaths
+				));
+			}
 		}
 	}
 }
+
 /**
  * Class and file loader.
  *
@@ -454,6 +435,7 @@ class Configure extends Object {
  * @subpackage    cake.cake.libs
  */
 class App extends Object {
+
 /**
  * List of object types and their properties
  *
@@ -481,6 +463,7 @@ class App extends Object {
  * @access public
  */
 	var $models = array();
+
 /**
  * List of additional path(s) where behavior files reside.
  *
@@ -488,6 +471,7 @@ class App extends Object {
  * @access public
  */
 	var $behaviors = array();
+
 /**
  * List of additional path(s) where controller files reside.
  *
@@ -495,6 +479,7 @@ class App extends Object {
  * @access public
  */
 	var $controllers = array();
+
 /**
  * List of additional path(s) where component files reside.
  *
@@ -502,6 +487,7 @@ class App extends Object {
  * @access public
  */
 	var $components = array();
+
 /**
  * List of additional path(s) where view files reside.
  *
@@ -509,6 +495,7 @@ class App extends Object {
  * @access public
  */
 	var $views = array();
+
 /**
  * List of additional path(s) where helper files reside.
  *
@@ -516,6 +503,7 @@ class App extends Object {
  * @access public
  */
 	var $helpers = array();
+
 /**
  * List of additional path(s) where plugins reside.
  *
@@ -523,6 +511,7 @@ class App extends Object {
  * @access public
  */
 	var $plugins = array();
+
 /**
  * List of additional path(s) where vendor packages reside.
  *
@@ -530,6 +519,7 @@ class App extends Object {
  * @access public
  */
 	var $vendors = array();
+
 /**
  * List of additional path(s) where locale files reside.
  *
@@ -537,6 +527,7 @@ class App extends Object {
  * @access public
  */
 	var $locales = array();
+
 /**
  * List of additional path(s) where console shell files reside.
  *
@@ -544,6 +535,7 @@ class App extends Object {
  * @access public
  */
 	var $shells = array();
+
 /**
  * Paths to search for files.
  *
@@ -551,6 +543,7 @@ class App extends Object {
  * @access public
  */
 	var $search = array();
+
 /**
  * Whether or not to return the file that is loaded.
  *
@@ -558,6 +551,7 @@ class App extends Object {
  * @access public
  */
 	var $return = false;
+
 /**
  * Determines if $__maps and $__paths cache should be written.
  *
@@ -565,6 +559,7 @@ class App extends Object {
  * @access private
  */
 	var $__cache = false;
+
 /**
  * Holds key/value pairs of $type => file path.
  *
@@ -572,6 +567,7 @@ class App extends Object {
  * @access private
  */
 	var $__map = array();
+
 /**
  * Holds paths for deep searching of files.
  *
@@ -579,6 +575,7 @@ class App extends Object {
  * @access private
  */
 	var $__paths = array();
+
 /**
  * Holds loaded files.
  *
@@ -586,6 +583,7 @@ class App extends Object {
  * @access private
  */
 	var $__loaded = array();
+
 /**
  * Holds and key => value array of object types.
  *
@@ -593,6 +591,7 @@ class App extends Object {
  * @access private
  */
 	var $__objects = array();
+
 /**
  * Used to read information stored path
  *
@@ -610,6 +609,7 @@ class App extends Object {
 		}
 		return $_this->{$type};
 	}
+
 /**
  * Build path references. Merges the supplied $paths
  * with the base paths and the default core paths.
@@ -668,6 +668,7 @@ class App extends Object {
 			}
 		}
 	}
+
 /**
  * Returns a key/value list of all paths where core libs are found.
  * Passing $type only returns the values for a given value of $key.
@@ -702,6 +703,7 @@ class App extends Object {
 					$paths['cake'][] = $cake;
 					$paths['libs'][] = $libs;
 					$paths['models'][] = $libs . 'model' . DS;
+					$paths['datasources'][] = $libs . 'model' . DS . 'datasources' . DS;
 					$paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS;
 					$paths['controllers'][] = $libs . 'controller' . DS;
 					$paths['components'][] = $libs . 'controller' . DS . 'components' . DS;
@@ -719,6 +721,7 @@ class App extends Object {
 		}
 		return $paths;
 	}
+
 /**
  * Returns an index of objects of the given type, with the physical path to each object.
  *
@@ -744,7 +747,7 @@ class App extends Object {
 			$_this->__objects = Cache::read('object_map', '_cake_core_');
 		}
 
-		if (empty($_this->__objects) || !isset($_this->__objects[$type]) || $cache !== true) {
+		if (!isset($_this->__objects[$name]) || $cache !== true) {
 			$types = $_this->types;
 
 			if (!isset($types[$type])) {
@@ -772,15 +775,16 @@ class App extends Object {
 					$objects[$key] = Inflector::camelize($value);
 				}
 			}
-			if ($cache === true && !empty($objects)) {
-				$_this->__objects[$name] = $objects;
+
+			if ($cache === true) {
 				$_this->__cache = true;
-			} else {
-				return $objects;
 			}
+			$_this->__objects[$name] = $objects;
 		}
+
 		return $_this->__objects[$name];
 	}
+
 /**
  * Finds classes based on $name or specific file(s) to search.
  *
@@ -840,7 +844,7 @@ class App extends Object {
 					}
 				}
 
-				if (!App::import($tempType, $plugin . $class)) {
+				if (!App::import($tempType, $plugin . $class, $parent)) {
 					return false;
 				}
 			}
@@ -862,7 +866,7 @@ class App extends Object {
 		if ($name != null && !class_exists($name . $ext['class'])) {
 			if ($load = $_this->__mapped($name . $ext['class'], $type, $plugin)) {
 				if ($_this->__load($load)) {
-					$_this->__overload($type, $name . $ext['class']);
+					$_this->__overload($type, $name . $ext['class'], $parent);
 
 					if ($_this->return) {
 						$value = include $load;
@@ -904,7 +908,7 @@ class App extends Object {
 			if ($directory !== null) {
 				$_this->__cache = true;
 				$_this->__map($directory . $file, $name . $ext['class'], $type, $plugin);
-				$_this->__overload($type, $name . $ext['class']);
+				$_this->__overload($type, $name . $ext['class'], $parent);
 
 				if ($_this->return) {
 					$value = include $directory . $file;
@@ -916,6 +920,7 @@ class App extends Object {
 		}
 		return true;
 	}
+
 /**
  * Returns a single instance of App.
  *
@@ -930,6 +935,7 @@ class App extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Locates the $file in $__paths, searches recursively.
  *
@@ -961,12 +967,14 @@ class App extends Object {
 				}
 				continue;
 			}
+
 			if (!isset($this->__paths[$path])) {
 				if (!class_exists('Folder')) {
 					require LIBS . 'folder.php';
 				}
 				$Folder =& new Folder();
-				$directories = $Folder->tree($path, false, 'dir');
+				$directories = $Folder->tree($path, array('.svn', 'tests', 'templates'), 'dir');
+				sort($directories);
 				$this->__paths[$path] = $directories;
 			}
 
@@ -978,6 +986,7 @@ class App extends Object {
 		}
 		return null;
 	}
+
 /**
  * Attempts to load $file.
  *
@@ -1001,6 +1010,7 @@ class App extends Object {
 		}
 		return false;
 	}
+
 /**
  * Maps the $name to the $file.
  *
@@ -1017,6 +1027,7 @@ class App extends Object {
 			$this->__map[$type][$name] = $file;
 		}
 	}
+
 /**
  * Returns a file's complete path.
  *
@@ -1039,6 +1050,7 @@ class App extends Object {
 		}
 		return false;
 	}
+
 /**
  * Used to overload objects as needed.
  *
@@ -1046,11 +1058,12 @@ class App extends Object {
  * @param string $name Class name to overload
  * @access private
  */
-	function __overload($type, $name) {
-		if (($type === 'Model' || $type === 'Helper') && strtolower($name) != 'schema') {
+	function __overload($type, $name, $parent) {
+		if (($type === 'Model' || $type === 'Helper') && $parent !== false) {
 			Overloadable::overload($name);
 		}
 	}
+
 /**
  * Loads parent classes based on $type.
  * Returns a prefix or suffix needed for loading files.
@@ -1075,10 +1088,10 @@ class App extends Object {
 		switch ($load) {
 			case 'model':
 				if (!class_exists('Model')) {
-					App::import('Core', 'Model', false, App::core('models'));
+					require LIBS . 'model' . DS . 'model.php';
 				}
 				if (!class_exists('AppModel')) {
-					App::import($type, 'AppModel', false, App::path('models'));
+					App::import($type, 'AppModel', false);
 				}
 				if ($plugin) {
 					if (!class_exists($plugin . 'AppModel')) {
@@ -1135,6 +1148,7 @@ class App extends Object {
 		}
 		return array('class' => null, 'suffix' => null, 'path' => null);
 	}
+
 /**
  * Returns default search paths.
  *
@@ -1144,36 +1158,17 @@ class App extends Object {
  */
 	function __paths($type) {
 		$type = strtolower($type);
+		$paths = array();
 
 		if ($type === 'core') {
-			$path = App::core();
-			$paths = array();
-
-			foreach ($path as $key => $value) {
-				$count = count($key);
-				for ($i = 0; $i < $count; $i++) {
-					$paths[] = $path[$key][$i];
-				}
-			}
-			return $paths;
+			return App::core('libs');
 		}
 		if ($paths = App::path($type .'s')) {
 			return $paths;
 		}
-
-		switch ($type) {
-			case 'plugin':
-				return array(APP . 'plugins' . DS);
-			case 'vendor':
-				return array(APP . 'vendors' . DS, VENDORS, APP . 'plugins' . DS);
-			case 'controller':
-				return array(APP . 'controllers' . DS, APP);
-			case 'model':
-				return array(APP . 'models' . DS, APP);
-			case 'view':
-				return array(APP . 'views' . DS);
-		}
+		return $paths;
 	}
+
 /**
  * Removes file location from map if the file has been deleted.
  *
@@ -1190,6 +1185,7 @@ class App extends Object {
 			unset($this->__map[$type][$name]);
 		}
 	}
+
 /**
  * Returns an array of filenames of PHP files in the given directory.
  *
@@ -1222,6 +1218,7 @@ class App extends Object {
 		}
 		return $items;
 	}
+
 /**
  * Object destructor.
  *
@@ -1236,6 +1233,7 @@ class App extends Object {
 			unset($this->__paths[rtrim($core[0], DS)]);
 			Cache::write('dir_map', array_filter($this->__paths), '_cake_core_');
 			Cache::write('file_map', array_filter($this->__map), '_cake_core_');
+			Cache::write('object_map', $this->__objects, '_cake_core_');
 		}
 	}
 }
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index e791fa9fc..62e03c61e 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * This is a placeholder class.
  * Create the same file in app/app_controller.php
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index c40571cda..27731bbdf 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -21,6 +22,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Handler for Controller::$components
  *
@@ -29,6 +31,7 @@
  * @link          http://book.cakephp.org/view/62/Components
  */
 class Component extends Object {
+
 /**
  * Contains various controller variable information (plugin, name, base).
  *
@@ -36,6 +39,7 @@ class Component extends Object {
  * @access private
  */
 	var $__controllerVars = array('plugin' => null, 'name' => null, 'base' => null);
+
 /**
  * List of loaded components.
  *
@@ -43,6 +47,7 @@ class Component extends Object {
  * @access protected
  */
 	var $_loaded = array();
+
 /**
  * List of components attached directly to the controller, which callbacks
  * should be executed on.
@@ -51,6 +56,7 @@ class Component extends Object {
  * @access protected
  */
 	var $_primary = array();
+
 /**
  * Settings for loaded components.
  *
@@ -58,6 +64,7 @@ class Component extends Object {
  * @access private
  **/
 	var $__settings = array();
+
 /**
  * Used to initialize the components for current controller.
  *
@@ -76,6 +83,7 @@ class Component extends Object {
 
 		$this->_loadComponents($controller);
 	}
+
 /**
  * Called before the Controller::beforeFilter().
  *
@@ -97,6 +105,7 @@ class Component extends Object {
 			}
 		}
 	}
+
 /**
  * Called after the Controller::beforeFilter() and before the controller action
  *
@@ -113,6 +122,7 @@ class Component extends Object {
 			}
 		}
 	}
+
 /**
  * Called after the Controller::beforeRender(), after the view class is loaded, and before the
  * Controller::render()
@@ -129,6 +139,7 @@ class Component extends Object {
 			}
 		}
 	}
+
 /**
  * Called before Controller::redirect().
  *
@@ -152,6 +163,7 @@ class Component extends Object {
 		}
 		return $response;
 	}
+
 /**
  * Called after Controller::render() and before the output is printed to the browser.
  *
@@ -167,6 +179,7 @@ class Component extends Object {
 			}
 		}
 	}
+
 /**
  * Loads components used by this component.
  *
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index d68c61f03..d519c227a 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Access Control List factory class.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Access Control List factory class.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.controller.components
  */
 class AclComponent extends Object {
+
 /**
  * Instance of an ACL class
  *
@@ -40,6 +43,7 @@ class AclComponent extends Object {
  * @access protected
  */
 	var $_Instance = null;
+
 /**
  * Constructor. Will return an instance of the correct ACL class.
  *
@@ -59,6 +63,7 @@ class AclComponent extends Object {
 		$this->_Instance =& new $name();
 		$this->_Instance->initialize($this);
 	}
+
 /**
  * Startup is not used
  *
@@ -69,6 +74,7 @@ class AclComponent extends Object {
 	function startup(&$controller) {
 		return true;
 	}
+
 /**
  * Empty class defintion, to be overridden in subclasses.
  *
@@ -76,6 +82,7 @@ class AclComponent extends Object {
  */
 	function _initACL() {
 	}
+
 /**
  * Pass-thru function for ACL check instance.
  *
@@ -88,6 +95,7 @@ class AclComponent extends Object {
 	function check($aro, $aco, $action = "*") {
 		return $this->_Instance->check($aro, $aco, $action);
 	}
+
 /**
  * Pass-thru function for ACL allow instance.
  *
@@ -100,6 +108,7 @@ class AclComponent extends Object {
 	function allow($aro, $aco, $action = "*") {
 		return $this->_Instance->allow($aro, $aco, $action);
 	}
+
 /**
  * Pass-thru function for ACL deny instance.
  *
@@ -112,6 +121,7 @@ class AclComponent extends Object {
 	function deny($aro, $aco, $action = "*") {
 		return $this->_Instance->deny($aro, $aco, $action);
 	}
+
 /**
  * Pass-thru function for ACL inherit instance.
  *
@@ -124,6 +134,7 @@ class AclComponent extends Object {
 	function inherit($aro, $aco, $action = "*") {
 		return $this->_Instance->inherit($aro, $aco, $action);
 	}
+
 /**
  * Pass-thru function for ACL grant instance.
  *
@@ -136,6 +147,7 @@ class AclComponent extends Object {
 	function grant($aro, $aco, $action = "*") {
 		return $this->_Instance->grant($aro, $aco, $action);
 	}
+
 /**
  * Pass-thru function for ACL grant instance.
  *
@@ -149,6 +161,7 @@ class AclComponent extends Object {
 		return $this->_Instance->revoke($aro, $aco, $action);
 	}
 }
+
 /**
  * Access Control List abstract class. Not to be instantiated.
  * Subclasses of this class are used by AclComponent to perform ACL checks in Cake.
@@ -158,6 +171,7 @@ class AclComponent extends Object {
  * @abstract
  */
 class AclBase extends Object {
+
 /**
  * This class should never be instantiated, just subclassed.
  *
@@ -168,6 +182,7 @@ class AclBase extends Object {
 			return NULL;
 		}
 	}
+
 /**
  * Empty method to be overridden in subclasses
  *
@@ -178,6 +193,7 @@ class AclBase extends Object {
  */
 	function check($aro, $aco, $action = "*") {
 	}
+
 /**
  * Empty method to be overridden in subclasses
  *
@@ -187,6 +203,7 @@ class AclBase extends Object {
 	function initialize(&$component) {
 	}
 }
+
 /**
  * In this file you can extend the AclBase.
  *
@@ -194,6 +211,7 @@ class AclBase extends Object {
  * @subpackage    cake.cake.libs.model
  */
 class DbAcl extends AclBase {
+
 /**
  * Constructor
  *
@@ -206,6 +224,7 @@ class DbAcl extends AclBase {
 		$this->Aro =& ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
 		$this->Aco =& ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco'));
 	}
+
 /**
  * Enter description here...
  *
@@ -217,6 +236,7 @@ class DbAcl extends AclBase {
 		$component->Aro = $this->Aro;
 		$component->Aco = $this->Aco;
 	}
+
 /**
  * Checks if the given $aro has access to action $action in $aco
  *
@@ -306,6 +326,7 @@ class DbAcl extends AclBase {
 		}
 		return false;
 	}
+
 /**
  * Allow $aro to have access to action $actions in $aco
  *
@@ -357,6 +378,7 @@ class DbAcl extends AclBase {
 		}
 		return ($this->Aro->Permission->save($save) !== false);
 	}
+
 /**
  * Deny access for $aro to action $action in $aco
  *
@@ -369,6 +391,7 @@ class DbAcl extends AclBase {
 	function deny($aro, $aco, $action = "*") {
 		return $this->allow($aro, $aco, $action, -1);
 	}
+
 /**
  * Let access for $aro to action $action in $aco be inherited
  *
@@ -381,6 +404,7 @@ class DbAcl extends AclBase {
 	function inherit($aro, $aco, $action = "*") {
 		return $this->allow($aro, $aco, $action, 0);
 	}
+
 /**
  * Allow $aro to have access to action $actions in $aco
  *
@@ -394,6 +418,7 @@ class DbAcl extends AclBase {
 	function grant($aro, $aco, $action = "*") {
 		return $this->allow($aro, $aco, $action);
 	}
+
 /**
  * Deny access for $aro to action $action in $aco
  *
@@ -407,6 +432,7 @@ class DbAcl extends AclBase {
 	function revoke($aro, $aco, $action = "*") {
 		return $this->deny($aro, $aco, $action);
 	}
+
 /**
  * Get an array of access-control links between the given Aro and Aco
  *
@@ -433,6 +459,7 @@ class DbAcl extends AclBase {
 			)))
 		);
 	}
+
 /**
  * Get the keys used in an ACO
  *
@@ -451,6 +478,7 @@ class DbAcl extends AclBase {
 		return $newKeys;
 	}
 }
+
 /**
  * In this file you can extend the AclBase.
  *
@@ -458,6 +486,7 @@ class DbAcl extends AclBase {
  * @subpackage    cake.cake.libs.model.iniacl
  */
 class IniAcl extends AclBase {
+
 /**
  * Array with configuration, parsed from ini file
  *
@@ -465,12 +494,14 @@ class IniAcl extends AclBase {
  * @access public
  */
 	var $config = null;
+
 /**
  * The constructor must be overridden, as AclBase is abstract.
  *
  */
 	function __construct() {
 	}
+
 /**
  * Main ACL check function. Checks to see if the ARO (access request object) has access to the ACO (access control object).
  * Looks at the acl.ini.php file for permissions (see instructions in /config/acl.ini.php).
@@ -528,6 +559,7 @@ class IniAcl extends AclBase {
 		}
 		return false;
 	}
+
 /**
  * Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly.
  *
@@ -570,6 +602,7 @@ class IniAcl extends AclBase {
 
 		return $iniSetting;
 	}
+
 /**
  * Removes trailing spaces on all array elements (to prepare for searching)
  *
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index a68e5b6f2..4f2a6b6dd 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -37,6 +37,7 @@ App::import(array('Router', 'Security'));
  * @subpackage    cake.cake.libs.controller.components
  */
 class AuthComponent extends Object {
+
 /**
  * Maintains current user login state.
  *
@@ -44,6 +45,7 @@ class AuthComponent extends Object {
  * @access private
  */
 	var $_loggedIn = false;
+
 /**
  * Other components utilized by AuthComponent
  *
@@ -51,6 +53,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $components = array('Session', 'RequestHandler');
+
 /**
  * A reference to the object used for authentication
  *
@@ -58,6 +61,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $authenticate = null;
+
 /**
  * The name of the component to use for Authorization or set this to
  * 'controller' will validate against Controller::isAuthorized()
@@ -70,6 +74,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $authorize = false;
+
 /**
  * The name of an optional view element to render when an Ajax request is made
  * with an invalid or expired session
@@ -78,6 +83,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $ajaxLogin = null;
+
 /**
  * The name of the model that represents users which will be authenticated.  Defaults to 'User'.
  *
@@ -85,6 +91,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $userModel = 'User';
+
 /**
  * Additional query conditions to use when looking up and authenticating users,
  * i.e. array('User.is_active' => 1).
@@ -93,6 +100,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $userScope = array();
+
 /**
  * Allows you to specify non-default login name and password fields used in
  * $userModel, i.e. array('username' => 'login_name', 'password' => 'passwd').
@@ -101,6 +109,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $fields = array('username' => 'username', 'password' => 'password');
+
 /**
  * The session key name where the record of the current user is stored.  If
  * unspecified, it will be "Auth.{$userModel name}".
@@ -109,6 +118,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $sessionKey = null;
+
 /**
  * If using action-based access control, this defines how the paths to action
  * ACO nodes is computed.  If, for example, all controller nodes are nested
@@ -119,6 +129,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $actionPath = null;
+
 /**
  * A URL (defined as a string or array) to the controller action that handles
  * logins.
@@ -127,6 +138,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $loginAction = null;
+
 /**
  * Normally, if a user is redirected to the $loginAction page, the location they
  * were redirected from will be stored in the session so that they can be
@@ -137,6 +149,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $loginRedirect = null;
+
 /**
  * The the default action to redirect to after the user is logged out.  While AuthComponent does
  * not handle post-logout redirection, a redirect URL will be returned from AuthComponent::logout().
@@ -148,6 +161,7 @@ class AuthComponent extends Object {
  * @see AuthComponent::logout()
  */
 	var $logoutRedirect = null;
+
 /**
  * The name of model or model object, or any other object has an isAuthorized method.
  *
@@ -155,6 +169,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $object = null;
+
 /**
  * Error to display when user login fails.  For security purposes, only one error is used for all
  * login failures, so as not to expose information on why the login failed.
@@ -163,6 +178,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $loginError = null;
+
 /**
  * Error to display when user attempts to access an object or action to which they do not have
  * acccess.
@@ -171,6 +187,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $authError = null;
+
 /**
  * Determines whether AuthComponent will automatically redirect and exit if login is successful.
  *
@@ -178,6 +195,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $autoRedirect = true;
+
 /**
  * Controller actions for which user validation is not required.
  *
@@ -186,6 +204,7 @@ class AuthComponent extends Object {
  * @see AuthComponent::allow()
  */
 	var $allowedActions = array();
+
 /**
  * Maps actions to CRUD operations.  Used for controller-based validation ($validate = 'controller').
  *
@@ -200,6 +219,7 @@ class AuthComponent extends Object {
 		'view'		=> 'read',
 		'remove'	=> 'delete'
 	);
+
 /**
  * Form data from Controller::$data
  *
@@ -207,6 +227,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $data = array();
+
 /**
  * Parameter data from Controller::$params
  *
@@ -214,6 +235,7 @@ class AuthComponent extends Object {
  * @access public
  */
 	var $params = array();
+
 /**
  * Method list for bound controller
  *
@@ -221,6 +243,7 @@ class AuthComponent extends Object {
  * @access protected
  */
 	var $_methods = array();
+
 /**
  * Initializes AuthComponent for use in the controller
  *
@@ -253,6 +276,7 @@ class AuthComponent extends Object {
 			Debugger::checkSessionKey();
 		}
 	}
+
 /**
  * Main execution method.  Handles redirecting of invalid users, and processing
  * of login form data.
@@ -407,6 +431,7 @@ class AuthComponent extends Object {
 		$controller->redirect($controller->referer(), null, true);
 		return false;
 	}
+
 /**
  * Attempts to introspect the correct values for object properties including
  * $userModel and $sessionKey.
@@ -437,6 +462,7 @@ class AuthComponent extends Object {
 		}
 		return true;
 	}
+
 /**
  * Determines whether the given user is authorized to perform an action.  The type of
  * authorization used is based on the value of AuthComponent::$authorize or the
@@ -529,6 +555,7 @@ class AuthComponent extends Object {
 		}
 		return $valid;
 	}
+
 /**
  * Get authorization type
  *
@@ -550,6 +577,7 @@ class AuthComponent extends Object {
 		}
 		return compact('type', 'object');
 	}
+
 /**
  * Takes a list of actions in the current controller for which authentication is not required, or
  * no parameters to allow all actions.
@@ -571,6 +599,7 @@ class AuthComponent extends Object {
 			$this->allowedActions = array_merge($this->allowedActions, $args);
 		}
 	}
+
 /**
  * Removes items from the list of allowed actions.
  *
@@ -591,6 +620,7 @@ class AuthComponent extends Object {
 		}
 		$this->allowedActions = array_values($this->allowedActions);
 	}
+
 /**
  * Maps action names to CRUD operations. Used for controller-based authentication.
  *
@@ -610,6 +640,7 @@ class AuthComponent extends Object {
 			}
 		}
 	}
+
 /**
  * Manually log-in a user with the given parameter data.  The $data provided can be any data
  * structure used to identify a user in AuthComponent::identify().  If $data is empty or not
@@ -636,6 +667,7 @@ class AuthComponent extends Object {
 		}
 		return $this->_loggedIn;
 	}
+
 /**
  * Logs a user out, and returns the login action to redirect to.
  *
@@ -651,6 +683,7 @@ class AuthComponent extends Object {
 		$this->_loggedIn = false;
 		return Router::normalize($this->logoutRedirect);
 	}
+
 /**
  * Get the current user from the session.
  *
@@ -674,6 +707,7 @@ class AuthComponent extends Object {
 			return null;
 		}
 	}
+
 /**
  * If no parameter is passed, gets the authentication redirect URL.
  *
@@ -697,6 +731,7 @@ class AuthComponent extends Object {
 		}
 		return Router::normalize($redir);
 	}
+
 /**
  * Validates a user against an abstract object.
  *
@@ -719,6 +754,7 @@ class AuthComponent extends Object {
 		}
 		return $this->Acl->check($user, $object, $action);
 	}
+
 /**
  * Returns the path to the ACO node bound to a controller/action.
  *
@@ -735,6 +771,7 @@ class AuthComponent extends Object {
 			$this->actionPath . $action
 		);
 	}
+
 /**
  * Returns a reference to the model object specified, and attempts
  * to load it if it is not found.
@@ -762,6 +799,7 @@ class AuthComponent extends Object {
 
 		return $model;
 	}
+
 /**
  * Identifies a user based on specific criteria.
  *
@@ -837,6 +875,7 @@ class AuthComponent extends Object {
 		}
 		return null;
 	}
+
 /**
  * Hash any passwords found in $data using $userModel and $fields['password']
  *
@@ -856,6 +895,7 @@ class AuthComponent extends Object {
 		}
 		return $data;
 	}
+
 /**
  * Hash a password with the application's salt value (as defined with Configure::write('Security.salt');
  *
@@ -866,6 +906,7 @@ class AuthComponent extends Object {
 	function password($password) {
 		return Security::hash($password, null, true);
 	}
+
 /**
  * Component shutdown.  If user is logged in, wipe out redirect.
  *
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 524453c96..3067da9d9 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,10 +25,12 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Load Security class
  */
 App::import('Core', 'Security');
+
 /**
  * Cookie Component.
  *
@@ -38,6 +41,7 @@ App::import('Core', 'Security');
  *
  */
 class CookieComponent extends Object {
+
 /**
  * The name of the cookie.
  *
@@ -48,6 +52,7 @@ class CookieComponent extends Object {
  * @access public
  */
 	var $name = 'CakeCookie';
+
 /**
  * The time a cookie will remain valid.
  *
@@ -60,6 +65,7 @@ class CookieComponent extends Object {
  * @access public
  */
 	var $time = null;
+
 /**
  * Cookie path.
  *
@@ -75,6 +81,7 @@ class CookieComponent extends Object {
  * @access public
  */
 	var $path = '/';
+
 /**
  * Domain path.
  *
@@ -90,6 +97,7 @@ class CookieComponent extends Object {
  * @access public
  */
 	var $domain = '';
+
 /**
  * Secure HTTPS only cookie.
  *
@@ -103,6 +111,7 @@ class CookieComponent extends Object {
  * @access public
  */
 	var $secure = false;
+
 /**
  * Encryption key.
  *
@@ -113,6 +122,7 @@ class CookieComponent extends Object {
  * @access protected
  */
 	var $key = null;
+
 /**
  * Values stored in the cookie.
  *
@@ -123,6 +133,7 @@ class CookieComponent extends Object {
  * @access private
  */
 	var $__values = array();
+
 /**
  * Type of encryption to use.
  *
@@ -134,6 +145,7 @@ class CookieComponent extends Object {
  * @todo add additional encryption methods
  */
 	var $__type = 'cipher';
+
 /**
  * Used to reset cookie time if $expire is passed to CookieComponent::write()
  *
@@ -141,6 +153,7 @@ class CookieComponent extends Object {
  * @access private
  */
 	var $__reset = null;
+
 /**
  * Expire time of the cookie
  *
@@ -150,6 +163,7 @@ class CookieComponent extends Object {
  * @access private
  */
 	var $__expires = 0;
+
 /**
  * Main execution method.
  *
@@ -160,6 +174,7 @@ class CookieComponent extends Object {
 		$this->key = Configure::read('Security.salt');
 		$this->_set($settings);
 	}
+
 /**
  * Start CookieComponent for use in the controller
  *
@@ -172,6 +187,7 @@ class CookieComponent extends Object {
 			$this->__values = $this->__decrypt($_COOKIE[$this->name]);
 		}
 	}
+
 /**
  * Write a value to the $_COOKIE[$key];
  *
@@ -203,10 +219,10 @@ class CookieComponent extends Object {
 
 			if (count($name) > 1) {
 				$this->__values[$name[0]][$name[1]] = $value;
-				$this->__write("[".$name[0]."][".$name[1]."]", $value);
+				$this->__write("[" . $name[0] . "][" . $name[1] . "]", $value);
 			} else {
 				$this->__values[$name[0]] = $value;
-				$this->__write("[".$name[0]."]", $value);
+				$this->__write("[" . $name[0] . "]", $value);
 			}
 		} else {
 			foreach ($key as $names => $value) {
@@ -214,15 +230,16 @@ class CookieComponent extends Object {
 
 				if (count($name) > 1) {
 					$this->__values[$name[0]][$name[1]] = $value;
-					$this->__write("[".$name[0]."][".$name[1]."]", $value);
+					$this->__write("[" . $name[0] . "][" . $name[1] . "]", $value);
 				} else {
 					$this->__values[$name[0]] = $value;
-					$this->__write("[".$name[0]."]", $value);
+					$this->__write("[" . $name[0] . "]", $value);
 				}
 			}
 		}
 		$this->__encrypted = true;
 	}
+
 /**
  * Read the value of the $_COOKIE[$key];
  *
@@ -258,6 +275,7 @@ class CookieComponent extends Object {
 			return null;
 		}
 	}
+
 /**
  * Delete a cookie value
  *
@@ -278,21 +296,22 @@ class CookieComponent extends Object {
 		$name = $this->__cookieVarNames($key);
 		if (count($name) > 1) {
 			if (isset($this->__values[$name[0]])) {
-				$this->__delete("[".$name[0]."][".$name[1]."]");
+				$this->__delete("[" . $name[0] . "][" . $name[1] . "]");
 				unset($this->__values[$name[0]][$name[1]]);
 			}
 		} else {
 			if (isset($this->__values[$name[0]])) {
 				if (is_array($this->__values[$name[0]])) {
 					foreach ($this->__values[$name[0]] as $key => $value) {
-						$this->__delete("[".$name[0]."][".$key."]");
+						$this->__delete("[" . $name[0] . "][" . $key . "]");
 					}
 				}
-				$this->__delete("[".$name[0]."]");
+				$this->__delete("[" . $name[0] . "]");
 				unset($this->__values[$name[0]]);
 			}
 		}
 	}
+
 /**
  * Destroy current cookie
  *
@@ -318,6 +337,7 @@ class CookieComponent extends Object {
 			$this->__delete("[$name]");
 		}
 	}
+
 /**
  * Will allow overriding default encryption method.
  *
@@ -328,6 +348,7 @@ class CookieComponent extends Object {
 	function type($type = 'cipher') {
 		$this->__type = 'cipher';
 	}
+
 /**
  * Set the expire time for a session variable.
  *
@@ -353,6 +374,7 @@ class CookieComponent extends Object {
 		}
 		return $this->__expires = strtotime($expires, $now);
 	}
+
 /**
  * Set cookie
  *
@@ -368,6 +390,7 @@ class CookieComponent extends Object {
 			$this->__reset = null;
 		}
 	}
+
 /**
  * Sets a cookie expire time to remove cookie value
  *
@@ -377,6 +400,7 @@ class CookieComponent extends Object {
 	function __delete($name) {
 		setcookie($this->name . $name, '', time() - 42000, $this->path, $this->domain, $this->secure);
 	}
+
 /**
  * Encrypts $value using var $type method in Security class
  *
@@ -395,6 +419,7 @@ class CookieComponent extends Object {
 		}
 		return($value);
 	}
+
 /**
  * Decrypts $value using var $type method in Security class
  *
@@ -449,6 +474,7 @@ class CookieComponent extends Object {
 		}
 		return $name;
 	}
+
 /**
  * Implode method to keep keys are multidimensional arrays
  *
@@ -463,6 +489,7 @@ class CookieComponent extends Object {
 		}
 		return substr($string, 1);
 	}
+
 /**
  * Explode method to return array from string set in CookieComponent::__implode()
  *
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 352471959..3801e7401 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+App::import('Core', 'Multibyte');
+
 /**
  * EmailComponent
  *
@@ -34,8 +37,8 @@
  * @subpackage    cake.cake.libs.controller.components
  *
  */
-App::import('Core', 'Multibyte');
 class EmailComponent extends Object{
+
 /**
  * Recipient of the email
  *
@@ -43,6 +46,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $to = null;
+
 /**
  * The mail which the email is sent from
  *
@@ -50,6 +54,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $from = null;
+
 /**
  * The email the recipient will reply to
  *
@@ -57,6 +62,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $replyTo = null;
+
 /**
  * The read receipt email
  *
@@ -64,6 +70,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $readReceipt = null;
+
 /**
  * The mail that will be used in case of any errors like
  * - Remote mailserver down
@@ -74,6 +81,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $return = null;
+
 /**
  * Carbon Copy
  *
@@ -84,6 +92,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $cc = array();
+
 /**
  * Blind Carbon Copy
  *
@@ -94,6 +103,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $bcc = array();
+
 /**
  * The subject of the email
  *
@@ -101,6 +111,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $subject = null;
+
 /**
  * Associative array of a user defined headers
  * Keys will be prefixed 'X-' as per RFC2822 Section 4.7.5
@@ -109,6 +120,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $headers = array();
+
 /**
  * List of additional headers
  *
@@ -118,6 +130,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $additionalParams = null;
+
 /**
  * Layout for the View
  *
@@ -125,6 +138,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $layout = 'default';
+
 /**
  * Template for the view
  *
@@ -132,6 +146,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $template = null;
+
 /**
  * as per RFC2822 Section 2.1.1
  *
@@ -139,10 +154,12 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $lineLength = 70;
+
 /**
  * @deprecated see lineLength
  */
 	var $_lineLength = null;
+
 /**
  * What format should the email be sent in
  *
@@ -155,6 +172,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $sendAs = 'text';
+
 /**
  * What method should the email be sent by
  *
@@ -167,6 +185,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $delivery = 'mail';
+
 /**
  * charset the email is sent in
  *
@@ -174,6 +193,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $charset = 'utf-8';
+
 /**
  * List of files that should be attached to the email.
  *
@@ -183,6 +203,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $attachments = array();
+
 /**
  * What mailer should EmailComponent identify itself as
  *
@@ -190,6 +211,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $xMailer = 'CakePHP Email Component';
+
 /**
  * The list of paths to search if an attachment isnt absolute
  *
@@ -197,6 +219,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $filePaths = array();
+
 /**
  * List of options to use for smtp mail method
  *
@@ -213,6 +236,7 @@ class EmailComponent extends Object{
 	var $smtpOptions = array(
 		'port'=> 25, 'host' => 'localhost', 'timeout' => 30
 	);
+
 /**
  * Placeholder for any errors that might happen with the
  * smtp mail methods
@@ -221,6 +245,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	var $smtpError = null;
+
 /**
  * If set to true, the mail method will be auto-set to 'debug'
  *
@@ -228,6 +253,7 @@ class EmailComponent extends Object{
  * @access protected
  */
 	var $_debug = false;
+
 /**
  * Temporary store of message header lines
  *
@@ -235,6 +261,7 @@ class EmailComponent extends Object{
  * @access private
  */
 	var $__header = array();
+
 /**
  * If set, boundary to use for multipart mime messages
  *
@@ -242,6 +269,7 @@ class EmailComponent extends Object{
  * @access private
  */
 	var $__boundary = null;
+
 /**
  * Temporary store of message lines
  *
@@ -249,6 +277,7 @@ class EmailComponent extends Object{
  * @access private
  */
 	var $__message = array();
+
 /**
  * Variable that holds SMTP connection
  *
@@ -256,6 +285,7 @@ class EmailComponent extends Object{
  * @access private
  */
 	var $__smtpConnection = null;
+
 /**
  * Initialize component
  *
@@ -269,6 +299,7 @@ class EmailComponent extends Object{
 		}
 		$this->_set($settings);
 	}
+
 /**
  * Startup component
  *
@@ -276,6 +307,7 @@ class EmailComponent extends Object{
  * @access public
  */
 	function startup(&$controller) {}
+
 /**
  * Send an email using the specified content, template and layout
  *
@@ -330,6 +362,7 @@ class EmailComponent extends Object{
 
 		return $sent;
 	}
+
 /**
  * Reset all EmailComponent internal variables to be able to send out a new email.
  *
@@ -346,10 +379,12 @@ class EmailComponent extends Object{
 		$this->subject = null;
 		$this->additionalParams = null;
 		$this->smtpError = null;
+		$this->attachments = array();
 		$this->__header = array();
 		$this->__boundary = null;
 		$this->__message = array();
 	}
+
 /**
  * Render the contents using the current layout and template.
  *
@@ -429,6 +464,7 @@ class EmailComponent extends Object{
 
 		return $msg;
 	}
+
 /**
  * Create unique boundary identifier
  *
@@ -437,6 +473,7 @@ class EmailComponent extends Object{
 	function __createBoundary() {
 		$this->__boundary = md5(uniqid(time()));
 	}
+
 /**
  * Create emails headers including (but not limited to) from email address, reply to,
  * bcc and cc.
@@ -490,11 +527,11 @@ class EmailComponent extends Object{
 			$this->__header[] = 'Content-Type: text/html; charset=' . $this->charset;
 		} elseif ($this->sendAs === 'both') {
 			$this->__header[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"';
-			$this->__header[] = '';
 		}
 
 		$this->__header[] = 'Content-Transfer-Encoding: 7bit';
 	}
+
 /**
  * Format the message by seeing if it has attachments.
  *
@@ -503,16 +540,21 @@ class EmailComponent extends Object{
  */
 	function __formatMessage($message) {
 		if (!empty($this->attachments)) {
-			$prefix = array(
-				'--' . $this->__boundary,
-				'Content-Type: text/plain; charset=' . $this->charset,
-				'Content-Transfer-Encoding: 7bit',
-				''
-			);
+			$prefix = array('--' . $this->__boundary);
+			if ($this->sendAs === 'text') {
+				$prefix[] = 'Content-Type: text/plain; charset=' . $this->charset;
+			} elseif ($this->sendAs === 'html') {
+				$prefix[] = 'Content-Type: text/html; charset=' . $this->charset;
+			} elseif ($this->sendAs === 'both') {
+				$prefix[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"';
+			}
+			$prefix[] = 'Content-Transfer-Encoding: 7bit';
+			$prefix[] = '';
 			$message = array_merge($prefix, $message);
 		}
 		return $message;
 	}
+
 /**
  * Attach files by adding file contents inside boundaries.
  *
@@ -543,6 +585,7 @@ class EmailComponent extends Object{
 			$this->__message[] = '';
 		}
 	}
+
 /**
  * Find the specified attachment in the list of file paths
  *
@@ -562,6 +605,7 @@ class EmailComponent extends Object{
 		}
 		return null;
 	}
+
 /**
  * Wrap the message using EmailComponent::$lineLength
  *
@@ -589,6 +633,7 @@ class EmailComponent extends Object{
 		$formatted[] = '';
 		return $formatted;
 	}
+
 /**
  * Encode the specified string using the current charset
  *
@@ -605,6 +650,7 @@ class EmailComponent extends Object{
 		}
 		return mb_encode_mimeheader($subject, $this->charset, 'B', $nl);
 	}
+
 /**
  * Format a string as an email address
  *
@@ -623,6 +669,7 @@ class EmailComponent extends Object{
 		}
 		return $this->__strip($string);
 	}
+
 /**
  * Remove certain elements (such as bcc:, to:, %0a) from given value
  *
@@ -644,6 +691,7 @@ class EmailComponent extends Object{
 		}
 		return $value;
 	}
+
 /**
  * Wrapper for PHP mail function used for sending out emails
  *
@@ -658,6 +706,7 @@ class EmailComponent extends Object{
 		}
 		return @mail($this->to, $this->__encode($this->subject), $message, $header, $this->additionalParams);
 	}
+
 /**
  * Sends out email via SMTP
  *
@@ -733,6 +782,7 @@ class EmailComponent extends Object{
 		$this->__smtpConnection->disconnect();
 		return true;
 	}
+
 /**
  * Private method for sending data to SMTP connection
  *
@@ -756,6 +806,7 @@ class EmailComponent extends Object{
 		}
 		return true;
 	}
+
 /**
  * Set as controller flash message a debug message showing current settings in component
  *
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index 8887ff443..7a1988f43 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Request object for handling alternative HTTP requests
  *
@@ -37,6 +38,7 @@ if (!defined('REQUEST_MOBILE_UA')) {
  *
  */
 class RequestHandlerComponent extends Object {
+
 /**
  * The layout that will be switched to for Ajax requests
  *
@@ -45,6 +47,7 @@ class RequestHandlerComponent extends Object {
  * @see RequestHandler::setAjax()
  */
 	var $ajaxLayout = 'ajax';
+
 /**
  * Determines whether or not callbacks will be fired on this component
  *
@@ -52,6 +55,7 @@ class RequestHandlerComponent extends Object {
  * @access public
  */
 	var $enabled = true;
+
 /**
  * Holds the content-type of the response that is set when using
  * RequestHandler::respondAs()
@@ -60,6 +64,7 @@ class RequestHandlerComponent extends Object {
  * @access private
  */
 	var $__responseTypeSet = null;
+
 /**
  * Holds the copy of Controller::$params
  *
@@ -67,6 +72,7 @@ class RequestHandlerComponent extends Object {
  * @access public
  */
 	var $params = array();
+
 /**
  * Friendly content-type mappings used to set response types and determine
  * request types.  Can be modified with RequestHandler::setContent()
@@ -104,6 +110,7 @@ class RequestHandlerComponent extends Object {
 		'zip'			=> 'application/x-zip',
 		'tar'			=> 'application/x-tar'
 	);
+
 /**
  * Content-types accepted by the client.  If extension parsing is enabled in the
  * Router, and an extension is detected, the corresponding content-type will be
@@ -114,6 +121,7 @@ class RequestHandlerComponent extends Object {
  * @see Router::parseExtensions()
  */
 	var $__acceptTypes = array();
+
 /**
  * The template to use when rendering the given content type.
  *
@@ -121,6 +129,7 @@ class RequestHandlerComponent extends Object {
  * @access private
  */
 	var $__renderType = null;
+
 /**
  * Contains the file extension parsed out by the Router
  *
@@ -129,6 +138,7 @@ class RequestHandlerComponent extends Object {
  * @see Router::parseExtensions()
  */
 	var $ext = null;
+
 /**
  * Flag set when MIME types have been initialized
  *
@@ -137,6 +147,7 @@ class RequestHandlerComponent extends Object {
  * @see RequestHandler::__initializeTypes()
  */
 	var $__typesInitialized = false;
+
 /**
  * Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
  *
@@ -152,6 +163,7 @@ class RequestHandlerComponent extends Object {
 		}
 		parent::__construct();
 	}
+
 /**
  * Initializes the component, gets a reference to Controller::$parameters, and
  * checks to see if a file extension has been parsed by the Router.  If yes, the
@@ -168,6 +180,7 @@ class RequestHandlerComponent extends Object {
 			$this->ext = $controller->params['url']['ext'];
 		}
 	}
+
 /**
  * The startup method of the RequestHandler enables several automatic behaviors
  * related to the detection of certain properties of the HTTP request, including:
@@ -217,6 +230,7 @@ class RequestHandlerComponent extends Object {
 			}
 		}
 	}
+
 /**
  * Handles (fakes) redirects for Ajax requests using requestAction()
  *
@@ -234,6 +248,7 @@ class RequestHandlerComponent extends Object {
 		echo $this->requestAction($url, array('return'));
 		$this->_stop();
 	}
+
 /**
  * Returns true if the current HTTP request is Ajax, false otherwise
  *
@@ -243,6 +258,7 @@ class RequestHandlerComponent extends Object {
 	function isAjax() {
 		return env('HTTP_X_REQUESTED_WITH') === "XMLHttpRequest";
 	}
+
 /**
  * Returns true if the current HTTP request is coming from a Flash-based client
  *
@@ -252,6 +268,7 @@ class RequestHandlerComponent extends Object {
 	function isFlash() {
 		return (preg_match('/^(Shockwave|Adobe) Flash/', env('HTTP_USER_AGENT')) == 1);
 	}
+
 /**
  * Returns true if the current request is over HTTPS, false otherwise.
  *
@@ -261,6 +278,7 @@ class RequestHandlerComponent extends Object {
 	function isSSL() {
 		return env('HTTPS');
 	}
+
 /**
  * Returns true if the current call accepts an XML response, false otherwise
  *
@@ -270,6 +288,7 @@ class RequestHandlerComponent extends Object {
 	function isXml() {
 		return $this->prefers('xml');
 	}
+
 /**
  * Returns true if the current call accepts an RSS response, false otherwise
  *
@@ -279,6 +298,7 @@ class RequestHandlerComponent extends Object {
 	function isRss() {
 		return $this->prefers('rss');
 	}
+
 /**
  * Returns true if the current call accepts an Atom response, false otherwise
  *
@@ -288,6 +308,7 @@ class RequestHandlerComponent extends Object {
 	function isAtom() {
 		return $this->prefers('atom');
 	}
+
 /**
  * Returns true if user agent string matches a mobile web browser, or if the
  * client accepts WAP content.
@@ -302,6 +323,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns true if the client accepts WAP content
  *
@@ -311,6 +333,7 @@ class RequestHandlerComponent extends Object {
 	function isWap() {
 		return $this->prefers('wap');
 	}
+
 /**
  * Returns true if the current call a POST request
  *
@@ -320,6 +343,7 @@ class RequestHandlerComponent extends Object {
 	function isPost() {
 		return (strtolower(env('REQUEST_METHOD')) == 'post');
 	}
+
 /**
  * Returns true if the current call a PUT request
  *
@@ -329,6 +353,7 @@ class RequestHandlerComponent extends Object {
 	function isPut() {
 		return (strtolower(env('REQUEST_METHOD')) == 'put');
 	}
+
 /**
  * Returns true if the current call a GET request
  *
@@ -338,6 +363,7 @@ class RequestHandlerComponent extends Object {
 	function isGet() {
 		return (strtolower(env('REQUEST_METHOD')) == 'get');
 	}
+
 /**
  * Returns true if the current call a DELETE request
  *
@@ -347,6 +373,7 @@ class RequestHandlerComponent extends Object {
 	function isDelete() {
 		return (strtolower(env('REQUEST_METHOD')) == 'delete');
 	}
+
 /**
  * Gets Prototype version if call is Ajax, otherwise empty string.
  * The Prototype library sets a special "Prototype version" HTTP header.
@@ -360,6 +387,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return false;
 	}
+
 /**
  * Adds/sets the Content-type(s) for the given name.  This method allows
  * content-types to be mapped to friendly aliases (or extensions), which allows
@@ -379,6 +407,7 @@ class RequestHandlerComponent extends Object {
 		}
 		$this->__requestContent[$name] = $type;
 	}
+
 /**
  * Gets the server name from which this request was referred
  *
@@ -395,6 +424,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return trim(preg_replace('/(?:\:.*)/', '', $sessHost));
 	}
+
 /**
  * Gets remote client IP
  *
@@ -421,6 +451,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return trim($ipaddr);
 	}
+
 /**
  * Determines which content types the client accepts.  Acceptance is based on
  * the file extension parsed by the Router (if present), and by the HTTP_ACCEPT
@@ -469,6 +500,7 @@ class RequestHandlerComponent extends Object {
 			}
 		}
 	}
+
 /**
  * Determines the content type of the data the client has sent (i.e. in a POST request)
  *
@@ -495,6 +527,7 @@ class RequestHandlerComponent extends Object {
 			return ($type == $this->mapType($contentType));
 		}
 	}
+
 /**
  * Determines which content-types the client prefers.  If no parameters are given,
  * the content-type that the client most likely prefers is returned.  If $type is
@@ -558,6 +591,7 @@ class RequestHandlerComponent extends Object {
 		$accepts = array_intersect($acceptedTypes, $accepts);
 		return $accepts[0];
 	}
+
 /**
  * Sets the layout and template paths for the content type defined by $type.
  *
@@ -585,7 +619,7 @@ class RequestHandlerComponent extends Object {
 		if (empty($this->__renderType)) {
 			$controller->viewPath .= '/' . $type;
 		} else {
-			$remove = preg_replace("/(?:\/{$type})$/", '/' . $type, $controller->viewPath);
+			$remove = preg_replace("/(?:\/{$this->__renderType})$/", '/' . $type, $controller->viewPath);
 			$controller->viewPath = $remove;
 		}
 		$this->__renderType = $type;
@@ -607,6 +641,7 @@ class RequestHandlerComponent extends Object {
 			}
 		}
 	}
+
 /**
  * Sets the response header based on type map index name.  If DEBUG is greater than 2, the header
  * is not set.
@@ -615,7 +650,7 @@ class RequestHandlerComponent extends Object {
  *    like 'application/x-shockwave'.
  * @param array $options If $type is a friendly type name that is associated with
  *    more than one type of content, $index is used to select which content-type to use.
- *   
+ *
  * @return boolean Returns false if the friendly type name given in $type does
  *    not exist in the type map, or if the Content-type header has
  *    already been set by this method.
@@ -673,6 +708,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the current response type (Content-type header), or null if none has been set
  *
@@ -686,6 +722,7 @@ class RequestHandlerComponent extends Object {
 		}
 		return $this->mapType($this->__responseTypeSet);
 	}
+
 /**
  * Maps a content-type back to an alias
  *
@@ -717,6 +754,7 @@ class RequestHandlerComponent extends Object {
 			return $ctype;
 		}
 	}
+
 /**
  * Initializes MIME types
  *
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 077883c3b..5fd5b7da2 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.controller.components
  */
 class SecurityComponent extends Object {
+
 /**
  * The controller method that will be called if this request is black-hole'd
  *
@@ -40,6 +43,7 @@ class SecurityComponent extends Object {
  * @access public
  */
 	var $blackHoleCallback = null;
+
 /**
  * List of controller actions for which a POST request is required
  *
@@ -48,6 +52,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requirePost()
  */
 	var $requirePost = array();
+
 /**
  * List of controller actions for which a GET request is required
  *
@@ -56,6 +61,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireGet()
  */
 	var $requireGet = array();
+
 /**
  * List of controller actions for which a PUT request is required
  *
@@ -64,6 +70,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requirePut()
  */
 	var $requirePut = array();
+
 /**
  * List of controller actions for which a DELETE request is required
  *
@@ -72,6 +79,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireDelete()
  */
 	var $requireDelete = array();
+
 /**
  * List of actions that require an SSL-secured connection
  *
@@ -80,6 +88,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireSecure()
  */
 	var $requireSecure = array();
+
 /**
  * List of actions that require a valid authentication key
  *
@@ -88,6 +97,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireAuth()
  */
 	var $requireAuth = array();
+
 /**
  * List of actions that require an HTTP-authenticated login (basic or digest)
  *
@@ -96,6 +106,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireLogin()
  */
 	var $requireLogin = array();
+
 /**
  * Login options for SecurityComponent::requireLogin()
  *
@@ -104,6 +115,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireLogin()
  */
 	var $loginOptions = array('type' => '', 'prompt' => null);
+
 /**
  * An associative array of usernames/passwords used for HTTP-authenticated logins.
  * If using digest authentication, passwords should be MD5-hashed.
@@ -113,6 +125,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireLogin()
  */
 	var $loginUsers = array();
+
 /**
  * Controllers from which actions of the current controller are allowed to receive
  * requests.
@@ -122,6 +135,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireAuth()
  */
 	var $allowedControllers = array();
+
 /**
  * Actions from which actions of the current controller are allowed to receive
  * requests.
@@ -131,6 +145,7 @@ class SecurityComponent extends Object {
  * @see SecurityComponent::requireAuth()
  */
 	var $allowedActions = array();
+
 /**
  * Form fields to disable
  *
@@ -138,6 +153,7 @@ class SecurityComponent extends Object {
  * @access public
  */
 	var $disabledFields = array();
+
 /**
  * Whether to validate POST data.  Set to false to disable for data coming from 3rd party
  * services, etc.
@@ -146,6 +162,7 @@ class SecurityComponent extends Object {
  * @access public
  */
 	var $validatePost = true;
+
 /**
  * Other components used by the Security component
  *
@@ -153,12 +170,14 @@ class SecurityComponent extends Object {
  * @access public
  */
 	var $components = array('RequestHandler', 'Session');
+
 /**
  * Holds the current action of the controller
  *
  * @var string
  */
 	var $_action = null;
+
 /**
  * Component startup. All security checking happens here.
  *
@@ -187,6 +206,7 @@ class SecurityComponent extends Object {
 		}
 		$this->_generateToken($controller);
 	}
+
 /**
  * Sets the actions that require a POST request, or empty for all actions
  *
@@ -197,6 +217,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Post', $args);
 	}
+
 /**
  * Sets the actions that require a GET request, or empty for all actions
  *
@@ -207,6 +228,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Get', $args);
 	}
+
 /**
  * Sets the actions that require a PUT request, or empty for all actions
  *
@@ -217,6 +239,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Put', $args);
 	}
+
 /**
  * Sets the actions that require a DELETE request, or empty for all actions
  *
@@ -227,6 +250,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Delete', $args);
 	}
+
 /**
  * Sets the actions that require a request that is SSL-secured, or empty for all actions
  *
@@ -237,6 +261,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Secure', $args);
 	}
+
 /**
  * Sets the actions that require an authenticated request, or empty for all actions
  *
@@ -247,6 +272,7 @@ class SecurityComponent extends Object {
 		$args = func_get_args();
 		$this->_requireMethod('Auth', $args);
 	}
+
 /**
  * Sets the actions that require an HTTP-authenticated request, or empty for all actions
  *
@@ -270,6 +296,7 @@ class SecurityComponent extends Object {
 			$this->loginUsers =& $this->loginOptions['users'];
 		}
 	}
+
 /**
  * Attempts to validate the login credentials for an HTTP-authenticated request
  *
@@ -308,6 +335,7 @@ class SecurityComponent extends Object {
 		}
 		return null;
 	}
+
 /**
  * Generates the text of an HTTP-authentication request header from an array of options.
  *
@@ -329,6 +357,7 @@ class SecurityComponent extends Object {
 
 		return $auth . ' ' . join(',', $out);
 	}
+
 /**
  * Parses an HTTP digest authentication response, and returns an array of the data, or null on failure.
  *
@@ -355,6 +384,7 @@ class SecurityComponent extends Object {
 		}
 		return null;
 	}
+
 /**
  * Generates a hash to be compared with an HTTP digest-authenticated response
  *
@@ -370,6 +400,7 @@ class SecurityComponent extends Object {
 			md5(env('REQUEST_METHOD') . ':' . $data['uri'])
 		);
 	}
+
 /**
  * Black-hole an invalid request with a 404 error or custom callback. If SecurityComponent::$blackHoleCallback
  * is specified, it will use this callback by executing the method indicated in $error
@@ -394,6 +425,7 @@ class SecurityComponent extends Object {
 			return $this->_callback($controller, $this->blackHoleCallback, array($error));
 		}
 	}
+
 /**
  * Sets the actions that require a $method HTTP request, or empty for all actions
  *
@@ -405,6 +437,7 @@ class SecurityComponent extends Object {
 	function _requireMethod($method, $actions = array()) {
 		$this->{'require' . $method} = (empty($actions)) ? array('*'): $actions;
 	}
+
 /**
  * Check if HTTP methods are required
  *
@@ -429,6 +462,7 @@ class SecurityComponent extends Object {
 		}
 		return true;
 	}
+
 /**
  * Check if access requires secure connection
  *
@@ -450,6 +484,7 @@ class SecurityComponent extends Object {
 		}
 		return true;
 	}
+
 /**
  * Check if authentication is required
  *
@@ -485,6 +520,7 @@ class SecurityComponent extends Object {
 		}
 		return true;
 	}
+
 /**
  * Check if login is required
  *
@@ -532,6 +568,7 @@ class SecurityComponent extends Object {
 		}
 		return true;
 	}
+
 /**
  * Validate submitted form
  *
@@ -612,6 +649,7 @@ class SecurityComponent extends Object {
 		$check = Security::hash(serialize($fieldList) . Configure::read('Security.salt'));
 		return ($token === $check);
 	}
+
 /**
  * Add authentication key for new form posts
  *
@@ -654,6 +692,7 @@ class SecurityComponent extends Object {
 
 		return true;
 	}
+
 /**
  * Sets the default login options for an HTTP-authenticated request
  *
@@ -670,6 +709,7 @@ class SecurityComponent extends Object {
 		), array_filter($options));
 		$options = array_merge(array('opaque' => md5($options['realm'])), $options);
 	}
+
 /**
  * Calls a controller callback method
  *
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index f97312553..4fc2ebba7 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -27,6 +28,7 @@
 if (!class_exists('cakesession')) {
 	require LIBS . 'cake_session.php';
 }
+
 /**
  * Session Component.
  *
@@ -37,6 +39,7 @@ if (!class_exists('cakesession')) {
  *
  */
 class SessionComponent extends CakeSession {
+
 /**
  * Used to determine if methods implementation is used, or bypassed
  *
@@ -44,6 +47,7 @@ class SessionComponent extends CakeSession {
  * @access private
  */
 	var $__active = true;
+
 /**
  * Used to determine if Session has been started
  *
@@ -51,6 +55,7 @@ class SessionComponent extends CakeSession {
  * @access private
  */
 	var $__started = false;
+
 /**
  * Used to determine if request are from an Ajax request
  *
@@ -58,6 +63,7 @@ class SessionComponent extends CakeSession {
  * @access private
  */
 	var $__bare = 0;
+
 /**
  * Class constructor
  *
@@ -70,6 +76,7 @@ class SessionComponent extends CakeSession {
 			$this->__active = false;
 		}
 	}
+
 /**
  * Initializes the component, gets a reference to Controller::$param['bare'].
  *
@@ -82,6 +89,7 @@ class SessionComponent extends CakeSession {
 			$this->__bare = $controller->params['bare'];
 		}
 	}
+
 /**
  * Startup method.
  *
@@ -94,6 +102,7 @@ class SessionComponent extends CakeSession {
 			$this->__start();
 		}
 	}
+
 /**
  * Starts Session on if 'Session.start' is set to false in core.php
  *
@@ -108,6 +117,7 @@ class SessionComponent extends CakeSession {
 		parent::__construct($base);
 		$this->__active = true;
 	}
+
 /**
  * Used to write a value to a session key.
  *
@@ -137,6 +147,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to read a session values for a key or return values for all keys.
  *
@@ -154,6 +165,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to delete a session variable.
  *
@@ -170,6 +182,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Wrapper for SessionComponent::del();
  *
@@ -186,6 +199,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to check if a session variable is set
  *
@@ -202,6 +216,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to determine the last error in a session.
  *
@@ -217,6 +232,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to set a session variable that can be used to output messages in the view.
  *
@@ -236,6 +252,7 @@ class SessionComponent extends CakeSession {
 			$this->write('Message.' . $key, compact('message', 'layout', 'params'));
 		}
 	}
+
 /**
  * Used to renew a session id
  *
@@ -250,6 +267,7 @@ class SessionComponent extends CakeSession {
 			parent::renew();
 		}
 	}
+
 /**
  * Used to check for a valid session.
  *
@@ -265,6 +283,7 @@ class SessionComponent extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to destroy sessions
  *
@@ -279,6 +298,7 @@ class SessionComponent extends CakeSession {
 			parent::destroy();
 		}
 	}
+
 /**
  * Returns Session id
  *
@@ -292,6 +312,7 @@ class SessionComponent extends CakeSession {
 	function id($id = null) {
 		return parent::id($id);
 	}
+
 /**
  * Starts Session if SessionComponent is used in Controller::beforeFilter(),
  * or is called from
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 3b7694e3a..4c0516c2b 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -17,10 +17,12 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * Include files
  */
-App::import('Core', array('Component', 'View'));
+App::import('Controller', 'Component', false);
+App::import('View', 'View', false);
 /**
  * Controller
  *
@@ -34,6 +36,7 @@ App::import('Core', array('Component', 'View'));
  *
  */
 class Controller extends Object {
+
 /**
  * The name of this controller. Controller names are plural, named after the model they manipulate.
  *
@@ -42,6 +45,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/52/name
  */
 	var $name = null;
+
 /**
  * Stores the current URL, relative to the webroot of the application.
  *
@@ -49,6 +53,7 @@ class Controller extends Object {
  * @access public
  */
 	var $here = null;
+
 /**
  * The webroot of the application.
  *
@@ -56,6 +61,7 @@ class Controller extends Object {
  * @access public
  */
 	var $webroot = null;
+
 /**
  * The name of the currently requested controller action.
  *
@@ -63,6 +69,7 @@ class Controller extends Object {
  * @access public
  */
 	var $action = null;
+
 /**
  * An array containing the class names of models this controller uses.
  *
@@ -73,6 +80,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/53/components-helpers-and-uses
  */
 	var $uses = false;
+
 /**
  * An array containing the names of helpers this controller uses. The array elements should
  * not contain the "Helper" part of the classname.
@@ -84,6 +92,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/53/components-helpers-and-uses
  */
 	var $helpers = array('Html', 'Form');
+
 /**
  * Parameters received in the current request: GET and POST data, information
  * about the request, etc.
@@ -93,6 +102,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/55/The-Parameters-Attribute-params
  */
 	var $params = array();
+
 /**
  * Data POSTed to the controller using the HtmlHelper. Data here is accessible
  * using the $this->data['ModelName']['fieldName'] pattern.
@@ -101,6 +111,7 @@ class Controller extends Object {
  * @access public
  */
 	var $data = array();
+
 /**
  * Holds pagination defaults for controller actions. The keys that can be included
  * in this array are: 'conditions', 'fields', 'order', 'limit', 'page', and 'recursive',
@@ -119,6 +130,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/164/Pagination
  */
 	var $paginate = array('limit' => 20, 'page' => 1);
+
 /**
  * The name of the views subfolder containing views for this controller.
  *
@@ -126,6 +138,7 @@ class Controller extends Object {
  * @access public
  */
 	var $viewPath = null;
+
 /**
  * The name of the layouts subfolder containing layouts for this controller.
  *
@@ -133,6 +146,7 @@ class Controller extends Object {
  * @access public
  */
 	var $layoutPath = null;
+
 /**
  * Contains variables to be handed to the view.
  *
@@ -140,6 +154,7 @@ class Controller extends Object {
  * @access public
  */
 	var $viewVars = array();
+
 /**
  * Text to be used for the $title_for_layout layout variable (usually
  * placed inside <title> tags.)
@@ -149,6 +164,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/54/Page-related-Attributes-layout-and-pageTitle
  */
 	var $pageTitle = false;
+
 /**
  * An array containing the class names of the models this controller uses.
  *
@@ -156,6 +172,7 @@ class Controller extends Object {
  * @access public
  */
 	var $modelNames = array();
+
 /**
  * Base URL path.
  *
@@ -163,6 +180,7 @@ class Controller extends Object {
  * @access public
  */
 	var $base = null;
+
 /**
  * The name of the layout file to render the view inside of. The name specified
  * is the filename of the layout in /app/views/layouts without the .ctp
@@ -173,6 +191,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/54/Page-related-Attributes-layout-and-pageTitle
  */
 	var $layout = 'default';
+
 /**
  * Set to true to automatically render the view
  * after action logic.
@@ -181,6 +200,7 @@ class Controller extends Object {
  * @access public
  */
 	var $autoRender = true;
+
 /**
  * Set to true to automatically render the layout around views.
  *
@@ -188,6 +208,7 @@ class Controller extends Object {
  * @access public
  */
 	var $autoLayout = true;
+
 /**
  * Instance of Component used to handle callbacks.
  *
@@ -195,6 +216,7 @@ class Controller extends Object {
  * @access public
  */
 	var $Component = null;
+
 /**
  * Array containing the names of components this controller uses. Component names
  * should not contain the "Component" portion of the classname.
@@ -206,6 +228,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/53/components-helpers-and-uses
  */
 	var $components = array();
+
 /**
  * The name of the View class this controller sends output to.
  *
@@ -213,6 +236,7 @@ class Controller extends Object {
  * @access public
  */
 	var $view = 'View';
+
 /**
  * File extension for view templates. Defaults to Cake's conventional ".ctp".
  *
@@ -220,6 +244,7 @@ class Controller extends Object {
  * @access public
  */
 	var $ext = '.ctp';
+
 /**
  * The output of the requested action.  Contains either a variable
  * returned from the action, or the data of the rendered view;
@@ -229,6 +254,7 @@ class Controller extends Object {
  * @access public
  */
 	var $output = null;
+
 /**
  * Automatically set to the name of a plugin.
  *
@@ -236,6 +262,7 @@ class Controller extends Object {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * Used to define methods a controller that will be cached. To cache a
  * single action, the value is set to an array containing keys that match
@@ -254,6 +281,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/346/Caching-in-the-Controller
  */
 	var $cacheAction = false;
+
 /**
  * Used to create cached instances of models a controller uses.
  * When set to true, all models related to the controller will be cached.
@@ -263,6 +291,7 @@ class Controller extends Object {
  * @access public
  */
 	var $persistModel = false;
+
 /**
  * Holds all params passed and named.
  *
@@ -270,6 +299,7 @@ class Controller extends Object {
  * @access public
  */
 	var $passedArgs = array();
+
 /**
  * Triggers Scaffolding
  *
@@ -278,6 +308,7 @@ class Controller extends Object {
  * @link http://book.cakephp.org/view/105/Scaffolding
  */
 	var $scaffold = false;
+
 /**
  * Holds current methods of the controller
  *
@@ -286,6 +317,7 @@ class Controller extends Object {
  * @link
  */
 	var $methods = array();
+
 /**
  * This controller's primary model class name, the Inflector::classify()'ed version of
  * the controller's $name property.
@@ -296,6 +328,7 @@ class Controller extends Object {
  * @access public
  */
 	var $modelClass = null;
+
 /**
  * This controller's model key name, an underscored version of the controller's $modelClass property.
  *
@@ -305,6 +338,7 @@ class Controller extends Object {
  * @access public
  */
 	var $modelKey = null;
+
 /**
  * Holds any validation errors produced by the last call of the validateErrors() method/
  *
@@ -312,6 +346,7 @@ class Controller extends Object {
  * @access public
  */
 	var $validationErrors = null;
+
 /**
  * Constructor.
  *
@@ -346,6 +381,7 @@ class Controller extends Object {
 		$this->methods = array_diff($childMethods, $parentMethods);
 		parent::__construct();
 	}
+
 /**
  * Merge components, helpers, and uses vars from AppController and PluginAppController.
  *
@@ -427,6 +463,7 @@ class Controller extends Object {
 			}
 		}
 	}
+
 /**
  * Loads Model classes based on the the uses property
  * see Controller::loadModel(); for more info.
@@ -464,6 +501,7 @@ class Controller extends Object {
 		}
 		return true;
 	}
+
 /**
  * Loads and instantiates models required by this controller.
  * If Controller::persistModel; is true, controller will cache model instances on first request,
@@ -528,6 +566,7 @@ class Controller extends Object {
 			$this->modelNames[] = $modelClass;
 		}
 	}
+
 /**
  * Redirects to given $url, after turning off $this->autoRender.
  * Script execution is halted after the redirect.
@@ -640,6 +679,7 @@ class Controller extends Object {
 			$this->_stop();
 		}
 	}
+
 /**
  * Convenience method for header()
  *
@@ -650,6 +690,7 @@ class Controller extends Object {
 	function header($status) {
 		header($status);
 	}
+
 /**
  * Saves a variable for use inside a view template.
  *
@@ -681,6 +722,7 @@ class Controller extends Object {
 			}
 		}
 	}
+
 /**
  * Internally redirects one action to another. Examples:
  *
@@ -699,6 +741,7 @@ class Controller extends Object {
 		unset($args[0]);
 		return call_user_func_array(array(&$this, $action), $args);
 	}
+
 /**
  * Controller callback to tie into Auth component.
  * Only called when AuthComponent::authorize is set to 'controller'.
@@ -713,6 +756,7 @@ class Controller extends Object {
 		), E_USER_WARNING);
 		return false;
 	}
+
 /**
  * Returns number of errors in a submitted FORM.
  *
@@ -728,6 +772,7 @@ class Controller extends Object {
 		}
 		return count($errors);
 	}
+
 /**
  * Validates models passed by parameters. Example:
  *
@@ -752,6 +797,7 @@ class Controller extends Object {
 
 		return $this->validationErrors = (count($errors) ? $errors : false);
 	}
+
 /**
  * Instantiates the correct view class, hands it its data, and uses it to render the view output.
  *
@@ -816,6 +862,7 @@ class Controller extends Object {
 
 		return $this->output;
 	}
+
 /**
  * Returns the referring URL for this request.
  *
@@ -846,6 +893,7 @@ class Controller extends Object {
 		}
 		return '/';
 	}
+
 /**
  * Forces the user's browser not to cache the results of the current request.
  *
@@ -860,6 +908,7 @@ class Controller extends Object {
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
 	}
+
 /**
  * Shows a message to the user for $pause seconds, then redirects to $url.
  * Uses flash.ctp as the default layout for the message.
@@ -880,6 +929,7 @@ class Controller extends Object {
 		$this->set('page_title', $message);
 		$this->render(false, 'flash');
 	}
+
 /**
  * Converts POST'ed form data to a model conditions array, suitable for use in a Model::find() call.
  *
@@ -936,6 +986,7 @@ class Controller extends Object {
 		}
 		return $cond;
 	}
+
 /**
  * Handles automatic pagination of model records.
  *
@@ -1130,6 +1181,7 @@ class Controller extends Object {
 		}
 		return $results;
 	}
+
 /**
  * Called before the controller action.
  *
@@ -1138,6 +1190,7 @@ class Controller extends Object {
  */
 	function beforeFilter() {
 	}
+
 /**
  * Called after the controller action is run, but before the view is rendered.
  *
@@ -1146,6 +1199,7 @@ class Controller extends Object {
  */
 	function beforeRender() {
 	}
+
 /**
  * Called after the controller action is run and rendered.
  *
@@ -1154,6 +1208,7 @@ class Controller extends Object {
  */
 	function afterFilter() {
 	}
+
 /**
  * This method should be overridden in child classes.
  *
@@ -1165,6 +1220,7 @@ class Controller extends Object {
 	function _beforeScaffold($method) {
 		return true;
 	}
+
 /**
  * This method should be overridden in child classes.
  *
@@ -1176,6 +1232,7 @@ class Controller extends Object {
 	function _afterScaffoldSave($method) {
 		return true;
 	}
+
 /**
  * This method should be overridden in child classes.
  *
@@ -1187,6 +1244,7 @@ class Controller extends Object {
 	function _afterScaffoldSaveError($method) {
 		return true;
 	}
+
 /**
  * This method should be overridden in child classes.
  * If not it will render a scaffold error.
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index 8196616ba..04c72218f 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Static content controller.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Static content controller
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.controller
  */
 class PagesController extends AppController {
+
 /**
  * Controller name
  *
@@ -40,6 +43,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $name = 'Pages';
+
 /**
  * Default helper
  *
@@ -47,6 +51,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $helpers = array('Html');
+
 /**
  * This controller does not use a model
  *
@@ -54,6 +59,7 @@ class PagesController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * Displays a view
  *
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index b8e4d7531..84f42863e 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -19,6 +19,7 @@
  * @since         Cake v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * Scaffolding is a set of automatic actions for starting web development work faster.
  *
@@ -31,6 +32,7 @@
  * @subpackage    cake.cake.libs.controller
  */
 class Scaffold extends Object {
+
 /**
  * Controller object
  *
@@ -38,6 +40,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $controller = null;
+
 /**
  * Name of the controller to scaffold
  *
@@ -45,6 +48,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * Action to be performed.
  *
@@ -52,6 +56,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $action = null;
+
 /**
  * Name of current model this view context is attached to
  *
@@ -59,6 +64,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $model = null;
+
 /**
  * Path to View.
  *
@@ -66,6 +72,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $viewPath;
+
 /**
  * Path parts for creating links in views.
  *
@@ -73,6 +80,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $base = null;
+
 /**
  * Name of layout to use with this View.
  *
@@ -80,6 +88,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $layout = 'default';
+
 /**
  * Array of parameter data
  *
@@ -87,6 +96,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $params;
+
 /**
  * File extension. Defaults to Cake's template ".ctp".
  *
@@ -94,6 +104,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $ext = '.ctp';
+
 /**
  * Sub-directory for this view file.
  *
@@ -101,6 +112,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $subDir = null;
+
 /**
  * Plugin name.
  *
@@ -108,6 +120,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $plugin = null;
+
 /**
  * valid session.
  *
@@ -115,6 +128,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $_validSession = null;
+
 /**
  * List of variables to collect from the associated controller
  *
@@ -125,6 +139,7 @@ class Scaffold extends Object {
 		'action', 'base', 'webroot', 'layout', 'name',
 		'viewPath', 'ext', 'params', 'data', 'plugin', 'cacheAction'
 	);
+
 /**
  * Title HTML element for current scaffolded view
  *
@@ -132,6 +147,7 @@ class Scaffold extends Object {
  * @access public
  */
 	var $scaffoldTitle = null;
+
 /**
  * Construct and set up given controller with given parameters.
  *
@@ -186,6 +202,7 @@ class Scaffold extends Object {
 			isset($this->controller->Session) && $this->controller->Session->valid() != false
 		);
 	}
+
 /**
  * Outputs the content of a scaffold method passing it through the Controller::afterFilter()
  *
@@ -196,6 +213,7 @@ class Scaffold extends Object {
 		$this->controller->afterFilter();
 		echo($this->controller->output);
 	}
+
 /**
  * Renders a view action of scaffolded model.
  *
@@ -231,6 +249,7 @@ class Scaffold extends Object {
 			return $this->__scaffoldError();
 		}
 	}
+
 /**
  * Renders index action of scaffolded model.
  *
@@ -250,6 +269,7 @@ class Scaffold extends Object {
 			return $this->__scaffoldError();
 		}
 	}
+
 /**
  * Renders an add or edit action for scaffolded model.
  *
@@ -261,6 +281,7 @@ class Scaffold extends Object {
 		$this->controller->render($action, $this->layout);
 		$this->_output();
 	}
+
 /**
  * Saves or updates the scaffolded model.
  *
@@ -354,6 +375,7 @@ class Scaffold extends Object {
 			return $this->__scaffoldError();
 		}
 	}
+
 /**
  * Performs a delete on given scaffolded Model.
  *
@@ -407,6 +429,7 @@ class Scaffold extends Object {
 			return $this->__scaffoldError();
 		}
 	}
+
 /**
  * Show a scaffold error
  *
@@ -417,6 +440,7 @@ class Scaffold extends Object {
 		return $this->controller->render('error', $this->layout);
 		$this->_output();
 	}
+
 /**
  * When methods are now present in a controller
  * scaffoldView is used to call default Scaffold methods if:
@@ -489,6 +513,7 @@ class Scaffold extends Object {
 			)));
 		}
 	}
+
 /**
  * Returns associations for controllers models.
  *
@@ -529,6 +554,7 @@ if (!class_exists('ThemeView')) {
 }
 
 class ScaffoldView extends ThemeView {
+
 /**
  * Override _getViewFileName
  *
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 6c11e2768..46ab2c322 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -130,13 +130,15 @@ class Debugger extends Object {
 			define('E_DEPRECATED', 8192);
 		}
 
-		$e = '<a href="javascript:void(0);" onclick="document.getElementById(\'{:id}-trace\')';
+		$e = '<pre class="cake-debug">';
+		$e .= '<a href="javascript:void(0);" onclick="document.getElementById(\'{:id}-trace\')';
 		$e .= '.style.display = (document.getElementById(\'{:id}-trace\').style.display == ';
 		$e .= '\'none\' ? \'\' : \'none\');"><b>{:error}</b> ({:code})</a>: {:description} ';
 		$e .= '[<b>{:path}</b>, line <b>{:line}</b>]';
 
 		$e .= '<div id="{:id}-trace" class="cake-stack-trace" style="display: none;">';
 		$e .= '{:links}{:info}</div>';
+		$e .= '</pre>';
 		$this->_templates['js']['error'] = $e;
 
 		$t = '<div id="{:id}-trace" class="cake-stack-trace" style="display: none;">';
@@ -164,7 +166,7 @@ class Debugger extends Object {
 		$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
 
 
-		$e  = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
+		$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
 		$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
 		$this->_templates['html']['error'] = $e;
 
diff --git a/cake/libs/error.php b/cake/libs/error.php
index e8db8276a..19b2d639c 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Error handler
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Controller', 'App');
+
 /**
  * Error Handling Controller
  *
@@ -35,12 +37,14 @@ App::import('Controller', 'App');
  */
 class CakeErrorController extends AppController {
 	var $name = 'CakeError';
+
 /**
  * Uses Property
  *
  * @var array
  */
 	var $uses = array();
+
 /**
  * __construct
  *
@@ -56,6 +60,7 @@ class CakeErrorController extends AppController {
 		$this->_set(array('cacheAction' => false, 'viewPath' => 'errors'));
 	}
 }
+
 /**
  * Error Handler.
  *
@@ -67,6 +72,7 @@ class CakeErrorController extends AppController {
  * @subpackage    cake.cake.libs
  */
 class ErrorHandler extends Object {
+
 /**
  * Controller instance.
  *
@@ -74,6 +80,7 @@ class ErrorHandler extends Object {
  * @access public
  */
 	var $controller = null;
+
 /**
  * Class constructor.
  *
@@ -118,6 +125,7 @@ class ErrorHandler extends Object {
 		$this->dispatchMethod($method, $messages);
 		$this->_stop();
 	}
+
 /**
  * Displays an error page (e.g. 404 Not found).
  *
@@ -134,6 +142,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('error404');
 	}
+
 /**
  * Convenience method to display a 404 page.
  *
@@ -156,6 +165,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('error404');
 	}
+
 /**
  * Renders the Missing Controller web page.
  *
@@ -173,6 +183,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingController');
 	}
+
 /**
  * Renders the Missing Action web page.
  *
@@ -191,6 +202,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingAction');
 	}
+
 /**
  * Renders the Private Action web page.
  *
@@ -207,6 +219,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('privateAction');
 	}
+
 /**
  * Renders the Missing Table web page.
  *
@@ -223,6 +236,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingTable');
 	}
+
 /**
  * Renders the Missing Database web page.
  *
@@ -235,6 +249,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingScaffolddb');
 	}
+
 /**
  * Renders the Missing View web page.
  *
@@ -252,6 +267,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingView');
 	}
+
 /**
  * Renders the Missing Layout web page.
  *
@@ -268,6 +284,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingLayout');
 	}
+
 /**
  * Renders the Database Connection web page.
  *
@@ -283,6 +300,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingConnection');
 	}
+
 /**
  * Renders the Missing Helper file web page.
  *
@@ -299,6 +317,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingHelperFile');
 	}
+
 /**
  * Renders the Missing Helper class web page.
  *
@@ -315,6 +334,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingHelperClass');
 	}
+
 /**
  * Renders the Missing Component file web page.
  *
@@ -332,6 +352,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingComponentFile');
 	}
+
 /**
  * Renders the Missing Component class web page.
  *
@@ -349,6 +370,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingComponentClass');
 	}
+
 /**
  * Renders the Missing Model class web page.
  *
@@ -364,6 +386,7 @@ class ErrorHandler extends Object {
 		));
 		$this->_outputMessage('missingModel');
 	}
+
 /**
  * Output message
  *
diff --git a/cake/libs/file.php b/cake/libs/file.php
index b57cb4c72..21f5138da 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Convenience class for reading, writing and appending to files.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  *
@@ -32,6 +34,7 @@ if (!class_exists('Object')) {
 if (!class_exists('Folder')) {
 	require LIBS . 'folder.php';
 }
+
 /**
  * Convenience class for reading, writing and appending to files.
  *
@@ -39,6 +42,7 @@ if (!class_exists('Folder')) {
  * @subpackage    cake.cake.libs
  */
 class File extends Object {
+
 /**
  * Folder object of the File
  *
@@ -46,6 +50,7 @@ class File extends Object {
  * @access public
  */
 	var $Folder = null;
+
 /**
  * Filename
  *
@@ -53,6 +58,7 @@ class File extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * file info
  *
@@ -60,6 +66,7 @@ class File extends Object {
  * @access public
  */
 	var $info = array();
+
 /**
  * Holds the file handler resource if the file is opened
  *
@@ -67,6 +74,7 @@ class File extends Object {
  * @access public
  */
 	var $handle = null;
+
 /**
  * enable locking for file reading and writing
  *
@@ -74,6 +82,7 @@ class File extends Object {
  * @access public
  */
 	var $lock = null;
+
 /**
  * path property
  *
@@ -83,6 +92,7 @@ class File extends Object {
  * @access public
  */
 	var $path = null;
+
 /**
  * Constructor
  *
@@ -109,6 +119,7 @@ class File extends Object {
 			}
 		}
 	}
+
 /**
  * Closes the current file if it is opened
  *
@@ -117,6 +128,7 @@ class File extends Object {
 	function __destruct() {
 		$this->close();
 	}
+
 /**
  * Creates the File.
  *
@@ -134,6 +146,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Opens the current file with a given $mode
  *
@@ -159,6 +172,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Return the contents of this File as a string.
  *
@@ -196,6 +210,7 @@ class File extends Object {
 		}
 		return $data;
 	}
+
 /**
  * Sets or gets the offset for the currently opened file.
  *
@@ -214,6 +229,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Prepares a ascii string for writing
  * fixes line endings
@@ -257,6 +273,7 @@ class File extends Object {
 		}
 		return $success;
 	}
+
 /**
  * Append given data string to this File.
  *
@@ -268,6 +285,7 @@ class File extends Object {
 	function append($data, $force = false) {
 		return $this->write($data, 'a', $force);
 	}
+
 /**
  * Closes the current file if it is opened.
  *
@@ -280,6 +298,7 @@ class File extends Object {
 		}
 		return fclose($this->handle);
 	}
+
 /**
  * Deletes the File.
  *
@@ -293,6 +312,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the File extension.
  *
@@ -308,6 +328,7 @@ class File extends Object {
 		}
 		return $this->info;
 	}
+
 /**
  * Returns the File extension.
  *
@@ -323,6 +344,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the File name without extension.
  *
@@ -340,6 +362,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * makes filename safe for saving
  *
@@ -356,6 +379,7 @@ class File extends Object {
 		}
 		return preg_replace( "/(?:[^\w\.-]+)/", "_", basename($name, $ext));
 	}
+
 /**
  * Get md5 Checksum of file with previous check of Filesize
  *
@@ -375,6 +399,7 @@ class File extends Object {
 
 		return false;
 	}
+
 /**
  * Returns the full path of the File.
  *
@@ -387,6 +412,7 @@ class File extends Object {
 		}
 		return $this->path;
 	}
+
 /**
  * Returns true if the File exists.
  *
@@ -396,6 +422,7 @@ class File extends Object {
 	function exists() {
 		return (file_exists($this->path) && is_file($this->path));
 	}
+
 /**
  * Returns the "chmod" (permissions) of the File.
  *
@@ -408,6 +435,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the Filesize
  *
@@ -420,6 +448,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns true if the File is writable.
  *
@@ -429,6 +458,7 @@ class File extends Object {
 	function writable() {
 		return is_writable($this->path);
 	}
+
 /**
  * Returns true if the File is executable.
  *
@@ -438,6 +468,7 @@ class File extends Object {
 	function executable() {
 		return is_executable($this->path);
 	}
+
 /**
  * Returns true if the File is readable.
  *
@@ -447,6 +478,7 @@ class File extends Object {
 	function readable() {
 		return is_readable($this->path);
 	}
+
 /**
  * Returns the File's owner.
  *
@@ -459,6 +491,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the File group.
  *
@@ -471,6 +504,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns last access time.
  *
@@ -483,6 +517,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns last modified time.
  *
@@ -495,6 +530,7 @@ class File extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns the current folder.
  *
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 28f32672a..3dd08fd99 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Convenience class for handling directories.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  *
@@ -29,6 +31,7 @@
 if (!class_exists('Object')) {
 	uses('object');
 }
+
 /**
  * Folder structure browser, lists folders and files.
  *
@@ -38,6 +41,7 @@ if (!class_exists('Object')) {
  * @subpackage    cake.cake.libs
  */
 class Folder extends Object {
+
 /**
  * Path to Folder.
  *
@@ -45,6 +49,7 @@ class Folder extends Object {
  * @access public
  */
 	var $path = null;
+
 /**
  * Sortedness.
  *
@@ -52,6 +57,7 @@ class Folder extends Object {
  * @access public
  */
 	var $sort = false;
+
 /**
  * mode to be used on create.
  *
@@ -59,6 +65,7 @@ class Folder extends Object {
  * @access public
  */
 	var $mode = 0755;
+
 /**
  * holds messages from last method.
  *
@@ -66,6 +73,7 @@ class Folder extends Object {
  * @access private
  */
 	var $__messages = array();
+
 /**
  * holds errors from last method.
  *
@@ -73,6 +81,7 @@ class Folder extends Object {
  * @access private
  */
 	var $__errors = false;
+
 /**
  * holds array of complete directory paths.
  *
@@ -80,6 +89,7 @@ class Folder extends Object {
  * @access private
  */
 	var $__directories;
+
 /**
  * holds array of complete file paths.
  *
@@ -87,6 +97,7 @@ class Folder extends Object {
  * @access private
  */
 	var $__files;
+
 /**
  * Constructor.
  *
@@ -113,6 +124,7 @@ class Folder extends Object {
 			$this->cd($path);
 		}
 	}
+
 /**
  * Return current path.
  *
@@ -122,6 +134,7 @@ class Folder extends Object {
 	function pwd() {
 		return $this->path;
 	}
+
 /**
  * Change directory to $path.
  *
@@ -136,6 +149,7 @@ class Folder extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns an array of the contents of the current directory.
  * The returned array holds two arrays: One of directories and one of files.
@@ -179,6 +193,7 @@ class Folder extends Object {
 		closedir($dir);
 		return array($dirs, $files);
 	}
+
 /**
  * Returns an array of all matching files in current directory.
  *
@@ -190,6 +205,7 @@ class Folder extends Object {
 		list($dirs, $files) = $this->read($sort);
 		return array_values(preg_grep('/^' . $regexpPattern . '$/i', $files)); ;
 	}
+
 /**
  * Returns an array of all matching files in and below current directory.
  *
@@ -203,6 +219,7 @@ class Folder extends Object {
 		$this->cd($startsOn);
 		return $out;
 	}
+
 /**
  * Private helper function for findRecursive.
  *
@@ -227,6 +244,7 @@ class Folder extends Object {
 		}
 		return $found;
 	}
+
 /**
  * Returns true if given $path is a Windows path.
  *
@@ -241,6 +259,7 @@ class Folder extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns true if given $path is an absolute path.
  *
@@ -253,6 +272,7 @@ class Folder extends Object {
 		$match = preg_match('/^\\//', $path) || preg_match('/^[A-Z]:\\\\/i', $path);
 		return $match;
 	}
+
 /**
  * Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
  *
@@ -264,6 +284,7 @@ class Folder extends Object {
 	function normalizePath($path) {
 		return Folder::correctSlashFor($path);
 	}
+
 /**
  * Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
  *
@@ -278,6 +299,7 @@ class Folder extends Object {
 		}
 		return '/';
 	}
+
 /**
  * Returns $path with added terminating slash (corrected for Windows or other OS).
  *
@@ -292,6 +314,7 @@ class Folder extends Object {
 		}
 		return $path . Folder::correctSlashFor($path);
 	}
+
 /**
  * Returns $path with $element added, with correct slash in-between.
  *
@@ -304,6 +327,7 @@ class Folder extends Object {
 	function addPathElement($path, $element) {
 		return Folder::slashTerm($path) . $element;
 	}
+
 /**
  * Returns true if the File is in a given CakePath.
  *
@@ -316,6 +340,7 @@ class Folder extends Object {
 
 		return $this->inPath($newdir);
 	}
+
 /**
  * Returns true if the File is in given path.
  *
@@ -337,6 +362,7 @@ class Folder extends Object {
 			return false;
 		}
 	}
+
 /**
  * Change the mode on a directory structure recursively. This includes changing the mode on files as well.
  *
@@ -388,6 +414,7 @@ class Folder extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns an array of nested directories and files in each directory
  *
@@ -423,6 +450,7 @@ class Folder extends Object {
 
 		return $this->__files;
 	}
+
 /**
  * Private method to list directories and files in each directory
  *
@@ -437,6 +465,7 @@ class Folder extends Object {
 			$this->__files = array_merge($this->__files, $files);
 		}
 	}
+
 /**
  * Create a directory structure recursively.
  *
@@ -476,6 +505,7 @@ class Folder extends Object {
 		}
 		return true;
 	}
+
 /**
  * Returns the size in bytes of this Folder.
  *
@@ -512,6 +542,7 @@ class Folder extends Object {
 		}
 		return $size;
 	}
+
 /**
  * Recursively Remove directories if system allow.
  *
@@ -558,6 +589,7 @@ class Folder extends Object {
 		}
 		return true;
 	}
+
 /**
  * Recursive directory copy.
  *
@@ -633,6 +665,7 @@ class Folder extends Object {
 		}
 		return true;
 	}
+
 /**
  * Recursive directory move.
  *
@@ -655,6 +688,7 @@ class Folder extends Object {
 		}
 		return false;
 	}
+
 /**
  * get messages from latest method
  *
@@ -664,6 +698,7 @@ class Folder extends Object {
 	function messages() {
 		return $this->__messages;
 	}
+
 /**
  * get error from latest method
  *
@@ -673,6 +708,7 @@ class Folder extends Object {
 	function errors() {
 		return $this->__errors;
 	}
+
 /**
  * nix flavored alias
  *
@@ -682,6 +718,7 @@ class Folder extends Object {
 	function ls($sort = true, $exceptions = false) {
 		return $this->read($sort, $exceptions);
 	}
+
 /**
  * nix flavored alias
  *
@@ -691,6 +728,7 @@ class Folder extends Object {
 	function mkdir($pathname, $mode = 0755) {
 		return $this->create($pathname, $mode);
 	}
+
 /**
  * nix flavored alias
  *
@@ -700,6 +738,7 @@ class Folder extends Object {
 	function cp($options) {
 		return $this->copy($options);
 	}
+
 /**
  * nix flavored alias
  *
@@ -709,6 +748,7 @@ class Folder extends Object {
 	function mv($options) {
 		return $this->move($options);
 	}
+
 /**
  * nix flavored alias
  *
@@ -718,6 +758,7 @@ class Folder extends Object {
 	function rm($path) {
 		return $this->delete($path);
 	}
+
 /**
  * Get the real path (taking ".." and such into account)
  *
@@ -757,6 +798,7 @@ class Folder extends Object {
 
 		return Folder::slashTerm($newpath);
 	}
+
 /**
  * Returns true if given $path ends in a slash (i.e. is slash-terminated).
  *
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 3802a8756..58e5bc152 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * HTTP Socket connection class.
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Core', array('CakeSocket', 'Set', 'Router'));
+
 /**
  * Cake network socket connection class.
  *
@@ -32,6 +34,7 @@ App::import('Core', array('CakeSocket', 'Set', 'Router'));
  * @subpackage    cake.cake.libs
  */
 class HttpSocket extends CakeSocket {
+
 /**
  * Object description
  *
@@ -39,6 +42,7 @@ class HttpSocket extends CakeSocket {
  * @access public
  */
 	var $description = 'HTTP-based DataSource Interface';
+
 /**
  * When one activates the $quirksMode by setting it to true, all checks meant to
  * enforce RFC 2616 (HTTP/1.1 specs).
@@ -48,6 +52,7 @@ class HttpSocket extends CakeSocket {
  * @access public
  */
 	var $quirksMode = false;
+
 /**
  * The default values to use for a request
  *
@@ -81,6 +86,7 @@ class HttpSocket extends CakeSocket {
 		'raw' => null,
 		'cookies' => array()
 	);
+
 /**
 * The default structure for storing the response
 *
@@ -103,6 +109,7 @@ class HttpSocket extends CakeSocket {
 		'body' => '',
 		'cookies' => array()
 	);
+
 /**
  * Default configuration settings for the HttpSocket
  *
@@ -129,6 +136,7 @@ class HttpSocket extends CakeSocket {
 			'cookies' => array()
 		)
 	);
+
 /**
  * String that represents a line break.
  *
@@ -154,6 +162,7 @@ class HttpSocket extends CakeSocket {
 		}
 		parent::__construct($this->config);
 	}
+
 /**
  * Issue the specified request.
  *
@@ -203,10 +212,10 @@ class HttpSocket extends CakeSocket {
 		}
 
 		if (isset($this->request['auth']['user']) && isset($this->request['auth']['pass'])) {
-			$this->request['header']['Authorization'] = $this->request['auth']['method'] ." ". base64_encode($this->request['auth']['user'] .":".$this->request['auth']['pass']);
+			$this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['auth']['user'] . ":" . $this->request['auth']['pass']);
 		}
 		if (isset($this->request['uri']['user']) && isset($this->request['uri']['pass'])) {
-			$this->request['header']['Authorization'] = $this->request['auth']['method'] ." ". base64_encode($this->request['uri']['user'] .":".$this->request['uri']['pass']);
+			$this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['uri']['user'] . ":" . $this->request['uri']['pass']);
 		}
 
 		if (is_array($this->request['body'])) {
@@ -221,8 +230,11 @@ class HttpSocket extends CakeSocket {
 			$this->request['header']['Content-Length'] = strlen($this->request['body']);
 		}
 
-		$connectionType = @$this->request['header']['Connection'];
-		$this->request['header'] = $this->_buildHeader($this->request['header']).$cookies;
+		$connectionType = null;
+		if (isset($this->request['header']['Connection'])) {
+			$connectionType = $this->request['header']['Connection'];
+		}
+		$this->request['header'] = $this->_buildHeader($this->request['header']) . $cookies;
 
 		if (empty($this->request['line'])) {
 			$this->request['line'] = $this->_buildRequestLine($this->request);
@@ -260,6 +272,7 @@ class HttpSocket extends CakeSocket {
 
 		return $this->response['body'];
 	}
+
 /**
  * Issues a GET request to the specified URI, query, and request.
  *
@@ -297,6 +310,7 @@ class HttpSocket extends CakeSocket {
 		$request = Set::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request);
 		return $this->request($request);
 	}
+
 /**
  * Issues a PUT request to the specified URI, query, and request.
  *
@@ -310,6 +324,7 @@ class HttpSocket extends CakeSocket {
 		$request = Set::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request);
 		return $this->request($request);
 	}
+
 /**
  * Issues a DELETE request to the specified URI, query, and request.
  *
@@ -323,6 +338,7 @@ class HttpSocket extends CakeSocket {
 		$request = Set::merge(array('method' => 'DELETE', 'uri' => $uri, 'body' => $data), $request);
 		return $this->request($request);
 	}
+
 /**
  * undocumented function
  *
@@ -358,6 +374,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $this->_buildUri($url);
 	}
+
 /**
  * Parses the given message and breaks it down in parts.
  *
@@ -396,7 +413,11 @@ class HttpSocket extends CakeSocket {
 		}
 
 		$response['header'] = $this->_parseHeader($response['raw']['header']);
-		$decoded = $this->_decodeBody($response['raw']['body'], @$response['header']['Transfer-Encoding']);
+		$transferEncoding = null;
+		if (isset($response['header']['Transfer-Encoding'])) {
+			$transferEncoding = $response['header']['Transfer-Encoding'];
+		}
+		$decoded = $this->_decodeBody($response['raw']['body'], $transferEncoding);
 		$response['body'] = $decoded['body'];
 
 		if (!empty($decoded['header'])) {
@@ -415,6 +436,7 @@ class HttpSocket extends CakeSocket {
 
 		return $response;
 	}
+
 /**
  * Generic function to decode a $body with a given $encoding. Returns either an array with the keys
  * 'body' and 'header' or false on failure.
@@ -441,6 +463,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $this->{$decodeMethod}($body);
 	}
+
 /**
  * Decodes a chunked message $body and returns either an array with the keys 'body' and 'header' or false as
  * a result.
@@ -503,6 +526,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return array('body' => $decodedBody, 'header' => $entityHeader);
 	}
+
 /**
  * Parses and sets the specified URI into current request configuration.
  *
@@ -535,6 +559,7 @@ class HttpSocket extends CakeSocket {
 		$this->config = Set::merge($this->config, array_intersect_key($this->config['request']['uri'], $this->config));
 		return $this->config;
 	}
+
 /**
  * Takes a $uri array and turns it into a fully qualified URL string
  *
@@ -581,6 +606,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $uriTemplate;
 	}
+
 /**
  * Parses the given URI and breaks it down into pieces as an indexed array with elements
  * such as 'scheme', 'port', 'query'.
@@ -640,6 +666,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $uri;
 	}
+
 /**
  * This function can be thought of as a reverse to PHP5's http_build_query(). It takes a given query string and turns it into an array and
  * supports nesting by using the php bracket syntax. So this menas you can parse queries like:
@@ -703,6 +730,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $parsedQuery;
 	}
+
 /**
  * Builds a request line according to HTTP/1.1 specs. Activate quirks mode to work outside specs.
  *
@@ -737,6 +765,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $request['method'].' '.$request['uri'].' '.$versionToken.$this->lineBreak;
 	}
+
 /**
  * Serializes an array for transport.
  *
@@ -753,6 +782,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return substr(Router::queryString($data), 1);
 	}
+
 /**
  * Builds the header.
  *
@@ -806,7 +836,7 @@ class HttpSocket extends CakeSocket {
 			return false;
 		}
 
-		preg_match_all("/(.+):(.+)(?:(?<![\t ])".$this->lineBreak."|\$)/Uis", $header, $matches, PREG_SET_ORDER);
+		preg_match_all("/(.+):(.+)(?:(?<![\t ])" . $this->lineBreak . "|\$)/Uis", $header, $matches, PREG_SET_ORDER);
 
 		$header = array();
 		foreach ($matches as $match) {
@@ -831,6 +861,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $header;
 	}
+
 /**
  * undocumented function
  *
@@ -865,6 +896,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $cookies;
 	}
+
 /**
  * undocumented function
  *
@@ -881,6 +913,7 @@ class HttpSocket extends CakeSocket {
 		$header = $this->_buildHeader(array('Cookie' => $header), 'pragmatic');
 		return $header;
 	}
+
 /**
  * Unescapes a given $token according to RFC 2616 (HTTP 1.1 specs)
  *
@@ -894,6 +927,7 @@ class HttpSocket extends CakeSocket {
 		$token = preg_replace($regex, '\\1', $token);
 		return $token;
 	}
+
 /**
  * Escapes a given $token according to RFC 2616 (HTTP 1.1 specs)
  *
@@ -907,6 +941,7 @@ class HttpSocket extends CakeSocket {
 		$token = preg_replace($regex, '"\\1"', $token);
 		return $token;
 	}
+
 /**
  * Gets escape chars according to RFC 2616 (HTTP 1.1 specs).
  *
@@ -935,6 +970,7 @@ class HttpSocket extends CakeSocket {
 		}
 		return $escape;
 	}
+
 /**
  * Resets the state of this HttpSocket instance to it's initial state (before Object::__construct got executed) or does
  * the same thing partially for the request and the response property only.
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 3693bf35d..f23a6a87d 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,10 +25,12 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  */
 App::import('Core', 'l10n');
+
 /**
  * Short description for file.
  *
@@ -37,6 +40,7 @@ App::import('Core', 'l10n');
  * @subpackage    cake.cake.libs
  */
 class I18n extends Object {
+
 /**
  * Instance of the I10n class for localization
  *
@@ -44,6 +48,7 @@ class I18n extends Object {
  * @access public
  */
 	var $l10n = null;
+
 /**
  * Current domain of translation
  *
@@ -51,6 +56,7 @@ class I18n extends Object {
  * @access public
  */
 	var $domain = null;
+
 /**
  * Current category of translation
  *
@@ -58,13 +64,15 @@ class I18n extends Object {
  * @access public
  */
 	var $category = 'LC_MESSAGES';
+
 /**
  * Current language used for translations
  *
  * @var string
- * @access private;
+ * @access private
  */
 	var $__lang = null;
+
 /**
  * Translation strings for a specific domain read from the .mo or .po files
  *
@@ -72,6 +80,7 @@ class I18n extends Object {
  * @access private
  */
 	var $__domains = array();
+
 /**
  * Set to true when I18N::__bindTextDomain() is called for the first time.
  * If a translation file is found it is set to false again
@@ -80,6 +89,7 @@ class I18n extends Object {
  * @access private
  */
 	var $__noLocale = false;
+
 /**
  * Determine if $__domains cache should be wrote
  *
@@ -87,6 +97,7 @@ class I18n extends Object {
  * @access private
  */
 	var $__cache = false;
+
 /**
  * Set to true when I18N::__bindTextDomain() is called for the first time.
  * If a translation file is found it is set to false again
@@ -94,7 +105,10 @@ class I18n extends Object {
  * @var array
  * @access private
  */
-	var $__categories = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL');
+	var $__categories = array(
+		 'LC_ALL', 'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME', 'LC_MESSAGES'
+	);
+
 /**
  * Return a static instance of the I18n class
  *
@@ -109,9 +123,10 @@ class I18n extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Used by the translation functions in basics.php
- * Can also be used like I18n::translate(); but only if the uses('i18n'); has been used to load the class.
+ * Can also be used like I18n::translate(); but only if the App::import('I18n'); has been used to load the class.
  *
  * @param string $singular String to translate
  * @param string $plural Plural string (if any)
@@ -121,7 +136,7 @@ class I18n extends Object {
  * @return string translated strings.
  * @access public
  */
-	function translate($singular, $plural = null, $domain = null, $category = null, $count = null) {
+	function translate($singular, $plural = null, $domain = null, $category = 6, $count = null) {
 		$_this =& I18n::getInstance();
 
 		if (strpos($singular, "\r\n") !== false) {
@@ -191,6 +206,7 @@ class I18n extends Object {
 		}
 		return($singular);
 	}
+
 /**
  * Attempts to find the plural form of a string.
  *
@@ -240,6 +256,7 @@ class I18n extends Object {
 			return $n == 1 ? 0 : ($n == 2 ? 1 : ($n >= 3 && $n <= 6 ? 2 : ($n >= 7 && $n <= 10 ? 3 : 4)));
 		}
 	}
+
 /**
  * Binds the given domain to a file in the specified directory.
  *
@@ -325,6 +342,7 @@ class I18n extends Object {
 		}
 		return($domain);
 	}
+
 /**
  * Loads the binary .mo file for translation and sets the values for this translation in the var I18n::__domains
  *
@@ -364,6 +382,7 @@ class I18n extends Object {
 			}
 		}
 	}
+
 /**
  * Loads the text .po file for translation and sets the values for this translation in the var I18n::__domains
  *
@@ -434,6 +453,7 @@ class I18n extends Object {
 		$merge[""] = $header;
 		return $this->__domains[$this->category][$this->__lang][$domain] = array_merge($merge ,$translations);
 	}
+
 /**
  * Object destructor
  *
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 47fdc3979..419659d69 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -19,6 +19,7 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * Included libraries.
  *
@@ -26,6 +27,7 @@
 if (!class_exists('Object')) {
 	require_once(LIBS . 'object.php');
 }
+
 /**
  * Pluralize and singularize English words.
  *
@@ -447,10 +449,11 @@ class Inflector extends Object {
 			'/Ü/' => 'Ue',
 			'/Ö/' => 'Oe',
 			'/ß/' => 'ss',
-			'/[^\w\s]/' => ' ',
+			'/[^\s\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]/mu' => ' ',
 			'/\\s+/' => $replacement,
 			sprintf('/^[%s]+|[%s]+$/', $quotedReplacement, $quotedReplacement) => '',
 		);
+
 		$map = array_merge($default, $map);
 		return preg_replace(array_keys($map), array_values($map), $string);
 	}
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 0df50204a..cce6b57f2 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs
  */
 class L10n extends Object {
+
 /**
  * The language for current locale
  *
@@ -40,6 +43,7 @@ class L10n extends Object {
  * @access public
  */
 	var $language = 'English (United States)';
+
 /**
  * Locale search paths
  *
@@ -47,6 +51,7 @@ class L10n extends Object {
  * @access public
  */
 	var $languagePath = array('eng');
+
 /**
  * ISO 639-3 for current locale
  *
@@ -54,6 +59,7 @@ class L10n extends Object {
  * @access public
  */
 	var $lang = 'eng';
+
 /**
  * Locale
  *
@@ -61,6 +67,7 @@ class L10n extends Object {
  * @access public
  */
 	var $locale = 'en_us';
+
 /**
  * Default ISO 639-3 language.
  *
@@ -70,6 +77,7 @@ class L10n extends Object {
  * @access public
  */
 	var $default = null;
+
 /**
  * Encoding used for current locale
  *
@@ -77,6 +85,7 @@ class L10n extends Object {
  * @access public
  */
 	var $charset = 'utf-8';
+
 /**
  * Set to true if a locale is found
  *
@@ -84,6 +93,7 @@ class L10n extends Object {
  * @access public
  */
 	var $found = false;
+
 /**
  * Maps ISO 639-3 to I10n::__l10nCatalog
  *
@@ -167,6 +177,7 @@ class L10n extends Object {
 								/* Xhosa */ 'xho' => 'xh',
 								/* Yiddish */ 'yid' => 'yi',
 								/* Zulu */ 'zul' => 'zu');
+
 /**
  * HTTP_ACCEPT_LANGUAGE catalog
  *
@@ -314,6 +325,7 @@ class L10n extends Object {
 										'zh-sg' => array('language' => 'Chinese (Singapore)', 'locale' => 'zh_sg', 'localeFallback' => 'chi', 'charset' => 'utf-8'),
 										'zh-tw' => array('language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'chi', 'charset' => 'utf-8'),
 										'zu' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8'));
+
 /**
  * Class constructor
  */
@@ -323,6 +335,7 @@ class L10n extends Object {
 		}
 		parent::__construct();
 	}
+
 /**
  * Gets the settings for $language.
  * If $language is null it attempt to get settings from I10n::__autoLanguage(); if this fails
@@ -338,6 +351,7 @@ class L10n extends Object {
 			return $this->__setLanguage();
 		}
 	}
+
 /**
  * Sets the class vars to correct values for $language.
  * If $language is null it will use the DEFAULT_LANGUAGE if defined
@@ -386,6 +400,7 @@ class L10n extends Object {
 			return $language;
 		}
 	}
+
 /**
  * Attempts to find the locale settings based on the HTTP_ACCEPT_LANGUAGE variable
  *
@@ -413,6 +428,7 @@ class L10n extends Object {
 		}
 		return false;
 	}
+
 /**
  * Attempts to find locale for language, or language for locale
  *
@@ -439,6 +455,7 @@ class L10n extends Object {
 		}
 		return $this->__l10nMap;
 	}
+
 /**
  * Attempts to find catalog record for requested language
  *
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 73b16017c..e5a99e8d3 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MagicDb parser and file analyzer
  *
@@ -25,6 +26,7 @@
 if (!class_exists('File')) {
 	uses('object', 'file');
 }
+
 /**
  * A class to parse and use the MagicDb for file type analysis
  *
@@ -32,6 +34,7 @@ if (!class_exists('File')) {
  * @subpackage    cake.tests.cases.libs
  */
 class MagicDb extends Object {
+
 /**
  * Holds the parsed MagicDb for this class instance
  *
@@ -179,6 +182,7 @@ class MagicDb extends Object {
  * @subpackage    cake.tests.cases.libs
  */
 class MagicFileResource extends Object{
+
 /**
  * undocumented variable
  *
@@ -186,6 +190,7 @@ class MagicFileResource extends Object{
  * @access public
  */
 	var $resource = null;
+
 /**
  * undocumented variable
  *
@@ -193,6 +198,7 @@ class MagicFileResource extends Object{
  * @access public
  */
 	var $offset = 0;
+
 /**
  * undocumented function
  *
@@ -207,6 +213,7 @@ class MagicFileResource extends Object{
 			$this->resource = $file;
 		}
 	}
+
 /**
  * undocumented function
  *
@@ -234,6 +241,7 @@ class MagicFileResource extends Object{
 		$val = $this->extract($offset, $type, $expected);
 		return $val == $expected;
 	}
+
 /**
  * undocumented function
  *
@@ -248,6 +256,7 @@ class MagicFileResource extends Object{
 		}
 		return $this->resource->read($length);
 	}
+
 /**
  * undocumented function
  *
@@ -267,6 +276,7 @@ class MagicFileResource extends Object{
 				break;
 		}
 	}
+
 /**
  * undocumented function
  *
diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php
index 120aa563c..e8a9aa1b7 100644
--- a/cake/libs/model/app_model.php
+++ b/cake/libs/model/app_model.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Application model for Cake.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Application model for Cake.
  *
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 0b867a2ca..a7c01a804 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ACL behavior class.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.model.behaviors
  */
 class AclBehavior extends ModelBehavior {
+
 /**
  * Maps ACL type options to ACL models
  *
@@ -40,6 +43,7 @@ class AclBehavior extends ModelBehavior {
  * @access protected
  */
 	var $__typeMaps = array('requester' => 'Aro', 'controlled' => 'Aco');
+
 /**
  * Sets up the configuation for the model, and loads ACL models if they haven't been already
  *
@@ -62,6 +66,7 @@ class AclBehavior extends ModelBehavior {
 			trigger_error("Callback parentNode() not defined in {$model->alias}", E_USER_WARNING);
 		}
 	}
+
 /**
  * Retrieves the Aro/Aco node for this model
  *
@@ -76,6 +81,7 @@ class AclBehavior extends ModelBehavior {
 		}
 		return $model->{$type}->node($ref);
 	}
+
 /**
  * Creates a new ARO/ACO node bound to this record
  *
@@ -101,6 +107,7 @@ class AclBehavior extends ModelBehavior {
 			));
 		}
 	}
+
 /**
  * Destroys the ARO/ACO node bound to the deleted record
  *
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index edcadd51b..791f78918 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Behavior for binding management.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
@@ -32,6 +34,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class ContainableBehavior extends ModelBehavior {
+
 /**
  * Types of relationships available for models
  *
@@ -39,6 +42,7 @@ class ContainableBehavior extends ModelBehavior {
  * @access private
  */
 	var $types = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+
 /**
  * Runtime configuration for this behavior
  *
@@ -46,9 +50,10 @@ class ContainableBehavior extends ModelBehavior {
  * @access private
  */
 	var $runtime = array();
+
 /**
  * Initiate behavior for the model using specified settings.
- * 
+ *
  * Available settings:
  *
  * - recursive: (boolean, optional) set to true to allow containable to automatically
@@ -73,6 +78,7 @@ class ContainableBehavior extends ModelBehavior {
 		}
 		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
 	}
+
 /**
  * Runs before a find() operation. Used to allow 'contain' setting
  * as part of the find call, like this:
@@ -200,6 +206,7 @@ class ContainableBehavior extends ModelBehavior {
 		$query['fields'] = array_unique($query['fields']);
 		return $query;
 	}
+
 /**
  * Resets original associations on models that may have receive multiple,
  * subsequent unbindings.
@@ -217,6 +224,7 @@ class ContainableBehavior extends ModelBehavior {
 			}
 		}
 	}
+
 /**
  * Unbinds all relations from a model except the specified ones. Calling this function without
  * parameters unbinds all related models.
@@ -230,6 +238,7 @@ class ContainableBehavior extends ModelBehavior {
 		$contain = call_user_func_array('am', array_slice($args, 1));
 		$this->runtime[$Model->alias]['contain'] = $contain;
 	}
+
 /**
  * Permanently restore the original binding settings of given model, useful
  * for restoring the bindings after using 'reset' => false as part of the
@@ -253,6 +262,7 @@ class ContainableBehavior extends ModelBehavior {
 			}
 		}
 	}
+
 /**
  * Process containments for model.
  *
@@ -357,6 +367,7 @@ class ContainableBehavior extends ModelBehavior {
 		$containments['depth'] = empty($depths) ? 0 : max($depths);
 		return $containments;
 	}
+
 /**
  * Calculate needed fields to fetch the required bindings for the given model.
  *
@@ -404,6 +415,7 @@ class ContainableBehavior extends ModelBehavior {
 		}
 		return array_unique($fields);
 	}
+
 /**
  * Build the map of containments
  *
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 7e959f50c..35ffe36c3 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -33,10 +35,12 @@
  * @subpackage    cake.cake.libs.model.behaviors
  */
 class TranslateBehavior extends ModelBehavior {
+
 /**
  * Used for runtime configuration of model
  */
 	var $runtime = array();
+
 /**
  * Callback
  *
@@ -69,6 +73,7 @@ class TranslateBehavior extends ModelBehavior {
 		$this->translateModel($model);
 		return $this->bindTranslation($model, $config, false);
 	}
+
 /**
  * Callback
  *
@@ -80,6 +85,7 @@ class TranslateBehavior extends ModelBehavior {
 		unset($this->settings[$model->alias]);
 		unset($this->runtime[$model->alias]);
 	}
+
 /**
  * beforeFind Callback
  *
@@ -200,6 +206,7 @@ class TranslateBehavior extends ModelBehavior {
 		$this->runtime[$model->alias]['beforeFind'] = $addFields;
 		return $query;
 	}
+
 /**
  * afterFind Callback
  *
@@ -244,6 +251,7 @@ class TranslateBehavior extends ModelBehavior {
 		}
 		return $results;
 	}
+
 /**
  * beforeValidate Callback
  *
@@ -276,6 +284,7 @@ class TranslateBehavior extends ModelBehavior {
 		$this->runtime[$model->alias]['beforeSave'] = $tempData;
 		return true;
 	}
+
 /**
  * afterSave Callback
  *
@@ -319,6 +328,7 @@ class TranslateBehavior extends ModelBehavior {
 			}
 		}
 	}
+
 /**
  * afterDelete Callback
  *
@@ -330,6 +340,7 @@ class TranslateBehavior extends ModelBehavior {
 		$conditions = array('model' => $model->alias, 'foreign_key' => $model->id);
 		$RuntimeModel->deleteAll($conditions);
 	}
+
 /**
  * Get selected locale for model
  *
@@ -348,6 +359,7 @@ class TranslateBehavior extends ModelBehavior {
 
 		return $model->locale;
 	}
+
 /**
  * Get instance of model for translations
  *
@@ -375,6 +387,7 @@ class TranslateBehavior extends ModelBehavior {
 		}
 		return $this->runtime[$model->alias]['model'];
 	}
+
 /**
  * Bind translation for fields, optionally with hasMany association for
  * fake field
@@ -447,6 +460,7 @@ class TranslateBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Unbind translation for fields, optionally unbinds hasMany association for
  * fake field
@@ -499,6 +513,7 @@ class TranslateBehavior extends ModelBehavior {
 	}
 }
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+
 /**
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index da23c193d..c1d51bb85 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Tree behavior class.
  *
@@ -24,22 +25,25 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Tree Behavior.
  *
  * Enables a model object to act as a node-based tree. Using Modified Preorder Tree Traversal
- * 
+ *
  * @see http://en.wikipedia.org/wiki/Tree_traversal
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
  */
 class TreeBehavior extends ModelBehavior {
+
 /**
  * Errors
  *
  * @var array
  */
 	var $errors = array();
+
 /**
  * Defaults
  *
@@ -50,6 +54,7 @@ class TreeBehavior extends ModelBehavior {
 		'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght',
 		'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, 'recursive' => -1
 	);
+
 /**
  * Initiate Tree behavior
  *
@@ -72,6 +77,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		$this->settings[$Model->alias] = $settings;
 	}
+
 /**
  * After save method. Called after all saves
  *
@@ -94,6 +100,7 @@ class TreeBehavior extends ModelBehavior {
 			return $this->_setParent($Model, $Model->data[$Model->alias][$parent]);
 		}
 	}
+
 /**
  * Before delete method. Called before all deletes
  *
@@ -123,6 +130,7 @@ class TreeBehavior extends ModelBehavior {
 		$this->__sync($Model, $diff, '-', '> ' . $data[$right]);
 		return true;
 	}
+
 /**
  * Before save method. Called before all saves
  *
@@ -196,6 +204,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Get the number of child nodes
  *
@@ -236,6 +245,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return ($data[$right] - $data[$left] - 1) / 2;
 	}
+
 /**
  * Get the child nodes of the current model
  *
@@ -297,6 +307,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
 	}
+
 /**
  * A convenience method for returning a hierarchical array used for HTML select boxes
  *
@@ -352,6 +363,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return Set::combine($results, $keyPath, $valuePath);
 	}
+
 /**
  * Get the parent node
  *
@@ -385,6 +397,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return false;
 	}
+
 /**
  * Get the path to the given node
  *
@@ -420,6 +433,7 @@ class TreeBehavior extends ModelBehavior {
 		));
 		return $results;
 	}
+
 /**
  * Reorder the node without changing the parent.
  *
@@ -477,6 +491,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Reorder the node without changing the parent.
  *
@@ -535,6 +550,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Recover a corrupted tree
  *
@@ -609,6 +625,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Reorder method.
  *
@@ -616,9 +633,9 @@ class TreeBehavior extends ModelBehavior {
  * This method does not change the parent of any node.
  *
  * Requires a valid tree, by default it verifies the tree before beginning.
- * 
+ *
  * Options:
- * 
+ *
  * - 'id' id of record to use as top node for reordering
  * - 'field' Which field to use in reordeing defaults to displayField
  * - 'order' Direction to order either DESC or ASC (defaults to ASC)
@@ -651,6 +668,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Remove the current node from the tree, and reparent all children up one level.
  *
@@ -720,6 +738,7 @@ class TreeBehavior extends ModelBehavior {
 			);
 		}
 	}
+
 /**
  * Check if the current tree is valid.
  *
@@ -789,6 +808,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * Sets the parent of the given node
  *
@@ -858,6 +878,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		return true;
 	}
+
 /**
  * get the maximum index value in the table.
  *
@@ -885,6 +906,7 @@ class TreeBehavior extends ModelBehavior {
 		)));
 		return (empty($edge[$right])) ? 0 : $edge[$right];
 	}
+
 /**
  * get the minimum index value in the table.
  *
@@ -904,6 +926,7 @@ class TreeBehavior extends ModelBehavior {
 		)));
 		return (empty($edge[$left])) ? 0 : $edge[$left];
 	}
+
 /**
  * Table sync method.
  *
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index 31e7e9cfe..0718895ba 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Schema database management for CakePHP.
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Model', 'ConnectionManager');
+
 /**
  * Base Class for Schema management
  *
@@ -30,6 +32,7 @@ App::import('Model', 'ConnectionManager');
  * @subpackage    cake.cake.libs.model
  */
 class CakeSchema extends Object {
+
 /**
  * Name of the App Schema
  *
@@ -37,6 +40,7 @@ class CakeSchema extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * Path to write location
  *
@@ -44,6 +48,7 @@ class CakeSchema extends Object {
  * @access public
  */
 	var $path = null;
+
 /**
  * File to write
  *
@@ -51,6 +56,7 @@ class CakeSchema extends Object {
  * @access public
  */
 	var $file = 'schema.php';
+
 /**
  * Connection used for read
  *
@@ -58,6 +64,7 @@ class CakeSchema extends Object {
  * @access public
  */
 	var $connection = 'default';
+
 /**
  * Set of tables
  *
@@ -65,6 +72,7 @@ class CakeSchema extends Object {
  * @access public
  */
 	var $tables = array();
+
 /**
  * Constructor
  *
@@ -88,6 +96,7 @@ class CakeSchema extends Object {
 		$options = array_merge(get_object_vars($this), $options);
 		$this->_build($options);
 	}
+
 /**
  * Builds schema object properties
  *
@@ -115,6 +124,7 @@ class CakeSchema extends Object {
 			$this->file = $file;
 		}
 	}
+
 /**
  * Before callback to be implemented in subclasses
  *
@@ -125,6 +135,7 @@ class CakeSchema extends Object {
 	function before($event = array()) {
 		return true;
 	}
+
 /**
  * After callback to be implemented in subclasses
  *
@@ -133,6 +144,7 @@ class CakeSchema extends Object {
  */
 	function after($event = array()) {
 	}
+
 /**
  * Reads database and creates schema tables
  *
@@ -164,11 +176,12 @@ class CakeSchema extends Object {
 
 		return false;
 	}
+
 /**
  * Reads database and creates schema tables
  *
  * Options
- * 
+ *
  * - 'connection' - the db connection to use
  * - 'name' - name of the schema
  * - 'models' - a list of models to use, or false to ignore models
@@ -275,6 +288,7 @@ class CakeSchema extends Object {
 		ksort($tables);
 		return compact('name', 'tables');
 	}
+
 /**
  * Writes schema file from object or options
  *
@@ -338,7 +352,7 @@ class CakeSchema extends Object {
 							$col = "\t\t'indexes' => array(";
 							$props = array();
 							foreach ((array)$value as $key => $index) {
-								$props[] = "'{$key}' => array(".join(', ',  $this->__values($index)).")";
+								$props[] = "'{$key}' => array(" . join(', ',  $this->__values($index)) . ")";
 							}
 							$col .= join(', ', $props);
 						}
@@ -362,6 +376,7 @@ class CakeSchema extends Object {
 		}
 		return false;
 	}
+
 /**
  * Compares two sets of schemas
  *
@@ -434,6 +449,7 @@ class CakeSchema extends Object {
 		}
 		return $tables;
 	}
+
 /**
  * Formats Schema columns from Model Object
  *
@@ -446,7 +462,7 @@ class CakeSchema extends Object {
 		if (is_array($values)) {
 			foreach ($values as $key => $val) {
 				if (is_array($val)) {
-					$vals[] = "'{$key}' => array('".join("', '",  $val)."')";
+					$vals[] = "'{$key}' => array('" . join("', '",  $val) . "')";
 				} else if (!is_numeric($key)) {
 					$val = var_export($val, true);
 					$vals[] = "'{$key}' => {$val}";
@@ -455,6 +471,7 @@ class CakeSchema extends Object {
 		}
 		return $vals;
 	}
+
 /**
  * Formats Schema columns from Model Object
  *
@@ -497,6 +514,7 @@ class CakeSchema extends Object {
 
 		return $columns;
 	}
+
 /**
  * Compare two schema indexes
  *
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 32f169840..e9dbd8990 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Datasource connection manager
  *
@@ -36,6 +37,7 @@ config('database');
  * @subpackage    cake.cake.libs.model
  */
 class ConnectionManager extends Object {
+
 /**
  * Holds a loaded instance of the Connections object
  *
@@ -43,6 +45,7 @@ class ConnectionManager extends Object {
  * @access public
  */
 	var $config = null;
+
 /**
  * Holds instances DataSource objects
  *
@@ -50,6 +53,7 @@ class ConnectionManager extends Object {
  * @access protected
  */
 	var $_dataSources = array();
+
 /**
  * Contains a list of all file and class names used in Connection settings
  *
@@ -57,6 +61,7 @@ class ConnectionManager extends Object {
  * @access protected
  */
 	var $_connectionsEnum = array();
+
 /**
  * Constructor.
  *
@@ -66,6 +71,7 @@ class ConnectionManager extends Object {
 			$this->config =& new DATABASE_CONFIG();
 		}
 	}
+
 /**
  * Gets a reference to the ConnectionManger object instance
  *
@@ -82,6 +88,7 @@ class ConnectionManager extends Object {
 
 		return $instance[0];
 	}
+
 /**
  * Gets a reference to a DataSource object
  *
@@ -113,6 +120,7 @@ class ConnectionManager extends Object {
 		$return =& $_this->_dataSources[$name];
 		return $return;
 	}
+
 /**
  * Gets the list of available DataSource connections
  *
@@ -124,6 +132,7 @@ class ConnectionManager extends Object {
 		$_this =& ConnectionManager::getInstance();
 		return array_keys($_this->_dataSources);
 	}
+
 /**
  * Gets a DataSource name from an object reference
  *
@@ -142,6 +151,7 @@ class ConnectionManager extends Object {
 		}
 		return null;
 	}
+
 /**
  * Loads the DataSource class for the given connection name
  *
@@ -180,6 +190,7 @@ class ConnectionManager extends Object {
 			return null;
 		}
 	}
+
 /**
  * Gets a list of class and file names associated with the user-defined DataSource connections
  *
@@ -205,6 +216,7 @@ class ConnectionManager extends Object {
 			$_this->cakeError('missingConnection', array(array('className' => 'ConnectionManager')));
 		}
 	}
+
 /**
  * Dynamically creates a DataSource object at runtime, with the given name and settings
  *
@@ -227,6 +239,7 @@ class ConnectionManager extends Object {
 		$return =& $_this->getDataSource($name);
 		return $return;
 	}
+
 /**
  * Returns the file, class name, and parent for the given driver.
  *
@@ -249,6 +262,7 @@ class ConnectionManager extends Object {
 		}
 		return array('filename'  => $filename, 'classname' => $classname, 'parent' => $parent);
 	}
+
 /**
  * Destructor.
  *
@@ -260,4 +274,4 @@ class ConnectionManager extends Object {
 		}
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 4fa8fba2e..62c75ed16 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DataSource base class
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * DataSource base class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.model.datasources
  */
 class DataSource extends Object {
+
 /**
  * Are we connected to the DataSource?
  *
@@ -40,6 +43,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $connected = false;
+
 /**
  * Print full query debug info?
  *
@@ -47,6 +51,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $fullDebug = false;
+
 /**
  * Error description of last query
  *
@@ -54,6 +59,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $error = null;
+
 /**
  * String to hold how many rows were affected by the last SQL operation.
  *
@@ -61,6 +67,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $affected = null;
+
 /**
  * Number of rows in current resultset
  *
@@ -68,6 +75,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $numRows = null;
+
 /**
  * Time the last query took
  *
@@ -75,18 +83,21 @@ class DataSource extends Object {
  * @access public
  */
 	var $took = null;
+
 /**
  * The starting character that this DataSource uses for quoted identifiers.
  *
  * @var string
  */
 	var $startQuote = null;
+
 /**
  * The ending character that this DataSource uses for quoted identifiers.
  *
  * @var string
  */
 	var $endQuote = null;
+
 /**
  * Enter description here...
  *
@@ -94,6 +105,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_result = null;
+
 /**
  * Queries count.
  *
@@ -101,6 +113,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_queriesCnt = 0;
+
 /**
  * Total duration of all queries.
  *
@@ -108,6 +121,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_queriesTime = null;
+
 /**
  * Log of queries executed by this DataSource
  *
@@ -115,6 +129,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_queriesLog = array();
+
 /**
  * Maximum number of items in query log, to prevent query log taking over
  * too much memory on large amounts of queries -- I we've had problems at
@@ -124,6 +139,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_queriesLogMax = 200;
+
 /**
  * Caches serialzed results of executed queries
  *
@@ -131,6 +147,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $_queryCache = array();
+
 /**
  * The default configuration of a specific DataSource
  *
@@ -138,6 +155,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $_baseConfig = array();
+
 /**
  * Holds references to descriptions loaded by the DataSource
  *
@@ -145,6 +163,7 @@ class DataSource extends Object {
  * @access private
  */
 	var $__descriptions = array();
+
 /**
  * Holds a list of sources (tables) contained in the DataSource
  *
@@ -152,6 +171,7 @@ class DataSource extends Object {
  * @access protected
  */
 	var $_sources = null;
+
 /**
  * A reference to the physical connection of this DataSource
  *
@@ -159,6 +179,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $connection = null;
+
 /**
  * The DataSource configuration
  *
@@ -166,6 +187,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $config = array();
+
 /**
  * The DataSource configuration key name
  *
@@ -173,6 +195,7 @@ class DataSource extends Object {
  * @access public
  */
 	var $configKeyName = null;
+
 /**
  * Whether or not this DataSource is in the middle of a transaction
  *
@@ -180,6 +203,7 @@ class DataSource extends Object {
  * @access protected
  */
 	var $_transactionStarted = false;
+
 /**
  * Whether or not source data like available tables and schema descriptions
  * should be cached
@@ -187,6 +211,7 @@ class DataSource extends Object {
  * @var boolean
  */
 	var $cacheSources = true;
+
 /**
  * Constructor.
  */
@@ -194,6 +219,7 @@ class DataSource extends Object {
 		parent::__construct();
 		$this->setConfig($config);
 	}
+
 /**
  * Caches/returns cached results for child instances
  *
@@ -220,6 +246,7 @@ class DataSource extends Object {
 		$this->_sources = $sources;
 		return $sources;
 	}
+
 /**
  * Convenience method for DboSource::listSources().  Returns source names in lowercase.
  *
@@ -231,6 +258,7 @@ class DataSource extends Object {
 		}
 		return array_map('strtolower', $this->listSources());
 	}
+
 /**
  * Returns a Model description (metadata) or null if none found.
  *
@@ -253,6 +281,7 @@ class DataSource extends Object {
 		}
 		return null;
 	}
+
 /**
  * Begin a transaction
  *
@@ -261,6 +290,7 @@ class DataSource extends Object {
 	function begin(&$model) {
 		return !$this->_transactionStarted;
 	}
+
 /**
  * Commit a transaction
  *
@@ -269,6 +299,7 @@ class DataSource extends Object {
 	function commit(&$model) {
 		return $this->_transactionStarted;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -277,6 +308,7 @@ class DataSource extends Object {
 	function rollback(&$model) {
 		return $this->_transactionStarted;
 	}
+
 /**
  * Converts column types to basic types
  *
@@ -286,6 +318,7 @@ class DataSource extends Object {
 	function column($real) {
 		return false;
 	}
+
 /**
  * To-be-overridden in subclasses.
  *
@@ -297,6 +330,7 @@ class DataSource extends Object {
 	function create(&$model, $fields = null, $values = null) {
 		return false;
 	}
+
 /**
  * To-be-overridden in subclasses.
  *
@@ -307,6 +341,7 @@ class DataSource extends Object {
 	function read(&$model, $queryData = array()) {
 		return false;
 	}
+
 /**
  * To-be-overridden in subclasses.
  *
@@ -318,6 +353,7 @@ class DataSource extends Object {
 	function update(&$model, $fields = null, $values = null) {
 		return false;
 	}
+
 /**
  * To-be-overridden in subclasses.
  *
@@ -329,6 +365,7 @@ class DataSource extends Object {
 			$id = $model->id;
 		}
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -338,6 +375,7 @@ class DataSource extends Object {
 	function lastInsertId($source = null) {
 		return false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -347,6 +385,7 @@ class DataSource extends Object {
 	function lastNumRows($source = null) {
 		return false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -356,6 +395,7 @@ class DataSource extends Object {
 	function lastAffected($source = null) {
 		return false;
 	}
+
 /**
  * Returns true if the DataSource supports the given interface (method)
  *
@@ -369,6 +409,7 @@ class DataSource extends Object {
 		$return = in_array(strtolower($interface), $methods);
 		return $return;
 	}
+
 /**
  * Sets the configuration for the DataSource
  *
@@ -378,6 +419,7 @@ class DataSource extends Object {
 	function setConfig($config = array()) {
 		$this->config = array_merge($this->_baseConfig, $this->config, $config);
 	}
+
 /**
  * Cache the DataSource description
  *
@@ -403,6 +445,7 @@ class DataSource extends Object {
 
 		return $cache;
 	}
+
 /**
  * Enter description here...
  *
@@ -483,6 +526,7 @@ class DataSource extends Object {
 		}
 		return $query;
 	}
+
 /**
  * To-be-overridden in subclasses.
  *
@@ -493,6 +537,7 @@ class DataSource extends Object {
 	function resolveKey($model, $key) {
 		return $model->alias . $key;
 	}
+
 /**
  * Closes the current datasource.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 53d6f9601..a43581f8a 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AdoDB layer for DBO.
  *
@@ -24,10 +25,12 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Include AdoDB files.
  */
 App::import('Vendor', 'NewADOConnection', array('file' => 'adodb' . DS . 'adodb.inc.php'));
+
 /**
  * AdoDB DBO implementation.
  *
@@ -37,12 +40,14 @@ App::import('Vendor', 'NewADOConnection', array('file' => 'adodb' . DS . 'adodb.
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboAdodb extends DboSource {
+
 /**
  * Enter description here...
  *
  * @var string
  */
 	var $description = "ADOdb DBO Driver";
+
 /**
  * ADOConnection object with which we connect.
  *
@@ -50,6 +55,7 @@ class DboAdodb extends DboSource {
  * @access private
  */
 	var $_adodb = null;
+
 /**
  * Array translating ADOdb column MetaTypes to cake-supported metatypes
  *
@@ -68,6 +74,7 @@ class DboAdodb extends DboSource {
 		'integer' => 'I',
 		'binary' => 'R',
 	);
+
 /**
  * ADOdb column definition
  *
@@ -86,6 +93,7 @@ class DboAdodb extends DboSource {
 		'binary' => array('name' => 'B'),
 		'boolean' => array('name' => 'L', 'limit' => '1')
 	);
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -114,6 +122,7 @@ class DboAdodb extends DboSource {
 		$this->_adodbMetatyper = &$this->_adodb->execute('Select 1');
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -122,6 +131,7 @@ class DboAdodb extends DboSource {
 	function disconnect() {
 		return $this->_adodb->Close();
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -133,6 +143,7 @@ class DboAdodb extends DboSource {
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		return $this->_adodb->execute($sql);
 	}
+
 /**
  * Returns a row from current resultset as an array .
  *
@@ -153,6 +164,7 @@ class DboAdodb extends DboSource {
 			return $this->fetchResult();
 		}
 	}
+
 /**
  * Begin a transaction
  *
@@ -169,6 +181,7 @@ class DboAdodb extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Commit a transaction
  *
@@ -184,6 +197,7 @@ class DboAdodb extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -198,6 +212,7 @@ class DboAdodb extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
  *
@@ -212,6 +227,7 @@ class DboAdodb extends DboSource {
 		}
 		return $tables;
 	}
+
 /**
  * Returns an array of the fields in the table used by the given model.
  *
@@ -244,6 +260,7 @@ class DboAdodb extends DboSource {
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
 		return $fields;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -252,6 +269,7 @@ class DboAdodb extends DboSource {
 	function lastError() {
 		return $this->_adodb->ErrorMsg();
 	}
+
 /**
  * Returns number of affected rows in previous database operation, or false if no previous operation exists.
  *
@@ -260,6 +278,7 @@ class DboAdodb extends DboSource {
 	function lastAffected() {
 		return $this->_adodb->Affected_Rows();
 	}
+
 /**
  * Returns number of rows in previous resultset, or false if no previous resultset exists.
  *
@@ -268,6 +287,7 @@ class DboAdodb extends DboSource {
 	function lastNumRows() {
 		return $this->_result ? $this->_result->RecordCount() : false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -278,6 +298,7 @@ class DboAdodb extends DboSource {
 	function lastInsertId() {
 		return $this->_adodb->Insert_ID();
 	}
+
 /**
  * Returns a LIMIT statement in the correct format for the particular database.
  *
@@ -304,6 +325,7 @@ class DboAdodb extends DboSource {
 		// please change to whatever select your database accepts
 		// adodb doesn't allow us to get the correct limit string out of it
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -320,6 +342,7 @@ class DboAdodb extends DboSource {
 		}
 		return $metaTypes[$interpreted_type];
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -383,6 +406,7 @@ class DboAdodb extends DboSource {
 		}
 		return $fields;
 	}
+
 /**
  * Build ResultSets and map data
  *
@@ -408,6 +432,7 @@ class DboAdodb extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -435,6 +460,7 @@ class DboAdodb extends DboSource {
 		}
 		return $resultRow;
 	}
+
 /**
  * Generate a database-native column schema string
  *
@@ -504,6 +530,7 @@ class DboAdodb extends DboSource {
 		return $out;
 
 	}
+
 /**
  * Checks if the result is valid
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 4e65d3b43..873fa8ec0 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * IBM DB2 for DBO
  *
@@ -26,6 +27,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * IBM DB2 for DBO
  *
@@ -37,24 +39,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboDb2 extends DboSource {
+
 /**
  * A short description of the type of driver.
  *
  * @var string
  */
 	var $description = 'IBM DB2 DBO Driver';
+
 /**
  * The start quote in which database column and table names should be wrapped.
  *
  * @var string
  */
 	var $startQuote = '';
+
 /**
  * The end quote in which database column and table names should be wrapped.
  *
  * @var string
  */
 	var $endQuote = '';
+
 /**
  * An array of base configuration settings to be used if settings are not
  * provided, i.e. default host, port, and connection method.
@@ -73,6 +79,7 @@ class DboDb2 extends DboSource {
 		'cataloged'		=> true,
 		'autocommit'	=> true
 	);
+
 /**
  * An array that maps Cake column types to database native column types.
  * The mapped information can include a reference to a function that should
@@ -94,12 +101,14 @@ class DboDb2 extends DboSource {
 		'binary' 		=> array('name' => 'blob'),
 		'boolean' 		=> array('name' => 'smallint', 'limit' => '1')
 	);
+
 /**
  * A map for every result mapping tables to columns
  *
  * @var array result -> ( table -> column )
  */
 	var $_resultMap = array();
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -136,6 +145,7 @@ class DboDb2 extends DboSource {
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -146,6 +156,7 @@ class DboDb2 extends DboSource {
 		$this->connected = !@db2_close($this->connection);
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.  We should use prepare / execute to allow the
  * database server to reuse its access plan and increase the efficiency
@@ -182,6 +193,7 @@ class DboDb2 extends DboSource {
 
 		return $result;
 	}
+
 /**
  * Returns an array of all the tables in the database.
  * Should call parent::listSources twice in the method:
@@ -205,6 +217,7 @@ class DboDb2 extends DboSource {
 		parent::listSources($tables);
 		return $tables;
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -231,6 +244,7 @@ class DboDb2 extends DboSource {
 		$this->__cacheDescription($model->tablePrefix . $model->table, $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted name of $data for use in an SQL statement.
  *
@@ -240,6 +254,7 @@ class DboDb2 extends DboSource {
 	function name($data) {
 		return $data;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -280,6 +295,7 @@ class DboDb2 extends DboSource {
 		}
 		return "'" . $data . "'";
 	}
+
 /**
  * Not sure about this one, MySQL needs it but does ODBC?  Safer just to leave it
  * Translates between PHP boolean values and MySQL (faked) boolean values
@@ -300,6 +316,7 @@ class DboDb2 extends DboSource {
 			return false;
 		}
 	}
+
 /**
  * Begins a transaction.  Returns true if the transaction was
  * started successfully, otherwise false.
@@ -317,6 +334,7 @@ class DboDb2 extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Commit a transaction
  *
@@ -335,6 +353,7 @@ class DboDb2 extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -351,6 +370,7 @@ class DboDb2 extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Removes Identity (primary key) column from update data before returning to parent
  *
@@ -369,6 +389,7 @@ class DboDb2 extends DboSource {
 		}
 		return parent::update($model, $fields, $values);
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  * DB2 distinguishes between statement and connnection errors so we
@@ -384,6 +405,7 @@ class DboDb2 extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -396,6 +418,7 @@ class DboDb2 extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -408,6 +431,7 @@ class DboDb2 extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -422,6 +446,7 @@ class DboDb2 extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -461,6 +486,7 @@ class DboDb2 extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -507,6 +533,7 @@ class DboDb2 extends DboSource {
 		}
 		return 'text';
 	}
+
 /**
  * Maps a result set to an array so that returned fields are
  * grouped by model.  Any calculated fields, or fields that
@@ -536,6 +563,7 @@ class DboDb2 extends DboSource {
 		$this->results =& $results;
 		$this->map = $this->_resultMap[$this->results];
 	}
+
 /**
  * Fetches the next row from the current result set
  * Maps the records in the $result property to the map
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index d02c45b76..faab0920d 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Firebird/Interbase layer for DBO
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
@@ -33,48 +35,56 @@
  * @subpackage    cake.cake.libs.model.dbo
  */
 class DboFirebird extends DboSource {
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $description = "Firebird/Interbase DBO Driver";
+
 /**
  * Saves the original table name
  *
  * @var unknown_type
  */
 	var $modeltmp = array();
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $startQuote = "\'";
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $endQuote = "\'";
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $alias = ' ';
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $goofyLimit = true;
+
 /**
  * Creates a map between field aliases and numeric indexes.
  *
  * @var array
  */
 	var $__fieldMappings = array();
+
 /**
  * Base configuration settings for Firebird driver
  *
@@ -89,6 +99,7 @@ class DboFirebird extends DboSource {
 		'port' => '3050',
 		'connect' => 'ibase_connect'
 	);
+
 /**
  * Firebird column definition
  *
@@ -107,6 +118,7 @@ class DboFirebird extends DboSource {
 		'binary'	=> array('name' => 'blob'),
 		'boolean'	=> array('name' => 'smallint')
 	);
+
 /**
  * Firebird Transaction commands.
  *
@@ -117,6 +129,7 @@ class DboFirebird extends DboSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -130,6 +143,7 @@ class DboFirebird extends DboSource {
 		$this->connection = $connect($config['host'] . ':' . $config['database'], $config['login'], $config['password']);
 		$this->connected = true;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -139,6 +153,7 @@ class DboFirebird extends DboSource {
 		$this->connected = false;
 		return @ibase_close($this->connection);
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -149,6 +164,7 @@ class DboFirebird extends DboSource {
 	function _execute($sql) {
 		return @ibase_query($this->connection,	$sql);
 	}
+
 /**
  * Returns a row from given resultset as an array .
  *
@@ -163,6 +179,7 @@ class DboFirebird extends DboSource {
 			return null;
 		}
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -186,6 +203,7 @@ class DboFirebird extends DboSource {
 		parent::listSources($tables);
 		return $tables;
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -216,6 +234,7 @@ class DboFirebird extends DboSource {
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted name of $data for use in an SQL statement.
  *
@@ -238,6 +257,7 @@ class DboFirebird extends DboSource {
 		}
 		return $data;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -273,6 +293,7 @@ class DboFirebird extends DboSource {
 		}
 		return "'" . $data . "'";
 	}
+
 /**
  * Removes Identity (primary key) column from update data before returning to parent
  *
@@ -291,6 +312,7 @@ class DboFirebird extends DboSource {
 		}
 		return parent::update($model, $fields, $values);
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -304,6 +326,7 @@ class DboFirebird extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -316,6 +339,7 @@ class DboFirebird extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -325,6 +349,7 @@ class DboFirebird extends DboSource {
 	function lastNumRows() {
 		return $this->_result? /*ibase_affected_rows($this->_result)*/ 1: false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -363,6 +388,7 @@ class DboFirebird extends DboSource {
 			return false;
 		}
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -386,6 +412,7 @@ class DboFirebird extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -437,6 +464,7 @@ class DboFirebird extends DboSource {
 		}
 		return 'text';
 	}
+
 /**
  * Enter description here...
  *
@@ -459,6 +487,7 @@ class DboFirebird extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Builds final SQL statement
  *
@@ -484,6 +513,7 @@ class DboFirebird extends DboSource {
 			return parent::renderStatement($type, $data);
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 766b70be1..cb3932e3e 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MS SQL layer for DBO
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
@@ -33,24 +35,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboMssql extends DboSource {
+
 /**
  * Driver description
  *
  * @var string
  */
 	var $description = "MS SQL DBO Driver";
+
 /**
  * Starting quote character for quoted identifiers
  *
  * @var string
  */
 	var $startQuote = "[";
+
 /**
  * Ending quote character for quoted identifiers
  *
  * @var string
  */
 	var $endQuote = "]";
+
 /**
  * Creates a map between field aliases and numeric indexes.  Workaround for the
  * SQL Server driver's 30-character column name limitation.
@@ -58,6 +64,7 @@ class DboMssql extends DboSource {
  * @var array
  */
 	var $__fieldMappings = array();
+
 /**
  * Base configuration settings for MS SQL driver
  *
@@ -71,6 +78,7 @@ class DboMssql extends DboSource {
 		'database' => 'cake',
 		'port' => '1433',
 	);
+
 /**
  * MS SQL column definition
  *
@@ -89,6 +97,7 @@ class DboMssql extends DboSource {
 		'binary'	=> array('name' => 'image'),
 		'boolean'	=> array('name' => 'bit')
 	);
+
 /**
  * Index of basic SQL commands
  *
@@ -100,6 +109,7 @@ class DboMssql extends DboSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+
 /**
  * MS SQL DBO driver constructor; sets SQL Server error reporting defaults
  *
@@ -116,6 +126,7 @@ class DboMssql extends DboSource {
 		}
 		return parent::__construct($config, $autoConnect);
 	}
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -152,6 +163,7 @@ class DboMssql extends DboSource {
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -162,6 +174,7 @@ class DboMssql extends DboSource {
 		$this->connected = !@mssql_close($this->connection);
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -172,6 +185,7 @@ class DboMssql extends DboSource {
 	function _execute($sql) {
 		return mssql_query($sql, $this->connection);
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -198,6 +212,7 @@ class DboMssql extends DboSource {
 			return $tables;
 		}
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -241,6 +256,7 @@ class DboMssql extends DboSource {
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -280,6 +296,7 @@ class DboMssql extends DboSource {
 		}
 		return "'" . $data . "'";
 	}
+
 /**
  * Generates the fields list of an SQL query.
  *
@@ -326,6 +343,7 @@ class DboMssql extends DboSource {
 		}
 		return $fields;
 	}
+
 /**
  * Generates and executes an SQL INSERT statement for given model, fields, and values.
  * Removes Identity (primary key) column from update data before returning to parent, if
@@ -356,6 +374,7 @@ class DboMssql extends DboSource {
 		}
 		return $result;
 	}
+
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  * Removes Identity (primary key) column from update data before returning to parent.
@@ -375,6 +394,7 @@ class DboMssql extends DboSource {
 		}
 		return parent::update($model, array_keys($fields), array_values($fields), $conditions);
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -390,6 +410,7 @@ class DboMssql extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -402,6 +423,7 @@ class DboMssql extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -414,6 +436,7 @@ class DboMssql extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -424,6 +447,7 @@ class DboMssql extends DboSource {
 		$id = $this->fetchRow('SELECT SCOPE_IDENTITY() AS insertID', false);
 		return $id[0]['insertID'];
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -445,6 +469,7 @@ class DboMssql extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -489,6 +514,7 @@ class DboMssql extends DboSource {
 		}
 		return 'text';
 	}
+
 /**
  * Enter description here...
  *
@@ -519,6 +545,7 @@ class DboMssql extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Builds final SQL statement
  *
@@ -570,6 +597,7 @@ class DboMssql extends DboSource {
 			break;
 		}
 	}
+
 /**
  * Reverses the sort direction of ORDER statements to get paging offsets to work correctly
  *
@@ -582,6 +610,7 @@ class DboMssql extends DboSource {
 		$order = preg_replace('/\s+DESC/i', ' ASC', $order);
 		return preg_replace('/__tmp_asc__/', ' DESC', $order);
 	}
+
 /**
  * Translates field names used for filtering and sorting to shortened names using the field map
  *
@@ -599,6 +628,7 @@ class DboMssql extends DboSource {
 		}
 		return $sql;
 	}
+
 /**
  * Returns an array of all result rows for a given SQL query.
  * Returns false if no rows matched.
@@ -612,6 +642,7 @@ class DboMssql extends DboSource {
 		$this->__fieldMappings = array();
 		return $results;
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -632,6 +663,7 @@ class DboMssql extends DboSource {
 			return false;
 		}
 	}
+
 /**
  * Inserts multiple values into a table
  *
@@ -655,6 +687,7 @@ class DboMssql extends DboSource {
 			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($table) . ' OFF');
 		}
 	}
+
 /**
  * Generate a database-native column schema string
  *
@@ -677,6 +710,7 @@ class DboMssql extends DboSource {
 		}
 		return $result;
 	}
+
 /**
  * Format indexes for create table
  *
@@ -704,6 +738,7 @@ class DboMssql extends DboSource {
 		}
 		return $join;
 	}
+
 /**
  * Makes sure it will return the primary key
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 2dee3f504..1cdd83b8f 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MySQL layer for DBO
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Provides common base for MySQL & MySQLi connections
  *
@@ -31,24 +33,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboMysqlBase extends DboSource {
+
 /**
  * Description property.
- * 
+ *
  * @var string
  */
 	var $description = "MySQL DBO Base Driver";
+
 /**
  * Start quote
  *
  * @var string
  */
 	var $startQuote = "`";
+
 /**
  * End quote
  *
  * @var string
  */
 	var $endQuote = "`";
+
 /**
  * use alias for update and delete. Set to true if version >= 4.1
  *
@@ -56,6 +62,7 @@ class DboMysqlBase extends DboSource {
  * @access protected
  */
 	var $_useAlias = true;
+
 /**
  * Index of basic SQL commands
  *
@@ -67,6 +74,7 @@ class DboMysqlBase extends DboSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+
 /**
  * MySQL column definition
  *
@@ -85,6 +93,7 @@ class DboMysqlBase extends DboSource {
 		'binary' => array('name' => 'blob'),
 		'boolean' => array('name' => 'tinyint', 'limit' => '1')
 	);
+
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  *
@@ -128,6 +137,7 @@ class DboMysqlBase extends DboSource {
 		}
 		return true;
 	}
+
 /**
  * Generates and executes an SQL DELETE statement for given id/conditions on given model.
  *
@@ -158,6 +168,7 @@ class DboMysqlBase extends DboSource {
 		}
 		return true;
 	}
+
 /**
  * Sets the database encoding
  *
@@ -166,6 +177,7 @@ class DboMysqlBase extends DboSource {
 	function setEncoding($enc) {
 		return $this->_execute('SET NAMES ' . $enc) != false;
 	}
+
 /**
  * Returns an array of the indexes in given datasource name.
  *
@@ -198,6 +210,7 @@ class DboMysqlBase extends DboSource {
 		}
 		return $index;
 	}
+
 /**
  * Generate a MySQL Alter Table syntax for the given Schema comparison
  *
@@ -252,6 +265,7 @@ class DboMysqlBase extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * Generate a MySQL "drop table" statement for the given Schema object
  *
@@ -273,13 +287,14 @@ class DboMysqlBase extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * Generate MySQL index alteration statements for a table.
  *
  * @param string $table Table to alter indexes for
  * @param array $new Indexes to add and drop
  * @return array Index alteration statements
- */	
+ */
 	function _alterIndexes($table, $indexes) {
 		$alter = array();
 		if (isset($indexes['drop'])) {
@@ -314,6 +329,7 @@ class DboMysqlBase extends DboSource {
 		}
 		return $alter;
 	}
+
 /**
  * Inserts multiple values into a table
  *
@@ -340,12 +356,14 @@ class DboMysqlBase extends DboSource {
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboMysql extends DboMysqlBase {
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $description = "MySQL DBO Driver";
+
 /**
  * Base configuration settings for MySQL driver
  *
@@ -360,6 +378,7 @@ class DboMysql extends DboMysqlBase {
 		'port' => '3306',
 		'connect' => 'mysql_pconnect'
 	);
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -388,6 +407,7 @@ class DboMysql extends DboMysqlBase {
 
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -400,6 +420,7 @@ class DboMysql extends DboMysqlBase {
 		$this->connected = !@mysql_close($this->connection);
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -410,6 +431,7 @@ class DboMysql extends DboMysqlBase {
 	function _execute($sql) {
 		return mysql_query($sql, $this->connection);
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -434,6 +456,7 @@ class DboMysql extends DboMysqlBase {
 			return $tables;
 		}
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -468,6 +491,7 @@ class DboMysql extends DboMysqlBase {
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -481,9 +505,11 @@ class DboMysql extends DboMysqlBase {
 
 		if ($parent != null) {
 			return $parent;
-		} elseif ($data === null || (is_array($data) && empty($data))) {
+		}
+		if ($data === null || (is_array($data) && empty($data))) {
 			return 'NULL';
-		} elseif ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
+		}
+		if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
 			return  "''";
 		}
 		if (empty($column)) {
@@ -510,6 +536,7 @@ class DboMysql extends DboMysqlBase {
 		}
 		return $data;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -521,6 +548,7 @@ class DboMysql extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -533,6 +561,7 @@ class DboMysql extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -545,6 +574,7 @@ class DboMysql extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -559,6 +589,7 @@ class DboMysql extends DboMysqlBase {
 
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -606,6 +637,7 @@ class DboMysql extends DboMysqlBase {
 		}
 		return 'text';
 	}
+
 /**
  * Enter description here...
  *
@@ -632,6 +664,7 @@ class DboMysql extends DboMysqlBase {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -651,6 +684,7 @@ class DboMysql extends DboMysqlBase {
 			return false;
 		}
 	}
+
 /**
  * Gets the database encoding
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index c0d238079..ec5f05fb3 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MySQLi layer for DBO
  *
@@ -24,7 +25,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'DboMysql');
+App::import('Datasource', 'DboMysql');
+
 /**
  * MySQLi DBO driver object
  *
@@ -34,12 +36,14 @@ App::import('Core', 'DboMysql');
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboMysqli extends DboMysqlBase {
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $description = "Mysqli DBO Driver";
+
 /**
  * Base configuration settings for Mysqli driver
  *
@@ -54,6 +58,7 @@ class DboMysqli extends DboMysqlBase {
 		'port' => '3306',
 		'connect' => 'mysqli_connect'
 	);
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -75,14 +80,15 @@ class DboMysqli extends DboMysqlBase {
 		if ($this->connection !== false) {
 			$this->connected = true;
 		}
-		
+
 		$this->_useAlias = (bool)version_compare(mysqli_get_server_info($this->connection), "4.1", ">=");
-		
+
 		if (!empty($config['encoding'])) {
 			$this->setEncoding($config['encoding']);
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -95,6 +101,7 @@ class DboMysqli extends DboMysqlBase {
 		$this->connected = !@mysqli_close($this->connection);
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -105,10 +112,10 @@ class DboMysqli extends DboMysqlBase {
 	function _execute($sql) {
 		if (preg_match('/^\s*call/i', $sql)) {
 			return $this->_executeProcedure($sql);
-		} else {
-			return mysqli_query($this->connection, $sql);
 		}
+		return mysqli_query($this->connection, $sql);
 	}
+
 /**
  * Executes given SQL statement (procedure call).
  *
@@ -126,6 +133,7 @@ class DboMysqli extends DboMysqlBase {
 		}
 		return $firstResult;
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -140,16 +148,17 @@ class DboMysqli extends DboMysqlBase {
 
 		if (!$result) {
 			return array();
-		} else {
-			$tables = array();
-
-			while ($line = mysqli_fetch_array($result)) {
-				$tables[] = $line[0];
-			}
-			parent::listSources($tables);
-			return $tables;
 		}
+
+		$tables = array();
+
+		while ($line = mysqli_fetch_array($result)) {
+			$tables[] = $line[0];
+		}
+		parent::listSources($tables);
+		return $tables;
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -187,6 +196,7 @@ class DboMysqli extends DboMysqlBase {
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -201,18 +211,19 @@ class DboMysqli extends DboMysqlBase {
 		if ($parent != null) {
 			return $parent;
 		}
-
-		if ($data === null) {
+		if ($data === null || (is_array($data) && empty($data))) {
 			return 'NULL';
 		}
-
 		if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
-			return  "''";
+			return "''";
+		}
+		if (empty($column)) {
+			$column = $this->introspectType($data);
 		}
 
 		switch ($column) {
 			case 'boolean':
-				$data = $this->boolean((bool)$data);
+				return $this->boolean((bool)$data);
 			break;
 			case 'integer' :
 			case 'float' :
@@ -232,6 +243,7 @@ class DboMysqli extends DboMysqlBase {
 
 		return $data;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -243,6 +255,7 @@ class DboMysqli extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -255,6 +268,7 @@ class DboMysqli extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -267,6 +281,7 @@ class DboMysqli extends DboMysqlBase {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -278,9 +293,9 @@ class DboMysqli extends DboMysqlBase {
 		if ($id !== false && !empty($id) && !empty($id[0]) && isset($id[0]['insertID'])) {
 			return $id[0]['insertID'];
 		}
-
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -328,6 +343,7 @@ class DboMysqli extends DboMysqlBase {
 		}
 		return 'text';
 	}
+
 /**
  * Gets the length of a database-native column description, or null if no length
  *
@@ -337,16 +353,17 @@ class DboMysqli extends DboMysqlBase {
 	function length($real) {
 		$col = str_replace(array(')', 'unsigned'), '', $real);
 		$limit = null;
-
+	
 		if (strpos($col, '(') !== false) {
 			list($col, $limit) = explode('(', $col);
 		}
-
+	
 		if ($limit != null) {
 			return intval($limit);
 		}
 		return null;
 	}
+
 /**
  * Enter description here...
  *
@@ -371,6 +388,7 @@ class DboMysqli extends DboMysqlBase {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -389,10 +407,10 @@ class DboMysqli extends DboMysqlBase {
 				$i++;
 			}
 			return $resultRow;
-		} else {
-			return false;
 		}
+		return false;
 	}
+
 /**
  * Gets the database encoding
  *
@@ -401,6 +419,7 @@ class DboMysqli extends DboMysqlBase {
 	function getEncoding() {
 		return mysqli_client_encoding($this->connection);
 	}
+
 /**
  * Checks if the result is valid
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index a8572a713..e24daf7ce 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -35,24 +35,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboOdbc extends DboSource {
+
 /**
  * Driver description
  *
  * @var string
  */
 	var $description = "ODBC DBO Driver";
+
 /**
  * Table/column starting quote
  *
  * @var string
  */
 	var $startQuote = "`";
+
 /**
  * Table/column end quote
  *
  * @var string
  */
 	var $endQuote = "`";
+
 /**
  * Driver base configuration
  *
@@ -65,6 +69,7 @@ class DboOdbc extends DboSource {
 		'database' => 'cake',
 		'connect'  => 'odbc_pconnect'
 	);
+
 /**
  * Enter description here...
  *
@@ -83,6 +88,7 @@ class DboOdbc extends DboSource {
 	//						'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'),
 	//						'binary' => array('name' => 'blob'),
 	//						'boolean' => array('name' => 'tinyint', 'limit' => '1'));
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -105,6 +111,7 @@ class DboOdbc extends DboSource {
 
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -113,6 +120,7 @@ class DboOdbc extends DboSource {
 	function disconnect() {
 		return @odbc_close($this->connection);
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -132,6 +140,7 @@ class DboOdbc extends DboSource {
 		// TODO: should flags be set? possible requirement:  SQL_CURSOR_STATIC
 		return odbc_exec($this->connection, $sql);
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -153,6 +162,7 @@ class DboOdbc extends DboSource {
 		parent::listSources($tables);
 		return $tables;
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -184,6 +194,7 @@ class DboOdbc extends DboSource {
 		$this->__cacheDescription($model->tablePrefix . $model->table, $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -209,6 +220,7 @@ class DboOdbc extends DboSource {
 
 		return $data;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -220,6 +232,7 @@ class DboOdbc extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -232,6 +245,7 @@ class DboOdbc extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -244,6 +258,7 @@ class DboOdbc extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -254,6 +269,7 @@ class DboOdbc extends DboSource {
 		$result = $this->fetchRow('SELECT @@IDENTITY');
 		return $result[0];
 	}
+
 /**
  * Enter description here...
  *
@@ -269,6 +285,7 @@ class DboOdbc extends DboSource {
 		}
 		return $real;
 	}
+
 /**
 * Enter description here...
 *
@@ -292,6 +309,7 @@ class DboOdbc extends DboSource {
 			$j++;
 		}
 	}
+
 /**
 * Generates the fields list of an SQL query.
 *
@@ -338,6 +356,7 @@ class DboOdbc extends DboSource {
 		}
 		return $fields;
 	}
+
 /**
  * Fetches the next row from the current result set
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index f7ec6f06e..5c19c709c 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Oracle layer for DBO.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboOracle extends DboSource {
+
 /**
  * Enter description here...
  *
@@ -40,22 +43,26 @@ class DboOracle extends DboSource {
  * @access public
  */
 	var $config = array();
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $alias = '';
+
 /**
  * Sequence names as introspected from the database
  */
 	var $_sequences = array();
+
 /**
  * Transaction in progress flag
  *
  * @var boolean
  */
 	var $__transactionStarted = false;
+
 /**
  * Enter description here...
  *
@@ -76,6 +83,7 @@ class DboOracle extends DboSource {
 		'boolean' => array('name' => 'boolean'),
 		'number' => array('name' => 'number'),
 		'inet' => array('name' => 'inet'));
+
 /**
  * Enter description here...
  *
@@ -83,6 +91,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $connection;
+
 /**
  * Enter description here...
  *
@@ -90,6 +99,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_limit = -1;
+
 /**
  * Enter description here...
  *
@@ -97,6 +107,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_offset = 0;
+
 /**
  * Enter description here...
  *
@@ -104,6 +115,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_map;
+
 /**
  * Enter description here...
  *
@@ -111,6 +123,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_currentRow;
+
 /**
  * Enter description here...
  *
@@ -118,6 +131,7 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_numRows;
+
 /**
  * Enter description here...
  *
@@ -125,12 +139,14 @@ class DboOracle extends DboSource {
  * @access protected
  */
 	var $_results;
+
 /**
  * Last error issued by oci extension
  *
  * @var unknown_type
  */
 	var $_error;
+
 /**
  * Base configuration settings for MySQL driver
  *
@@ -145,12 +161,14 @@ class DboOracle extends DboSource {
 		'nls_sort' => '',
 		'nls_sort' => ''
 	);
+
 /**
  * Table-sequence map
  *
  * @var unknown_type
  */
 	var $_sequenceMap = array();
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -201,6 +219,7 @@ class DboOracle extends DboSource {
 			$this->_error = null;
 		}
 	}
+
 /**
  * Sets the encoding language of the session
  *
@@ -213,6 +232,7 @@ class DboOracle extends DboSource {
 		}
 		return true;
 	}
+
 /**
  * Gets the current encoding language
  *
@@ -229,6 +249,7 @@ class DboOracle extends DboSource {
 		}
 		return $row[0]['VALUE'];
 	}
+
 /**
  * Disconnects from database.
  *
@@ -241,6 +262,7 @@ class DboOracle extends DboSource {
 			return !$this->connected;
 		}
 	}
+
 /**
  * Scrape the incoming SQL to create the association map. This is an extremely
  * experimental method that creates the association maps since Oracle will not tell us.
@@ -290,6 +312,7 @@ class DboOracle extends DboSource {
 			$this->_map[] = array($table, $field);
 		}
 	}
+
 /**
  * Modify a SQL query to limit (and offset) the result set
  *
@@ -302,6 +325,7 @@ class DboOracle extends DboSource {
 		$this->_limit = (int) $limit;
 		$this->_offset = (int) $offset;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -312,6 +336,7 @@ class DboOracle extends DboSource {
 	function lastNumRows() {
 		return $this->_numRows;
 	}
+
 /**
  * Executes given SQL statement. This is an overloaded method.
  *
@@ -359,6 +384,7 @@ class DboOracle extends DboSource {
 		$this->limit();
 		return $this->_statementId;
 	}
+
 /**
  * Enter description here...
  *
@@ -388,6 +414,7 @@ class DboOracle extends DboSource {
 		$this->_currentRow++;
 		return $resultRow;
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -396,6 +423,7 @@ class DboOracle extends DboSource {
 	function fetchResult() {
 		return $this->fetchRow();
 	}
+
 /**
  * Checks to see if a named sequence exists
  *
@@ -410,6 +438,7 @@ class DboOracle extends DboSource {
 		}
 		return $this->fetchRow();
 	}
+
 /**
  * Creates a database sequence
  *
@@ -421,6 +450,7 @@ class DboOracle extends DboSource {
 		$sql = "CREATE SEQUENCE $sequence";
 		return $this->execute($sql);
 	}
+
 /**
  * Enter description here...
  *
@@ -432,6 +462,7 @@ class DboOracle extends DboSource {
 		$sql = "CREATE OR REPLACE TRIGGER pk_$table" . "_trigger BEFORE INSERT ON $table FOR EACH ROW BEGIN SELECT pk_$table.NEXTVAL INTO :NEW.ID FROM DUAL; END;";
 		return $this->execute($sql);
 	}
+
 /**
  * Returns an array of tables in the database. If there are no tables, an error is
  * raised and the application exits.
@@ -457,6 +488,7 @@ class DboOracle extends DboSource {
 		parent::listSources($sources);
 		return $sources;
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -495,6 +527,7 @@ class DboOracle extends DboSource {
 
 		return $fields;
 	}
+
 /**
  * Deletes all the records in a table and drops all associated auto-increment sequences.
  * Using DELETE instead of TRUNCATE because it causes locking problems.
@@ -540,6 +573,7 @@ class DboOracle extends DboSource {
 		}
 		return true;
 	}
+
 /**
  * Enables, disables, and lists table constraints
  *
@@ -617,6 +651,7 @@ class DboOracle extends DboSource {
 		}
 		return true;
 	}
+
 /**
  * Returns an array of the indexes in given table name.
  *
@@ -658,6 +693,7 @@ class DboOracle extends DboSource {
 		}
 		return $index;
 	}
+
 /**
  * Generate a Oracle Alter Table syntax for the given Schema comparison
  *
@@ -706,6 +742,7 @@ class DboOracle extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * This method should quote Oracle identifiers. Well it doesn't.
  * It would break all scaffolding and all of Cake's default assumptions.
@@ -727,6 +764,7 @@ class DboOracle extends DboSource {
 		}
 		return $name;
 	}
+
 /**
  * Begin a transaction
  *
@@ -738,6 +776,7 @@ class DboOracle extends DboSource {
 		$this->__transactionStarted = true;
 		return true;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -749,6 +788,7 @@ class DboOracle extends DboSource {
 	function rollback() {
 		return ocirollback($this->connection);
 	}
+
 /**
  * Commit a transaction
  *
@@ -761,6 +801,7 @@ class DboOracle extends DboSource {
 		$this->__transactionStarted = false;
 		return ocicommit($this->connection);
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -811,6 +852,7 @@ class DboOracle extends DboSource {
 		}
 		return 'text';
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -851,6 +893,7 @@ class DboOracle extends DboSource {
 		}
 		return $data;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -871,6 +914,7 @@ class DboOracle extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -880,6 +924,7 @@ class DboOracle extends DboSource {
 	function lastError() {
 		return $this->_error;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
  *
@@ -889,6 +934,7 @@ class DboOracle extends DboSource {
 	function lastAffected() {
 		return $this->_statementId ? ocirowcount($this->_statementId): false;
 	}
+
 /**
  * Renders a final SQL statement by putting together the component parts in the correct order
  *
@@ -934,6 +980,7 @@ class DboOracle extends DboSource {
 				break;
 		}
 	}
+
 /**
  * Enter description here...
  *
@@ -952,11 +999,11 @@ class DboOracle extends DboSource {
 		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
 			if (!isset($resultSet) || !is_array($resultSet)) {
 				if (Configure::read() > 0) {
-					e('<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ');
+					echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
 					if (isset($this->error) && $this->error != null) {
-						e($this->error);
+						echo $this->error;
 					}
-					e('</div>');
+					echo '</div>';
 				}
 				return null;
 			}
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 2298fc019..d8787a018 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -25,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * PostgreSQL layer for DBO.
  *
@@ -34,6 +35,7 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboPostgres extends DboSource {
+
 /**
  * Driver description
  *
@@ -41,6 +43,7 @@ class DboPostgres extends DboSource {
  * @access public
  */
 	var $description = "PostgreSQL DBO Driver";
+
 /**
  * Index of basic SQL commands
  *
@@ -52,6 +55,7 @@ class DboPostgres extends DboSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+
 /**
  * Base driver configuration settings.  Merged with user settings.
  *
@@ -89,6 +93,7 @@ class DboPostgres extends DboSource {
 	var $startQuote = '"';
 
 	var $endQuote = '"';
+
 /**
  * Contains mappings of custom auto-increment sequences, if a table uses a sequence name
  * other than what is dictated by convention.
@@ -96,6 +101,7 @@ class DboPostgres extends DboSource {
  * @var array
  */
 	var $_sequenceMap = array();
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -122,6 +128,7 @@ class DboPostgres extends DboSource {
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -138,6 +145,7 @@ class DboPostgres extends DboSource {
 		}
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -147,6 +155,7 @@ class DboPostgres extends DboSource {
 	function _execute($sql) {
 		return pg_query($this->connection, $sql);
 	}
+
 /**
  * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
  *
@@ -176,6 +185,7 @@ class DboPostgres extends DboSource {
 			return $tables;
 		}
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -248,6 +258,7 @@ class DboPostgres extends DboSource {
 		}
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -298,6 +309,7 @@ class DboPostgres extends DboSource {
 		}
 		return "'" . $data . "'";
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -307,6 +319,7 @@ class DboPostgres extends DboSource {
 		$error = pg_last_error($this->connection);
 		return ($error) ? $error : null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
  *
@@ -315,6 +328,7 @@ class DboPostgres extends DboSource {
 	function lastAffected() {
 		return ($this->_result) ? pg_affected_rows($this->_result) : false;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -324,6 +338,7 @@ class DboPostgres extends DboSource {
 	function lastNumRows() {
 		return ($this->_result) ? pg_num_rows($this->_result) : false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -336,6 +351,7 @@ class DboPostgres extends DboSource {
 		$data = $this->fetchRow("SELECT currval('{$seq}') as max");
 		return $data[0]['max'];
 	}
+
 /**
  * Gets the associated sequence for the given table/field
  *
@@ -353,6 +369,7 @@ class DboPostgres extends DboSource {
 			return "{$table}_{$field}_seq";
 		}
 	}
+
 /**
  * Deletes all the records in a table and drops all associated auto-increment sequences
  *
@@ -378,6 +395,7 @@ class DboPostgres extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Prepares field names to be quoted by parent
  *
@@ -390,6 +408,7 @@ class DboPostgres extends DboSource {
 		}
 		return parent::name($data);
 	}
+
 /**
  * Generates the fields list of an SQL query.
  *
@@ -429,6 +448,7 @@ class DboPostgres extends DboSource {
 		}
 		return $fields;
 	}
+
 /**
  * Returns an array of the indexes in given datasource name.
  *
@@ -441,13 +461,13 @@ class DboPostgres extends DboSource {
 		if ($table) {
 			$indexes = $this->query("SELECT c2.relname, i.indisprimary, i.indisunique, i.indisclustered, i.indisvalid, pg_catalog.pg_get_indexdef(i.indexrelid, 0, true) as statement, c2.reltablespace
 			FROM pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_index i
-			WHERE c.oid  = ( 
-				SELECT c.oid 
-				FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace 
-				WHERE c.relname ~ '^(" . $table . ")$' 
-					AND pg_catalog.pg_table_is_visible(c.oid) 
+			WHERE c.oid  = (
+				SELECT c.oid
+				FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+				WHERE c.relname ~ '^(" . $table . ")$'
+					AND pg_catalog.pg_table_is_visible(c.oid)
 					AND n.nspname ~ '^(" . $this->config['schema'] . ")$'
-			) 
+			)
 			AND c.oid = i.indrelid AND i.indexrelid = c2.oid
 			ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname", false);
 			foreach ($indexes as $i => $info) {
@@ -467,6 +487,7 @@ class DboPostgres extends DboSource {
 		}
 		return $index;
 	}
+
 /**
  * Alter the Schema of a table.
  *
@@ -528,7 +549,7 @@ class DboPostgres extends DboSource {
 					}
 					$colList[] = 'ADD PRIMARY KEY (' . $cols . ')';
 				}
-				
+
 				if (!empty($colList)) {
 					$out .= "\t" . join(",\n\t", $colList) . ";\n\n";
 				} else {
@@ -539,13 +560,14 @@ class DboPostgres extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * Generate PostgreSQL index alteration statements for a table.
  *
  * @param string $table Table to alter indexes for
  * @param array $new Indexes to add and drop
  * @return array Index alteration statements
- */	
+ */
 	function _alterIndexes($table, $indexes) {
 		$alter = array();
 		if (isset($indexes['drop'])) {
@@ -580,6 +602,7 @@ class DboPostgres extends DboSource {
 		}
 		return $alter;
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -603,6 +626,7 @@ class DboPostgres extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -651,6 +675,7 @@ class DboPostgres extends DboSource {
 			break;
 		}
 	}
+
 /**
  * Gets the length of a database-native column description, or null if no length
  *
@@ -672,6 +697,7 @@ class DboPostgres extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Enter description here...
  *
@@ -696,6 +722,7 @@ class DboPostgres extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -727,6 +754,7 @@ class DboPostgres extends DboSource {
 			return false;
 		}
 	}
+
 /**
  * Translates between PHP boolean values and PostgreSQL boolean values
  *
@@ -749,6 +777,7 @@ class DboPostgres extends DboSource {
 			break;
 		}
 	}
+
 /**
  * Sets the database encoding
  *
@@ -758,6 +787,7 @@ class DboPostgres extends DboSource {
 	function setEncoding($enc) {
 		return pg_set_client_encoding($this->connection, $enc) == 0;
 	}
+
 /**
  * Gets the database encoding
  *
@@ -766,6 +796,7 @@ class DboPostgres extends DboSource {
 	function getEncoding() {
 		return pg_client_encoding($this->connection);
 	}
+
 /**
  * Generate a Postgres-native column schema string
  *
@@ -799,6 +830,7 @@ class DboPostgres extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * Format indexes for create table
  *
@@ -830,6 +862,7 @@ class DboPostgres extends DboSource {
 		}
 		return $join;
 	}
+
 /**
  * Overrides DboSource::renderStatement to handle schema generation with Postgres-style indexes
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index c365b6fe0..aa6311be3 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SQLite layer for DBO
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * DBO implementation for the SQLite DBMS.
  *
@@ -33,24 +35,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboSqlite extends DboSource {
+
 /**
  * Enter description here...
  *
  * @var unknown_type
  */
 	var $description = "SQLite DBO Driver";
+
 /**
  * Opening quote for quoted identifiers
  *
  * @var string
  */
 	var $startQuote = '"';
+
 /**
  * Closing quote for quoted identifiers
  *
  * @var string
  */
 	var $endQuote = '"';
+
 /**
  * Keeps the transaction statistics of CREATE/UPDATE/DELETE queries
  *
@@ -58,6 +64,7 @@ class DboSqlite extends DboSource {
  * @access protected
  */
 	var $_queryStats = array();
+
 /**
  * Base configuration settings for SQLite driver
  *
@@ -68,6 +75,7 @@ class DboSqlite extends DboSource {
 		'database' => null,
 		'connect' => 'sqlite_popen'
 	);
+
 /**
  * Index of basic SQL commands
  *
@@ -79,6 +87,7 @@ class DboSqlite extends DboSource {
 		'commit'   => 'COMMIT TRANSACTION',
 		'rollback' => 'ROLLBACK TRANSACTION'
 	);
+
 /**
  * SQLite column definition
  *
@@ -97,6 +106,7 @@ class DboSqlite extends DboSource {
 		'binary' => array('name' => 'blob'),
 		'boolean' => array('name' => 'boolean')
 	);
+
 /**
  * Connects to the database using config['database'] as a filename.
  *
@@ -113,6 +123,7 @@ class DboSqlite extends DboSource {
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -123,6 +134,7 @@ class DboSqlite extends DboSource {
 		$this->connected = false;
 		return $this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -138,6 +150,7 @@ class DboSqlite extends DboSource {
 		}
 		return $result;
 	}
+
 /**
  * Overrides DboSource::execute() to correctly handle query statistics
  *
@@ -149,6 +162,7 @@ class DboSqlite extends DboSource {
 		$this->_queryStats = array();
 		return $result;
 	}
+
 /**
  * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
  *
@@ -174,6 +188,7 @@ class DboSqlite extends DboSource {
 		}
 		return array();
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -210,6 +225,7 @@ class DboSqlite extends DboSource {
 		$this->__cacheDescription($model->tablePrefix . $model->table, $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -243,6 +259,7 @@ class DboSqlite extends DboSource {
 		}
 		return "'" . $data . "'";
 	}
+
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  *
@@ -266,6 +283,7 @@ class DboSqlite extends DboSource {
 		$result = parent::update($model, $fields, $values, $conditions);
 		return $result;
 	}
+
 /**
  * Deletes all the records in a table and resets the count of the auto-incrementing
  * primary key, where applicable.
@@ -277,6 +295,7 @@ class DboSqlite extends DboSource {
 	function truncate($table) {
 		return $this->execute('DELETE From ' . $this->fullTableName($table));
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -289,6 +308,7 @@ class DboSqlite extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
  *
@@ -304,6 +324,7 @@ class DboSqlite extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -316,6 +337,7 @@ class DboSqlite extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -324,6 +346,7 @@ class DboSqlite extends DboSource {
 	function lastInsertId() {
 		return sqlite_last_insert_rowid($this->connection);
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -359,6 +382,7 @@ class DboSqlite extends DboSource {
 		}
 		return 'text';
 	}
+
 /**
  * Enter description here...
  *
@@ -382,6 +406,7 @@ class DboSqlite extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
@@ -406,6 +431,7 @@ class DboSqlite extends DboSource {
 			return false;
 		}
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -427,6 +453,7 @@ class DboSqlite extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Generate a database-native column schema string
  *
@@ -481,6 +508,7 @@ class DboSqlite extends DboSource {
 		}
 		return $out;
 	}
+
 /**
  * Sets the database encoding
  *
@@ -492,6 +520,7 @@ class DboSqlite extends DboSource {
 		}
 		return $this->_execute("PRAGMA encoding = \"{$enc}\"") !== false;
 	}
+
 /**
  * Gets the database encoding
  *
@@ -500,6 +529,7 @@ class DboSqlite extends DboSource {
 	function getEncoding() {
 		return $this->fetchRow('PRAGMA encoding');
 	}
+
 /**
  * Removes redundant primary key indexes, as they are handled in the column def of the key.
  *
@@ -530,6 +560,7 @@ class DboSqlite extends DboSource {
 		}
 		return $join;
 	}
+
 /**
  * Overrides DboSource::index to handle SQLite indexe introspection
  * Returns an array of the indexes in given table name.
@@ -566,7 +597,7 @@ class DboSqlite extends DboSource {
 		}
 		return $index;
 	}
-	
+
 /**
  * Overrides DboSource::renderStatement to handle schema generation with SQLite-style indexes
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 9e2a11851..762cb9048 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Sybase layer for DBO
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
@@ -33,24 +35,28 @@
  * @subpackage    cake.cake.libs.model.datasources.dbo
  */
 class DboSybase extends DboSource {
+
 /**
  * Driver description
  *
  * @var string
  */
 	var $description = "Sybase DBO Driver";
+
 /**
  * Start quote for quoted identifiers
  *
  * @var string
  */
 	var $startQuote = "";
+
 /**
  * End quote for quoted identifiers
  *
  * @var string
  */
 	var $endQuote = "";
+
 /**
  * Base configuration settings for Sybase driver
  *
@@ -64,6 +70,7 @@ class DboSybase extends DboSource {
 		'database' => 'cake',
 		'port' => '4100'
 	);
+
 /**
  * Sybase column definition
  *
@@ -82,6 +89,7 @@ class DboSybase extends DboSource {
 		'binary' => array('name' => 'image'),
 		'boolean' => array('name' => 'bit')
 	);
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -102,6 +110,7 @@ class DboSybase extends DboSource {
 		}
 		return $this->connected;
 	}
+
 /**
  * Disconnects from database.
  *
@@ -111,6 +120,7 @@ class DboSybase extends DboSource {
 		$this->connected = !@sybase_close($this->connection);
 		return !$this->connected;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -121,6 +131,7 @@ class DboSybase extends DboSource {
 	function _execute($sql) {
 		return sybase_query($sql, $this->connection);
 	}
+
 /**
  * Returns an array of sources (tables) in the database.
  *
@@ -146,6 +157,7 @@ class DboSybase extends DboSource {
 			return $tables;
 		}
 	}
+
 /**
  * Returns an array of the fields in given table name.
  *
@@ -178,6 +190,7 @@ class DboSybase extends DboSource {
 		$this->__cacheDescription($model->tablePrefix.$model->table, $fields);
 		return $fields;
 	}
+
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
@@ -212,6 +225,7 @@ class DboSybase extends DboSource {
 
 		return "'" . $data . "'";
 	}
+
 /**
  * Begin a transaction
  *
@@ -228,6 +242,7 @@ class DboSybase extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Commit a transaction
  *
@@ -243,6 +258,7 @@ class DboSybase extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -257,6 +273,7 @@ class DboSybase extends DboSource {
 		}
 		return false;
 	}
+
 /**
  * Returns a formatted error message from previous database operation.
  *
@@ -266,6 +283,7 @@ class DboSybase extends DboSource {
 	function lastError() {
 		return null;
 	}
+
 /**
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
@@ -278,6 +296,7 @@ class DboSybase extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
@@ -290,6 +309,7 @@ class DboSybase extends DboSource {
 		}
 		return null;
 	}
+
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
@@ -300,6 +320,7 @@ class DboSybase extends DboSource {
 		$result=$this->fetchRow('SELECT @@IDENTITY');
 		return $result[0];
 	}
+
 /**
  * Converts database-layer column types to basic types
  *
@@ -338,6 +359,7 @@ class DboSybase extends DboSource {
 
 		return 'text';
 	}
+
 /**
  * Enter description here...
  *
@@ -361,6 +383,7 @@ class DboSybase extends DboSource {
 			$j++;
 		}
 	}
+
 /**
  * Fetches the next row from the current result set
  *
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 1ad21c115..201fe3c49 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -35,42 +36,49 @@ App::import('Core', array('Set', 'String'));
  * @subpackage    cake.cake.libs.model.datasources
  */
 class DboSource extends DataSource {
+
 /**
  * Description string for this Database Data Source.
  *
  * @var unknown_type
  */
 	var $description = "Database Data Source";
+
 /**
  * index definition, standard cake, primary, index, unique
  *
  * @var array
  */
 	var $index = array('PRI' => 'primary', 'MUL' => 'index', 'UNI' => 'unique');
+
 /**
  * Database keyword used to assign aliases to identifiers.
  *
  * @var string
  */
 	var $alias = 'AS ';
+
 /**
  * Caches fields quoted in DboSource::name()
  *
  * @var array
  */
 	var $fieldCache = array();
+
 /**
  * Bypass automatic adding of joined fields/associations.
  *
  * @var boolean
  */
 	var $__bypass = false;
+
 /**
  * The set of valid SQL operations usable in a WHERE statement
  *
  * @var array
  */
 	var $__sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
+
 /**
  * Index of basic SQL commands
  *
@@ -82,6 +90,7 @@ class DboSource extends DataSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+
 /**
  * Constructor
  */
@@ -98,6 +107,7 @@ class DboSource extends DataSource {
 			return true;
 		}
 	}
+
 /**
  * Reconnects to database server with optional new settings
  *
@@ -111,6 +121,7 @@ class DboSource extends DataSource {
 
 		return $this->connect();
 	}
+
 /**
  * Prepares a value, or an array of values for database queries by quoting and escaping them.
  *
@@ -137,6 +148,7 @@ class DboSource extends DataSource {
 			return null;
 		}
 	}
+
 /**
  * Returns an object to represent a database identifier in a query
  *
@@ -149,6 +161,7 @@ class DboSource extends DataSource {
 		$obj->value = $identifier;
 		return $obj;
 	}
+
 /**
  * Returns an object to represent a database expression in a query
  *
@@ -161,6 +174,7 @@ class DboSource extends DataSource {
 		$obj->value = $expression;
 		return $obj;
 	}
+
 /**
  * Executes given SQL statement.
  *
@@ -171,6 +185,7 @@ class DboSource extends DataSource {
 		$this->took = $this->error = $this->numRows = false;
 		return $this->execute($sql);
 	}
+
 /**
  * Queries the database with given SQL statement, and obtains some metadata about the result
  * (rows affected, timing, any errors, number of rows in resultset). The query is also logged.
@@ -200,10 +215,10 @@ class DboSource extends DataSource {
 		if ($this->error) {
 			$this->showQuery($sql);
 			return false;
-		} else {
-			return $this->_result;
 		}
+		return $this->_result;
 	}
+
 /**
  * DataSource Query abstraction
  *
@@ -299,6 +314,7 @@ class DboSource extends DataSource {
 			}
 		}
 	}
+
 /**
  * Returns a row from current resultset as an array
  *
@@ -319,6 +335,7 @@ class DboSource extends DataSource {
 			return null;
 		}
 	}
+
 /**
  * Returns an array of all result rows for a given SQL query.
  * Returns false if no rows matched.
@@ -356,6 +373,7 @@ class DboSource extends DataSource {
 			return false;
 		}
 	}
+
 /**
  * Returns a single field of the first of query results for a given SQL query, or false if empty.
  *
@@ -372,6 +390,7 @@ class DboSource extends DataSource {
 			return $data[$name];
 		}
 	}
+
 /**
  * Returns a quoted name of $data for use in an SQL statement.
  * Strips fields out of SQL functions before quoting.
@@ -437,6 +456,7 @@ class DboSource extends DataSource {
 		}
 		return (!$array) ? $data[0] : $data;
 	}
+
 /**
  * Checks if it's connected to the database
  *
@@ -445,6 +465,7 @@ class DboSource extends DataSource {
 	function isConnected() {
 		return $this->connected;
 	}
+
 /**
  * Checks if the result is valid
  *
@@ -453,6 +474,7 @@ class DboSource extends DataSource {
 	function hasResult() {
 		return is_resource($this->_result);
 	}
+
 /**
  * Outputs the contents of the queries log.
  *
@@ -485,6 +507,7 @@ class DboSource extends DataSource {
 			}
 		}
 	}
+
 /**
  * Log given SQL query.
  *
@@ -508,6 +531,7 @@ class DboSource extends DataSource {
 			return false;
 		}
 	}
+
 /**
  * Output information about an SQL query. The SQL statement, number of rows in resultset,
  * and execution time in microseconds. If the query fails, an error is output instead.
@@ -529,6 +553,7 @@ class DboSource extends DataSource {
 			pr(sprintf("<p style = \"text-align:left\"><b>Query:</b> %s %s</p>", $sql, $out));
 		}
 	}
+
 /**
  * Gets full table name including prefix
  *
@@ -549,6 +574,7 @@ class DboSource extends DataSource {
 		}
 		return $table;
 	}
+
 /**
  * The "C" in CRUD
  *
@@ -594,6 +620,7 @@ class DboSource extends DataSource {
 			return false;
 		}
 	}
+
 /**
  * The "R" in CRUD
  *
@@ -689,6 +716,7 @@ class DboSource extends DataSource {
 		}
 		return $resultSet;
 	}
+
 /**
  * Private method.	Passes association results thru afterFind filters of corresponding model
  *
@@ -725,6 +753,7 @@ class DboSource extends DataSource {
 		}
 		return $filtering;
 	}
+
 /**
  * Enter description here...
  *
@@ -743,11 +772,11 @@ class DboSource extends DataSource {
 		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
 			if (!isset($resultSet) || !is_array($resultSet)) {
 				if (Configure::read() > 0) {
-					e('<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ');
+					echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
 					if (isset($this->error) && $this->error != null) {
-						e($this->error);
+						echo $this->error;
 					}
-					e('</div>');
+					echo '</div>';
 				}
 				return null;
 			}
@@ -884,6 +913,7 @@ class DboSource extends DataSource {
 			}
 		}
 	}
+
 /**
  * A more efficient way to fetch associations.	Woohoo!
  *
@@ -900,6 +930,7 @@ class DboSource extends DataSource {
 		}
 		return $this->fetchAll($query, $model->cacheQueries, $model->alias);
 	}
+
 /**
  * mergeHasMany - Merge the results of hasMany relations.
  *
@@ -939,6 +970,7 @@ class DboSource extends DataSource {
 			}
 		}
 	}
+
 /**
  * Enter description here...
  *
@@ -1017,6 +1049,7 @@ class DboSource extends DataSource {
 			}
 		}
 	}
+
 /**
  * Generates an array representing a query or part of a query from a single model or two associated models
  *
@@ -1186,6 +1219,7 @@ class DboSource extends DataSource {
 		}
 		return null;
 	}
+
 /**
  * Returns a conditions array for the constraint between two models
  *
@@ -1226,6 +1260,7 @@ class DboSource extends DataSource {
 		}
 		return array();
 	}
+
 /**
  * Builds and generates a JOIN statement from an array.	 Handles final clean-up before conversion.
  *
@@ -1250,6 +1285,7 @@ class DboSource extends DataSource {
 		}
 		return $this->renderJoinStatement($data);
 	}
+
 /**
  * Builds and generates an SQL statement from an array.	 Handles final clean-up before conversion.
  *
@@ -1279,6 +1315,7 @@ class DboSource extends DataSource {
 			'group' => $this->group($query['group'])
 		));
 	}
+
 /**
  * Renders a final SQL JOIN statement
  *
@@ -1289,6 +1326,7 @@ class DboSource extends DataSource {
 		extract($data);
 		return trim("{$type} JOIN {$table} {$alias} ON ({$conditions})");
 	}
+
 /**
  * Renders a final SQL statement by putting together the component parts in the correct order
  *
@@ -1334,6 +1372,7 @@ class DboSource extends DataSource {
 			break;
 		}
 	}
+
 /**
  * Merges a mixed set of string/array conditions
  *
@@ -1360,6 +1399,7 @@ class DboSource extends DataSource {
 
 		return $assoc;
 	}
+
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  * For databases that do not support aliases in UPDATE queries.
@@ -1393,6 +1433,7 @@ class DboSource extends DataSource {
 		}
 		return true;
 	}
+
 /**
  * Quotes and prepares fields and values for an SQL UPDATE statement
  *
@@ -1436,6 +1477,7 @@ class DboSource extends DataSource {
 		}
 		return $updates;
 	}
+
 /**
  * Generates and executes an SQL DELETE statement.
  * For databases that do not support aliases in UPDATE queries.
@@ -1459,6 +1501,7 @@ class DboSource extends DataSource {
 		}
 		return true;
 	}
+
 /**
  * Gets a list of record IDs for the given conditions.	Used for multi-record updates and deletes
  * in databases that do not support aliases in UPDATE/DELETE queries.
@@ -1488,6 +1531,7 @@ class DboSource extends DataSource {
 		}
 		return $conditions;
 	}
+
 /**
  * Returns an array of SQL JOIN fragments from a model's associations
  *
@@ -1514,13 +1558,14 @@ class DboSource extends DataSource {
 		}
 		return $join;
 	}
+
 /**
- * Returns the an SQL calculation, i.e. COUNT() or MAX()
+ * Returns an SQL calculation, i.e. COUNT() or MAX()
  *
  * @param model $model
  * @param string $func Lowercase name of SQL function, i.e. 'count' or 'max'
  * @param array $params Function parameters (any values must be quoted manually)
- * @return string	An SQL calculation function
+ * @return string An SQL calculation function
  * @access public
  */
 	function calculate(&$model, $func, $params = array()) {
@@ -1544,6 +1589,7 @@ class DboSource extends DataSource {
 			break;
 		}
 	}
+
 /**
  * Deletes all the records in a table and resets the count of the auto-incrementing
  * primary key, where applicable.
@@ -1555,6 +1601,7 @@ class DboSource extends DataSource {
 	function truncate($table) {
 		return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
 	}
+
 /**
  * Begin a transaction
  *
@@ -1570,6 +1617,7 @@ class DboSource extends DataSource {
 		}
 		return false;
 	}
+
 /**
  * Commit a transaction
  *
@@ -1585,6 +1633,7 @@ class DboSource extends DataSource {
 		}
 		return false;
 	}
+
 /**
  * Rollback a transaction
  *
@@ -1600,6 +1649,7 @@ class DboSource extends DataSource {
 		}
 		return false;
 	}
+
 /**
  * Creates a default set of conditions from the model if $conditions is null/empty.
  *
@@ -1622,6 +1672,7 @@ class DboSource extends DataSource {
 		}
 		return array("{$alias}.{$model->primaryKey}" => $model->getID());
 	}
+
 /**
  * Returns a key formatted like a string Model.fieldname(i.e. Post.title, or Country.name)
  *
@@ -1639,6 +1690,7 @@ class DboSource extends DataSource {
 		}
 		return $key;
 	}
+
 /**
  * Private helper method to remove query metadata in given data array.
  *
@@ -1653,6 +1705,7 @@ class DboSource extends DataSource {
 		}
 		return $data;
 	}
+
 /**
  * Generates the fields list of an SQL query.
  *
@@ -1733,6 +1786,7 @@ class DboSource extends DataSource {
 		}
 		return array_unique($fields);
 	}
+
 /**
  * Creates a WHERE clause by parsing given conditions data.
  *
@@ -1773,6 +1827,7 @@ class DboSource extends DataSource {
 		}
 		return $clause . $conditions;
 	}
+
 /**
  * Creates a WHERE clause by parsing given conditions array.  Used by DboSource::conditions().
  *
@@ -1843,9 +1898,9 @@ class DboSource extends DataSource {
 					if (array_keys($value) === array_values(array_keys($value))) {
 						$count = count($value);
 						if ($count === 1) {
-							$data = $this->name($key) . ' = (';
+							$data = $this->__quoteFields($key) . ' = (';
 						} else {
-							$data = $this->name($key) . ' IN (';
+							$data = $this->__quoteFields($key) . ' IN (';
 						}
 						if ($quoteValues || strpos($value[0], '-!') !== 0) {
 							if (is_object($model)) {
@@ -1880,6 +1935,7 @@ class DboSource extends DataSource {
 		}
 		return $out;
 	}
+
 /**
  * Extracts a Model.field identifier and an SQL condition operator from a string, formats
  * and inserts values, and composes them into an SQL snippet.
@@ -1908,7 +1964,9 @@ class DboSource extends DataSource {
 			}
 		}
 
+
 		$type = (is_object($model) ? $model->getColumnType($key) : null);
+
 		$null = ($value === null || (is_array($value) && empty($value)));
 
 		if (strtolower($operator) === 'not') {
@@ -1917,6 +1975,7 @@ class DboSource extends DataSource {
 			);
 			return $data[0];
 		}
+
 		$value = $this->value($value, $type);
 
 		if ($key !== '?') {
@@ -1957,8 +2016,10 @@ class DboSource extends DataSource {
 				break;
 			}
 		}
+
 		return "{$key} {$operator} {$value}";
 	}
+
 /**
  * Quotes Model.fields
  *
@@ -1991,6 +2052,7 @@ class DboSource extends DataSource {
 		}
 		return $original;
 	}
+
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
@@ -2014,6 +2076,7 @@ class DboSource extends DataSource {
 		}
 		return null;
 	}
+
 /**
  * Returns an ORDER BY clause as a string.
  *
@@ -2082,6 +2145,7 @@ class DboSource extends DataSource {
 		}
 		return ' ORDER BY ' . $keys . ' ' . $direction;
 	}
+
 /**
  * Create a GROUP BY SQL clause
  *
@@ -2097,6 +2161,7 @@ class DboSource extends DataSource {
 		}
 		return null;
 	}
+
 /**
  * Disconnects database, kills the connection and says the connection is closed,
  * and if DEBUG is turned on, the log for this object is shown.
@@ -2108,6 +2173,7 @@ class DboSource extends DataSource {
 		}
 		$this->disconnect();
 	}
+
 /**
  * Checks if the specified table contains any record matching specified SQL
  *
@@ -2129,6 +2195,7 @@ class DboSource extends DataSource {
 		}
 		return false;
 	}
+
 /**
  * Gets the length of a database-native column description, or null if no length
  *
@@ -2188,6 +2255,7 @@ class DboSource extends DataSource {
 		}
 		return intval($length);
 	}
+
 /**
  * Translates between PHP boolean values and Database (faked) boolean values
  *
@@ -2204,6 +2272,7 @@ class DboSource extends DataSource {
 			return !empty($data);
 		}
 	}
+
 /**
  * Inserts multiple values into a table
  *
@@ -2222,6 +2291,7 @@ class DboSource extends DataSource {
 			$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values[$x]}");
 		}
 	}
+
 /**
  * Returns an array of the indexes in given datasource name.
  *
@@ -2231,6 +2301,7 @@ class DboSource extends DataSource {
 	function index($model) {
 		return false;
 	}
+
 /**
  * Generate a database-native schema for the given Schema object
  *
@@ -2279,6 +2350,7 @@ class DboSource extends DataSource {
 		}
 		return $out;
 	}
+
 /**
  * Generate a alter syntax from	 CakeSchema::compare()
  *
@@ -2288,6 +2360,7 @@ class DboSource extends DataSource {
 	function alterSchema($compare, $table = null) {
 		return false;
 	}
+
 /**
  * Generate a "drop table" statement for the given Schema object
  *
@@ -2310,6 +2383,7 @@ class DboSource extends DataSource {
 		}
 		return $out;
 	}
+
 /**
  * Generate a database-native column schema string
  *
@@ -2366,6 +2440,7 @@ class DboSource extends DataSource {
 		}
 		return $out;
 	}
+
 /**
  * Format indexes for create table
  *
@@ -2394,6 +2469,7 @@ class DboSource extends DataSource {
 		}
 		return $join;
 	}
+
 /**
  * Guesses the data type of an array
  *
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index a2a943cf6..1af116e99 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * This is core configuration file.
  *
@@ -24,10 +25,12 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Load Model and AppModel
  */
 App::import('Model', 'App');
+
 /**
  * Short description for file.
  *
@@ -38,6 +41,7 @@ App::import('Model', 'App');
  * @subpackage    cake.cake.libs.model
  */
 class AclNode extends AppModel {
+
 /**
  * Explicitly disable in-memory query caching for ACL models
  *
@@ -45,6 +49,7 @@ class AclNode extends AppModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * ACL models use the Tree behavior
  *
@@ -52,6 +57,7 @@ class AclNode extends AppModel {
  * @access public
  */
 	var $actsAs = array('Tree' => 'nested');
+
 /**
  * Constructor
  *
@@ -63,6 +69,7 @@ class AclNode extends AppModel {
 		}
 		parent::__construct();
 	}
+
 /**
  * Retrieves the Aro/Aco node for this model
  *
@@ -194,6 +201,7 @@ class AclNode extends AppModel {
 		return $result;
 	}
 }
+
 /**
  * Access Control Object
  *
@@ -201,6 +209,7 @@ class AclNode extends AppModel {
  * @subpackage    cake.cake.libs.model
  */
 class Aco extends AclNode {
+
 /**
  * Model name
  *
@@ -208,6 +217,7 @@ class Aco extends AclNode {
  * @access public
  */
 	var $name = 'Aco';
+
 /**
  * Binds to ARO nodes through permissions settings
  *
@@ -216,6 +226,7 @@ class Aco extends AclNode {
  */
 	var $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission'));
 }
+
 /**
  * Action for Access Control Object
  *
@@ -223,6 +234,7 @@ class Aco extends AclNode {
  * @subpackage    cake.cake.libs.model
  */
 class AcoAction extends AppModel {
+
 /**
  * Model name
  *
@@ -230,6 +242,7 @@ class AcoAction extends AppModel {
  * @access public
  */
 	var $name = 'AcoAction';
+
 /**
  * ACO Actions belong to ACOs
  *
@@ -238,6 +251,7 @@ class AcoAction extends AppModel {
  */
 	var $belongsTo = array('Aco');
 }
+
 /**
  * Access Request Object
  *
@@ -245,6 +259,7 @@ class AcoAction extends AppModel {
  * @subpackage    cake.cake.libs.model
  */
 class Aro extends AclNode {
+
 /**
  * Model name
  *
@@ -252,6 +267,7 @@ class Aro extends AclNode {
  * @access public
  */
 	var $name = 'Aro';
+
 /**
  * AROs are linked to ACOs by means of Permission
  *
@@ -260,6 +276,7 @@ class Aro extends AclNode {
  */
 	var $hasAndBelongsToMany = array('Aco' => array('with' => 'Permission'));
 }
+
 /**
  * Permissions linking AROs with ACOs
  *
@@ -267,6 +284,7 @@ class Aro extends AclNode {
  * @subpackage    cake.cake.libs.model
  */
 class Permission extends AppModel {
+
 /**
  * Model name
  *
@@ -274,6 +292,7 @@ class Permission extends AppModel {
  * @access public
  */
 	var $name = 'Permission';
+
 /**
  * Explicitly disable in-memory query caching
  *
@@ -281,6 +300,7 @@ class Permission extends AppModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * Override default table name
  *
@@ -288,6 +308,7 @@ class Permission extends AppModel {
  * @access public
  */
 	var $useTable = 'aros_acos';
+
 /**
  * Permissions link AROs with ACOs
  *
@@ -295,6 +316,7 @@ class Permission extends AppModel {
  * @access public
  */
 	var $belongsTo = array('Aro', 'Aco');
+
 /**
  * No behaviors for this model
  *
@@ -302,6 +324,7 @@ class Permission extends AppModel {
  * @access public
  */
 	var $actsAs = null;
+
 /**
  * Constructor, used to tell this model to use the
  * database configured for ACL
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index deb859f1c..4666cf1f2 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -19,12 +19,15 @@
  * @since         CakePHP(tm) v 0.10.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * Included libs
  */
 App::import('Core', array(
-	'ClassRegistry', 'Overloadable', 'Validation', 'ModelBehavior', 'ConnectionManager', 'Set', 'String'
+	'ClassRegistry', 'Overloadable', 'Validation', 'Set', 'String'
 ));
+App::import('Model', array('ModelBehavior', 'ConnectionManager'), false);
+
 /**
  * Object-relational mapper.
  *
@@ -38,6 +41,7 @@ App::import('Core', array(
  * @link          http://book.cakephp.org/view/66/Models
  */
 class Model extends Overloadable {
+
 /**
  * The name of the DataSource connection that this Model uses
  *
@@ -46,6 +50,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/435/useDbConfig
  */
 	var $useDbConfig = 'default';
+
 /**
  * Custom database table name, or null/false if no table association is desired.
  *
@@ -54,6 +59,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/436/useTable
  */
 	var $useTable = null;
+
 /**
  * Custom display field name. Display fields are used by Scaffold, in SELECT boxes' OPTION elements.
  *
@@ -62,6 +68,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/438/displayField
  */
 	var $displayField = null;
+
 /**
  * Value of the primary key ID of the record that this model is currently pointing to.
  * Automatically set after database insertions.
@@ -70,6 +77,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $id = false;
+
 /**
  * Container for the data that this model gets from persistent storage (usually, a database).
  *
@@ -78,6 +86,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/441/data
  */
 	var $data = array();
+
 /**
  * Table name for this Model.
  *
@@ -85,6 +94,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $table = false;
+
 /**
  * The name of the primary key field for this model.
  *
@@ -93,6 +103,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/437/primaryKey
  */
 	var $primaryKey = null;
+
 /**
  * Field-by-field table metadata.
  *
@@ -101,6 +112,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/442/_schema
  */
 	var $_schema = null;
+
 /**
  * List of validation rules. Append entries for validation as ('field_name' => '/^perl_compat_regexp$/')
  * that have to match with preg_match(). Use these rules with Model::validate()
@@ -111,6 +123,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/125/Data-Validation
  */
 	var $validate = array();
+
 /**
  * List of validation errors.
  *
@@ -119,6 +132,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/410/Validating-Data-from-the-Controller
  */
 	var $validationErrors = array();
+
 /**
  * Database table prefix for tables in model.
  *
@@ -127,6 +141,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/475/tablePrefix
  */
 	var $tablePrefix = null;
+
 /**
  * Name of the model.
  *
@@ -135,6 +150,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/444/name
  */
 	var $name = null;
+
 /**
  * Alias name for model.
  *
@@ -142,6 +158,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $alias = null;
+
 /**
  * List of table names included in the model description. Used for associations.
  *
@@ -149,6 +166,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $tableToModel = array();
+
 /**
  * Whether or not to log transactions for this model.
  *
@@ -156,6 +174,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $logTransactions = false;
+
 /**
  * Whether or not to enable transactions for this model (i.e. BEGIN/COMMIT/ROLLBACK statements)
  *
@@ -163,6 +182,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $transactional = false;
+
 /**
  * Whether or not to cache queries for this model.  This enables in-memory
  * caching only, the results are not stored beyond the current request.
@@ -172,6 +192,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/445/cacheQueries
  */
 	var $cacheQueries = false;
+
 /**
  * Detailed list of belongsTo associations.
  *
@@ -180,6 +201,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/81/belongsTo
  */
 	var $belongsTo = array();
+
 /**
  * Detailed list of hasOne associations.
  *
@@ -188,6 +210,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/80/hasOne
  */
 	var $hasOne = array();
+
 /**
  * Detailed list of hasMany associations.
  *
@@ -196,6 +219,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/82/hasMany
  */
 	var $hasMany = array();
+
 /**
  * Detailed list of hasAndBelongsToMany associations.
  *
@@ -204,6 +228,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/83/hasAndBelongsToMany-HABTM
  */
 	var $hasAndBelongsToMany = array();
+
 /**
  * List of behaviors to load when the model object is initialized. Settings can be
  * passed to behaviors by using the behavior name as index. Eg:
@@ -215,6 +240,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/90/Using-Behaviors
  */
 	var $actsAs = null;
+
 /**
  * Holds the Behavior objects currently bound to this model.
  *
@@ -222,6 +248,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $Behaviors = null;
+
 /**
  * Whitelist of fields allowed to be saved.
  *
@@ -229,6 +256,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $whitelist = array();
+
 /**
  * Whether or not to cache sources for this model.
  *
@@ -236,6 +264,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $cacheSources = true;
+
 /**
  * Type of find query currently executing.
  *
@@ -243,6 +272,7 @@ class Model extends Overloadable {
  * @access public
  */
 	var $findQueryType = null;
+
 /**
  * Number of associations to recurse through during find calls. Fetches only
  * the first level by default.
@@ -252,6 +282,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/439/recursive
  */
 	var $recursive = 1;
+
 /**
  * The column name(s) and direction(s) to order find results by default.
  *
@@ -263,6 +294,7 @@ class Model extends Overloadable {
  * @link http://book.cakephp.org/view/440/order
  */
 	var $order = null;
+
 /**
  * Whether or not the model record exists, set by Model::exists().
  *
@@ -270,6 +302,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__exists = null;
+
 /**
  * Default list of association keys.
  *
@@ -282,6 +315,7 @@ class Model extends Overloadable {
 		'hasMany' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'dependent', 'exclusive', 'finderQuery', 'counterQuery'),
 		'hasAndBelongsToMany' => array('className', 'joinTable', 'with', 'foreignKey', 'associationForeignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'unique', 'finderQuery', 'deleteQuery', 'insertQuery')
 	);
+
 /**
  * Holds provided/generated association key names and other data for all associations.
  *
@@ -289,6 +323,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__associations = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+
 /**
  * Holds model associations temporarily to allow for dynamic (un)binding.
  *
@@ -296,6 +331,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__backAssociation = array();
+
 /**
  * The ID of the model record that was last inserted.
  *
@@ -303,6 +339,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__insertID = null;
+
 /**
  * The number of records returned by the last query.
  *
@@ -310,6 +347,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__numRows = null;
+
 /**
  * The number of records affected by the last query.
  *
@@ -317,6 +355,7 @@ class Model extends Overloadable {
  * @access private
  */
 	var $__affectedRows = null;
+
 /**
  * List of valid finder method options, supplied as the first parameter to find().
  *
@@ -327,6 +366,7 @@ class Model extends Overloadable {
 		'all' => true, 'first' => true, 'count' => true,
 		'neighbors' => true, 'list' => true, 'threaded' => true
 	);
+
 /**
  * Constructor. Binds the model's database table to the object.
  *
@@ -369,7 +409,7 @@ class Model extends Overloadable {
 		} elseif ($table) {
 			$this->useTable = $table;
 		}
-		
+
 		if ($ds !== null) {
 			$this->useDbConfig = $ds;
 		}
@@ -419,6 +459,7 @@ class Model extends Overloadable {
 		$this->__createLinks();
 		$this->Behaviors->init($this->alias, $this->actsAs);
 	}
+
 /**
  * Handles custom method calls, like findBy<field> for DB models,
  * and custom RPC calls for remote data sources.
@@ -442,6 +483,7 @@ class Model extends Overloadable {
 		}
 		return $return;
 	}
+
 /**
  * Bind model associations on the fly.
  *
@@ -491,6 +533,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Bind model associations on the fly.
  *
@@ -529,6 +572,7 @@ class Model extends Overloadable {
 		$this->__createLinks();
 		return true;
 	}
+
 /**
  * Turn off associations on the fly.
  *
@@ -561,6 +605,7 @@ class Model extends Overloadable {
 		}
 		return true;
 	}
+
 /**
  * Create a set of associations.
  *
@@ -613,6 +658,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Private helper method to create associated models of a given class.
  *
@@ -644,6 +690,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Build an array-based association from string.
  *
@@ -727,6 +774,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Sets a custom table for your controller class. Used by your controller to select a database table.
  *
@@ -753,6 +801,7 @@ class Model extends Overloadable {
 		$this->tableToModel[$this->table] = $this->alias;
 		$this->schema();
 	}
+
 /**
  * This function does two things: 1) it scans the array $one for the primary key,
  * and if that's found, it sets the current id to the value of $one[id].
@@ -807,6 +856,7 @@ class Model extends Overloadable {
 		}
 		return $data;
 	}
+
 /**
  * Deconstructs a complex data type (array or object) into a single field value.
  *
@@ -824,8 +874,11 @@ class Model extends Overloadable {
 		$type = $this->getColumnType($field);
 
 		if (in_array($type, array('datetime', 'timestamp', 'date', 'time'))) {
-			$useNewDate = (isset($data['year']) || isset($data['month']) || isset($data['day']) || isset($data['hour']) || isset($data['minute']));
+			$useNewDate = (isset($data['year']) || isset($data['month']) ||
+				isset($data['day']) || isset($data['hour']) || isset($data['minute']));
+
 			$dateFields = array('Y' => 'year', 'm' => 'month', 'd' => 'day', 'H' => 'hour', 'i' => 'min', 's' => 'sec');
+			$timeFields = array('H' => 'hour', 'i' => 'min', 's' => 'sec');
 
 			$db =& ConnectionManager::getDataSource($this->useDbConfig);
 			$format = $db->columns[$type]['format'];
@@ -837,32 +890,48 @@ class Model extends Overloadable {
 			if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] == 12 && 'am' == $data['meridian']) {
 				$data['hour'] = '00';
 			}
-
-			foreach ($dateFields as $key => $val) {
-				if (in_array($val, array('hour', 'min', 'sec'))) {
-					if (!isset($data[$val]) || $data[$val] === '0' || empty($data[$val])) {
+			if ($type == 'time') {
+				foreach ($timeFields as $key => $val) {
+					if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
 						$data[$val] = '00';
+					} elseif ($data[$val] === '') {
+						$data[$val] = '';
 					} else {
 						$data[$val] = sprintf('%02d', $data[$val]);
 					}
+					if (!empty($data[$val])) {
+						$date[$key] = $data[$val];
+					} else {
+						return null;
+					}
 				}
-				if (in_array($type, array('datetime', 'timestamp', 'date')) && !isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
-					return null;
-				} elseif (isset($data[$val]) && !empty($data[$val])) {
-					$date[$key] = $data[$val];
+			}
+
+			if ($type == 'datetime' || $type == 'timestamp' || $type == 'date') {
+				foreach ($dateFields as $key => $val) {
+					if ($val == 'hour' || $val == 'min' || $val == 'sec') {
+						if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
+							$data[$val] = '00';
+						} else {
+							$data[$val] = sprintf('%02d', $data[$val]);
+						}
+					}
+					if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
+						return null;
+					}
+					if (isset($data[$val]) && !empty($data[$val])) {
+						$date[$key] = $data[$val];
+					}
 				}
 			}
 			$date = str_replace(array_keys($date), array_values($date), $format);
-			if ($type == 'time' && $date == '00:00:00') {
-				return null;
-			}
-
-			if ($useNewDate && (!empty($date))) {
+			if ($useNewDate && !empty($date)) {
 				return $date;
 			}
 		}
 		return $data;
 	}
+
 /**
  * Returns an array of table metadata (column names and types) from the database.
  * $field => keys(type, null, default, key, length, extra)
@@ -890,6 +959,7 @@ class Model extends Overloadable {
 		}
 		return $this->_schema;
 	}
+
 /**
  * Returns an associative array of field names and column types.
  *
@@ -907,6 +977,7 @@ class Model extends Overloadable {
 		}
 		return $cols;
 	}
+
 /**
  * Returns the column type of a column in the model.
  *
@@ -932,6 +1003,7 @@ class Model extends Overloadable {
 		}
 		return null;
 	}
+
 /**
  * Returns true if the supplied field exists in the model's database table.
  *
@@ -960,6 +1032,7 @@ class Model extends Overloadable {
 		}
 		return false;
 	}
+
 /**
  * Initializes the model for writing a new record, loading the default values
  * for those fields that are not defined in $data. Especially helpful for
@@ -993,6 +1066,7 @@ class Model extends Overloadable {
 		}
 		return $this->data;
 	}
+
 /**
  * Returns a list of fields from the database, and sets the current model
  * data (Model::$data) with the record found.
@@ -1025,6 +1099,7 @@ class Model extends Overloadable {
 			return false;
 		}
 	}
+
 /**
  * Returns the contents of a single field given the supplied conditions, in the
  * supplied order.
@@ -1064,6 +1139,7 @@ class Model extends Overloadable {
 			return false;
 		}
 	}
+
 /**
  * Saves the value of a single field to the database, based on the current
  * model ID.
@@ -1087,6 +1163,7 @@ class Model extends Overloadable {
 		}
 		return $this->save(array($this->alias => array($this->primaryKey => $id, $name => $value)), $options);
 	}
+
 /**
  * Saves model data (based on white-list, if supplied) to the database. By
  * default, validation occurs before save.
@@ -1264,6 +1341,7 @@ class Model extends Overloadable {
 		$this->whitelist = $_whitelist;
 		return $success;
 	}
+
 /**
  * Saves model hasAndBelongsToMany data to the database.
  *
@@ -1322,7 +1400,7 @@ class Model extends Overloadable {
 						unset($values);
 					} elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
 						$newData[] = $row;
-					} elseif (isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+					} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
 						$newData[] = $row[$join];
 					}
 				}
@@ -1351,6 +1429,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Updates the counter cache of belongsTo associations after a save or delete operation
  *
@@ -1407,6 +1486,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Helper method for Model::updateCounterCache().  Checks the fields to be updated for
  *
@@ -1434,6 +1514,7 @@ class Model extends Overloadable {
 		));
 		return array_merge($data, array('old' => $old[$this->alias]));
 	}
+
 /**
  * Saves multiple individual records for a single model; Also works with a single record, as well as
  * all its associated records.
@@ -1622,6 +1703,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Private helper method used by saveAll.
  *
@@ -1639,6 +1721,7 @@ class Model extends Overloadable {
 		}
 		return true;
 	}
+
 /**
  * Updates multiple model records based on a set of conditions.
  *
@@ -1653,6 +1736,7 @@ class Model extends Overloadable {
 		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		return $db->update($this, $fields, null, $conditions);
 	}
+
 /**
  * @deprecated
  * @link http://book.cakephp.org/view/691/remove
@@ -1660,6 +1744,7 @@ class Model extends Overloadable {
 	function remove($id = null, $cascade = true) {
 		return $this->delete($id, $cascade);
 	}
+
 /**
  * Removes record for given ID. If no ID is given, the current ID is used. Returns true on success.
  *
@@ -1705,12 +1790,14 @@ class Model extends Overloadable {
 		}
 		return false;
 	}
+
 /**
  * @deprecated
  */
 	function del($id = null, $cascade = true) {
 		return $this->delete($id, $cascade);
 	}
+
 /**
  * Cascades model deletes through associated hasMany and hasOne child records.
  *
@@ -1753,6 +1840,7 @@ class Model extends Overloadable {
 			$this->__backAssociation = $savedAssociatons;
 		}
 	}
+
 /**
  * Cascades model deletes through HABTM join keys.
  *
@@ -1780,6 +1868,7 @@ class Model extends Overloadable {
 			}
 		}
 	}
+
 /**
  * Deletes multiple model records based on a set of conditions.
  *
@@ -2608,6 +2697,7 @@ class Model extends Overloadable {
 	function setInsertID($id) {
 		$this->__insertID = $id;
 	}
+
 /**
  * Returns the number of rows returned from the last query.
  *
@@ -2618,6 +2708,7 @@ class Model extends Overloadable {
 		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		return $db->lastNumRows();
 	}
+
 /**
  * Returns the number of rows affected by the last query.
  *
@@ -2628,6 +2719,7 @@ class Model extends Overloadable {
 		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		return $db->lastAffected();
 	}
+
 /**
  * Sets the DataSource to which this model is bound.
  *
@@ -2656,6 +2748,7 @@ class Model extends Overloadable {
 			return $this->cakeError('missingConnection', array(array('className' => $this->alias)));
 		}
 	}
+
 /**
  * Gets the DataSource to which this model is bound.
  * Not safe for use with some versions of PHP4, because this class is overloaded.
@@ -2667,6 +2760,7 @@ class Model extends Overloadable {
 		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		return $db;
 	}
+
 /**
  * Gets all the models with which this model is associated.
  *
@@ -2710,6 +2804,7 @@ class Model extends Overloadable {
 			return null;
 		}
 	}
+
 /**
  * Gets the name and fields to be used by a join model.  This allows specifying join fields
  * in the association definition.
@@ -2732,6 +2827,7 @@ class Model extends Overloadable {
 			E_USER_WARNING
 		);
 	}
+
 /**
  * Called before each find operation. Return false if you want to halt the find
  * call, otherwise return the (modified) query data.
@@ -2745,6 +2841,7 @@ class Model extends Overloadable {
 	function beforeFind($queryData) {
 		return true;
 	}
+
 /**
  * Called after each find operation. Can be used to modify any results returned by find().
  * Return value should be the (modified) results.
@@ -2758,6 +2855,7 @@ class Model extends Overloadable {
 	function afterFind($results, $primary = false) {
 		return $results;
 	}
+
 /**
  * Called before each save operation, after validation. Return a non-true result
  * to halt the save.
@@ -2769,6 +2867,7 @@ class Model extends Overloadable {
 	function beforeSave($options = array()) {
 		return true;
 	}
+
 /**
  * Called after each successful save operation.
  *
@@ -2778,6 +2877,7 @@ class Model extends Overloadable {
  */
 	function afterSave($created) {
 	}
+
 /**
  * Called before every deletion operation.
  *
@@ -2789,6 +2889,7 @@ class Model extends Overloadable {
 	function beforeDelete($cascade = true) {
 		return true;
 	}
+
 /**
  * Called after every deletion operation.
  *
@@ -2797,6 +2898,7 @@ class Model extends Overloadable {
  */
 	function afterDelete() {
 	}
+
 /**
  * Called during save operations, before validation. Please note that custom
  * validation rules can be defined in $validate.
@@ -2809,6 +2911,7 @@ class Model extends Overloadable {
 	function beforeValidate($options = array()) {
 		return true;
 	}
+
 /**
  * Called when a DataSource-level error occurs.
  *
@@ -2817,6 +2920,7 @@ class Model extends Overloadable {
  */
 	function onError() {
 	}
+
 /**
  * Private method. Clears cache for this model.
  *
@@ -2847,6 +2951,7 @@ class Model extends Overloadable {
 			//Will use for query cache deleting
 		}
 	}
+
 /**
  * Called when serializing a model.
  *
@@ -2857,6 +2962,7 @@ class Model extends Overloadable {
 		$return = array_keys(get_object_vars($this));
 		return $return;
 	}
+
 /**
  * Called when de-serializing a model.
  *
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index fdbc64e30..f2cdb0927 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Model behaviors base class.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Model behavior base class.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.model
  */
 class ModelBehavior extends Object {
+
 /**
  * Contains configuration settings for use with individual model objects.  This
  * is used because if multiple models use this Behavior, each will use the same
@@ -44,6 +47,7 @@ class ModelBehavior extends Object {
  * @see Model::$alias
  */
 	var $settings = array();
+
 /**
  * Allows the mapping of preg-compatible regular expressions to public or
  * private methods in this class, where the array key is a /-delimited regular
@@ -54,6 +58,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	var $mapMethods = array();
+
 /**
  * Setup this behavior with the specified configuration settings.
  *
@@ -62,6 +67,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function setup(&$model, $config = array()) { }
+
 /**
  * Clean up any initialization this behavior has done on a model.  Called when a behavior is dynamically
  * detached from a model using Model::detach().
@@ -75,6 +81,7 @@ class ModelBehavior extends Object {
 			unset($this->settings[$model->alias]);
 		}
 	}
+
 /**
  * Before find callback
  *
@@ -84,6 +91,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function beforeFind(&$model, $query) { }
+
 /**
  * After find callback. Can be used to modify any results returned by find and findAll.
  *
@@ -94,6 +102,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function afterFind(&$model, $results, $primary) { }
+
 /**
  * Before validate callback
  *
@@ -102,6 +111,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function beforeValidate(&$model) { }
+
 /**
  * Before save callback
  *
@@ -110,6 +120,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function beforeSave(&$model) { }
+
 /**
  * After save callback
  *
@@ -118,6 +129,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function afterSave(&$model, $created) { }
+
 /**
  * Before delete callback
  *
@@ -127,6 +139,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function beforeDelete(&$model, $cascade = true) { }
+
 /**
  * After delete callback
  *
@@ -134,6 +147,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function afterDelete(&$model) { }
+
 /**
  * DataSource error callback
  *
@@ -142,6 +156,7 @@ class ModelBehavior extends Object {
  * @access public
  */
 	function onError(&$model, $error) { }
+
 /**
  * Overrides Object::dispatchMethod to account for PHP4's broken reference support
  *
@@ -172,6 +187,7 @@ class ModelBehavior extends Object {
 			break;
 		}
 	}
+
 /**
  * If $model's whitelist property is non-empty, $field will be added to it.
  * Note: this method should *only* be used in beforeValidate or beforeSave to ensure
@@ -205,6 +221,7 @@ class ModelBehavior extends Object {
  * @subpackage    cake.cake.libs.model
  */
 class BehaviorCollection extends Object {
+
 /**
  * Stores a reference to the attached name
  *
@@ -212,6 +229,7 @@ class BehaviorCollection extends Object {
  * @access public
  */
 	var $modelName = null;
+
 /**
  * Lists the currently-attached behavior objects
  *
@@ -219,6 +237,7 @@ class BehaviorCollection extends Object {
  * @access private
  */
 	var $_attached = array();
+
 /**
  * Lists the currently-attached behavior objects which are disabled
  *
@@ -226,18 +245,21 @@ class BehaviorCollection extends Object {
  * @access private
  */
 	var $_disabled = array();
+
 /**
  * Keeps a list of all methods of attached behaviors
  *
  * @var array
  */
 	var $__methods = array();
+
 /**
  * Keeps a list of all methods which have been mapped with regular expressions
  *
  * @var array
  */
 	var $__mappedMethods = array();
+
 /**
  * Attaches a model object and loads a list of behaviors
  *
@@ -253,6 +275,7 @@ class BehaviorCollection extends Object {
 			}
 		}
 	}
+
 /**
  * Attaches a behavior to a model
  *
@@ -331,6 +354,7 @@ class BehaviorCollection extends Object {
 		}
 		return true;
 	}
+
 /**
  * Detaches a behavior from a model
  *
@@ -350,6 +374,7 @@ class BehaviorCollection extends Object {
 		}
 		$this->_attached = array_values(array_diff($this->_attached, (array)$name));
 	}
+
 /**
  * Enables callbacks on a behavior or array of behaviors
  *
@@ -360,6 +385,7 @@ class BehaviorCollection extends Object {
 	function enable($name) {
 		$this->_disabled = array_diff($this->_disabled, (array)$name);
 	}
+
 /**
  * Disables callbacks on a behavior or array of behaviors.  Public behavior methods are still
  * callable as normal.
@@ -375,6 +401,7 @@ class BehaviorCollection extends Object {
 			}
 		}
 	}
+
 /**
  * Gets the list of currently-enabled behaviors, or, the current status of a single behavior
  *
@@ -390,6 +417,7 @@ class BehaviorCollection extends Object {
 		}
 		return array_diff($this->_attached, $this->_disabled);
 	}
+
 /**
  * Dispatches a behavior method
  *
@@ -430,6 +458,7 @@ class BehaviorCollection extends Object {
 		}
 		return array('unhandled');
 	}
+
 /**
  * Dispatches a behavior callback on all attached behavior objects
  *
@@ -466,6 +495,7 @@ class BehaviorCollection extends Object {
 		}
 		return true;
 	}
+
 /**
  * Gets the method list for attached behaviors, i.e. all public, non-callback methods
  *
@@ -475,6 +505,7 @@ class BehaviorCollection extends Object {
 	function methods() {
 		return $this->__methods;
 	}
+
 /**
  * Gets the list of attached behaviors, or, whether the given behavior is attached
  *
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 724b65923..2d5814153 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Multibyte handling methods.
  *
@@ -29,6 +30,7 @@ if (function_exists('mb_internal_encoding')) {
 		mb_internal_encoding($encoding);
 	}
 }
+
 /**
  * Find position of first occurrence of a case-insensitive string.
  *
@@ -43,6 +45,7 @@ if (!function_exists('mb_stripos')) {
 		return Multibyte::stripos($haystack, $needle, $offset);
 	}
 }
+
 /**
  * Finds first occurrence of a string within another, case insensitive.
  *
@@ -59,6 +62,7 @@ if (!function_exists('mb_stristr')) {
 		return Multibyte::stristr($haystack, $needle, $part);
 	}
 }
+
 /**
  * Get string length.
  *
@@ -72,6 +76,7 @@ if (!function_exists('mb_strlen')) {
 		return Multibyte::strlen($string);
 	}
 }
+
 /**
  * Find position of first occurrence of a string.
  *
@@ -87,6 +92,7 @@ if (!function_exists('mb_strpos')) {
 		return Multibyte::strpos($haystack, $needle, $offset);
 	}
 }
+
 /**
  * Finds the last occurrence of a character in a string within another.
  *
@@ -103,6 +109,7 @@ if (!function_exists('mb_strrchr')) {
 		return Multibyte::strrchr($haystack, $needle, $part);
 	}
 }
+
 /**
  * Finds the last occurrence of a character in a string within another, case insensitive.
  *
@@ -119,6 +126,7 @@ if (!function_exists('mb_strrichr')) {
 		return Multibyte::strrichr($haystack, $needle, $part);
 	}
 }
+
 /**
  * Finds position of last occurrence of a string within another, case insensitive
  *
@@ -133,6 +141,7 @@ if (!function_exists('mb_strripos')) {
 		return Multibyte::strripos($haystack, $needle, $offset);
 	}
 }
+
 /**
  * Find position of last occurrence of a string in a string.
  *
@@ -148,6 +157,7 @@ if (!function_exists('mb_strrpos')) {
 		return Multibyte::strrpos($haystack, $needle, $offset);
 	}
 }
+
 /**
  * Finds first occurrence of a string within another
  *
@@ -164,6 +174,7 @@ if (!function_exists('mb_strstr')) {
 		return Multibyte::strstr($haystack, $needle, $part);
 	}
 }
+
 /**
  * Make a string lowercase
  *
@@ -176,6 +187,7 @@ if (!function_exists('mb_strtolower')) {
 		return Multibyte::strtolower($string);
 	}
 }
+
 /**
  * Make a string uppercase
  *
@@ -188,6 +200,7 @@ if (!function_exists('mb_strtoupper')) {
 		return Multibyte::strtoupper($string);
 	}
 }
+
 /**
  * Count the number of substring occurrences
  *
@@ -201,6 +214,7 @@ if (!function_exists('mb_substr_count')) {
 		return Multibyte::substrCount($haystack, $needle);
 	}
 }
+
 /**
  * Get part of string
  *
@@ -215,6 +229,7 @@ if (!function_exists('mb_substr')) {
 		return Multibyte::substr($string, $start, $length);
 	}
 }
+
 /**
  * Encode string for MIME header
  *
@@ -234,6 +249,7 @@ if (!function_exists('mb_encode_mimeheader')) {
 		return Multibyte::mimeEncode($str, $charset, $linefeed);
 	}
 }
+
 /**
  * Multibyte handling methods.
  *
@@ -242,6 +258,7 @@ if (!function_exists('mb_encode_mimeheader')) {
  * @subpackage    cake.cake.libs
  */
 class Multibyte extends Object {
+
 /**
  *  Holds the case folding values
  *
@@ -249,6 +266,7 @@ class Multibyte extends Object {
  * @access private
  */
 	var $__caseFold = array();
+
 /**
  * Holds an array of Unicode code point ranges
  *
@@ -256,6 +274,7 @@ class Multibyte extends Object {
  * @access private
  */
 	var $__codeRange = array();
+
 /**
  * Holds the current code point range
  *
@@ -263,6 +282,7 @@ class Multibyte extends Object {
  * @access private
  */
 	var $__table = null;
+
 /**
  * Gets a reference to the Multibyte object instance
  *
@@ -278,6 +298,7 @@ class Multibyte extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Converts a multibyte character string
  * to the decimal value of the character
@@ -318,6 +339,7 @@ class Multibyte extends Object {
 		}
 		return $map;
 	}
+
 /**
  * Converts the decimal value of a multibyte character string
  * to a string
@@ -344,6 +366,7 @@ class Multibyte extends Object {
 		}
 		return $ascii;
 	}
+
 /**
  * Find position of first occurrence of a case-insensitive string.
  *
@@ -362,6 +385,7 @@ class Multibyte extends Object {
 		}
 		return stripos($haystack, $needle, $offset);
 	}
+
 /**
  * Finds first occurrence of a string within another, case insensitive.
  *
@@ -423,6 +447,7 @@ class Multibyte extends Object {
 		}
 		return stristr($haystack, $needle);
 	}
+
 /**
  * Get string length.
  *
@@ -438,6 +463,7 @@ class Multibyte extends Object {
 		}
 		return strlen($string);
 	}
+
 /**
  * Find position of first occurrence of a string.
  *
@@ -482,6 +508,7 @@ class Multibyte extends Object {
 		}
 		return strpos($haystack, $needle, $offset);
 	}
+
 /**
  * Finds the last occurrence of a character in a string within another.
  *
@@ -542,6 +569,7 @@ class Multibyte extends Object {
 		}
 		return false;
 	}
+
 /**
  * Finds the last occurrence of a character in a string within another, case insensitive.
  *
@@ -604,6 +632,7 @@ class Multibyte extends Object {
 		}
 		return false;
 	}
+
 /**
  * Finds position of last occurrence of a string within another, case insensitive
  *
@@ -705,6 +734,7 @@ class Multibyte extends Object {
 		}
 		return strrpos($haystack, $needle, $offset);
 	}
+
 /**
  * Finds first occurrence of a string within another
  *
@@ -764,6 +794,7 @@ class Multibyte extends Object {
 		}
 		return strstr($haystack, $needle);
 	}
+
 /**
  * Make a string lowercase
  *
@@ -811,6 +842,7 @@ class Multibyte extends Object {
 		}
 		return Multibyte::ascii($lowerCase);
 	}
+
 /**
  * Make a string uppercase
  *
@@ -903,6 +935,7 @@ class Multibyte extends Object {
 		}
 		return Multibyte::ascii($upperCase);
 	}
+
 /**
  * Count the number of substring occurrences
  *
@@ -939,6 +972,7 @@ class Multibyte extends Object {
 		}
 		return $count;
 	}
+
 /**
  * Get part of string
  *
@@ -972,6 +1006,7 @@ class Multibyte extends Object {
 		}
 		return Multibyte::ascii($value);
 	}
+
 /**
  * Prepare a string for mail transport, using the provided encoding
  *
@@ -1020,6 +1055,7 @@ class Multibyte extends Object {
 		}
 		return $start . $string . $end;
 	}
+
 /**
  * Return the Code points range for Unicode characters
  *
@@ -1068,6 +1104,7 @@ class Multibyte extends Object {
 		$this->__codeRange[$decimal] = $return;
 		return $return;
 	}
+
 /**
  * Find the related code folding values for $char
  *
@@ -1104,6 +1141,7 @@ class Multibyte extends Object {
 		}
 		return $found;
 	}
+
 /**
  * Check the $string for multibyte characters
  * @param string $string value to test
@@ -1123,4 +1161,4 @@ class Multibyte extends Object {
 		return false;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 358fd759f..1ab269b55 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Object class, allowing __construct and __destruct in PHP4.
  *
@@ -25,6 +26,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Object class, allowing __construct and __destruct in PHP4.
  *
@@ -35,6 +37,7 @@
  * @subpackage    cake.cake.libs
  */
 class Object {
+
 /**
  * Log object
  *
@@ -42,6 +45,7 @@ class Object {
  * @access protected
  */
 	var $_log = null;
+
 /**
  * A hack to support __construct() on PHP 4
  * Hint: descendant classes have no PHP4 class_name() constructors,
@@ -57,6 +61,7 @@ class Object {
 		}
 		call_user_func_array(array(&$this, '__construct'), $args);
 	}
+
 /**
  * Class constructor, overridden in descendant classes.
  */
@@ -74,6 +79,7 @@ class Object {
 		$class = get_class($this);
 		return $class;
 	}
+
 /**
  * Calls a controller's method from any location.
  *
@@ -99,6 +105,7 @@ class Object {
 		$dispatcher = new Dispatcher;
 		return $dispatcher->dispatch($url, $params);
 	}
+
 /**
  * Calls a method on this object with the given parameters. Provides an OO wrapper
  * for call_user_func_array, and improves performance by using straight method calls
@@ -128,6 +135,7 @@ class Object {
 			break;
 		}
 	}
+
 /**
  * Stop execution of the current script
  *
@@ -138,6 +146,7 @@ class Object {
 	function _stop($status = 0) {
 		exit($status);
 	}
+
 /**
  * API for logging events.
  *
@@ -158,6 +167,7 @@ class Object {
 		}
 		return $this->_log->write($type, $msg);
 	}
+
 /**
  * Allows setting of multiple properties of the object in a single line of code.
  *
@@ -175,6 +185,7 @@ class Object {
 			}
 		}
 	}
+
 /**
  * Used to report user friendly errors.
  * If there is a file app/error.php or app/app_error.php this file will be loaded
@@ -203,6 +214,7 @@ class Object {
 		}
 		return $error;
 	}
+
 /**
  * Checks for a persistent class file, if found file is opened and true returned
  * If file is not found a file is created and false returned
@@ -233,6 +245,7 @@ class Object {
 			return true;
 		}
 	}
+
 /**
  * You should choose a unique name for the persistent file
  *
@@ -254,6 +267,7 @@ class Object {
 		}
 		cache($file, $data, $duration);
 	}
+
 /**
  * Open the persistent class file for reading
  * Used by Object::_persist()
diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php
index a3b170a08..0699c63eb 100644
--- a/cake/libs/overloadable.php
+++ b/cake/libs/overloadable.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Overload abstraction interface.  Merges differences between PHP4 and 5.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Overloadable class selector
  *
diff --git a/cake/libs/overloadable_php4.php b/cake/libs/overloadable_php4.php
index b60411c53..c9753ac90 100644
--- a/cake/libs/overloadable_php4.php
+++ b/cake/libs/overloadable_php4.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Overload abstraction interface.  Merges differences between PHP4 and 5.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Overloadable class selector
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.libs
  */
 class Overloadable extends Object {
+
 /**
  * Constructor.
  *
@@ -40,6 +43,7 @@ class Overloadable extends Object {
 		$this->overload();
 		parent::__construct();
 	}
+
 /**
  * Overload implementation.
  *
@@ -89,6 +93,7 @@ Overloadable::overload('Overloadable');
  * @subpackage    cake.cake.libs
  */
 class Overloadable2 extends Object {
+
 /**
  * Constructor
  *
@@ -98,6 +103,7 @@ class Overloadable2 extends Object {
 		$this->overload();
 		parent::__construct();
 	}
+
 /**
  * Overload implementation.
  *
@@ -118,6 +124,7 @@ class Overloadable2 extends Object {
 			}
 		}
 	}
+
 /**
  * Magic method handler.
  *
@@ -134,6 +141,7 @@ class Overloadable2 extends Object {
 		$return = $this->call__($method, $params);
 		return true;
 	}
+
 /**
  * Getter.
  *
@@ -146,6 +154,7 @@ class Overloadable2 extends Object {
 		$value = $this->get__($name);
 		return true;
 	}
+
 /**
  * Setter.
  *
diff --git a/cake/libs/overloadable_php5.php b/cake/libs/overloadable_php5.php
index 906b6b378..c167961f4 100644
--- a/cake/libs/overloadable_php5.php
+++ b/cake/libs/overloadable_php5.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Overload abstraction interface.  Merges differences between PHP4 and 5.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Overloadable class selector
  *
@@ -31,12 +33,14 @@
  * @subpackage    cake.cake.libs
  */
 class Overloadable extends Object {
+
 /**
  * Overload implementation. No need for implementation in PHP5.
  *
  * @access public
  */
 	function overload() { }
+
 /**
  * Magic method handler.
  *
@@ -61,12 +65,14 @@ class Overloadable extends Object {
  * @package       cake
  */
 class Overloadable2 extends Object {
+
 /**
  * Overload implementation. No need for implementation in PHP5.
  *
  * @access public
  */
 	function overload() { }
+
 /**
  * Magic method handler.
  *
@@ -81,6 +87,7 @@ class Overloadable2 extends Object {
 		}
 		return $this->call__($method, $params);
 	}
+
 /**
  * Getter.
  *
@@ -92,6 +99,7 @@ class Overloadable2 extends Object {
 	function __get($name) {
 		return $this->get__($name);
 	}
+
 /**
  * Setter.
  *
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 868e553cb..9f0ae7b63 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Parses the request URL into controller, action, and parameters.
  *
@@ -24,13 +25,15 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  *
  */
 if (!class_exists('Object')) {
-	App::import('Core', 'Object');
+	require LIBS . 'object.php';
 }
+
 /**
  * Parses the request URL into controller, action, and parameters.
  *
@@ -38,6 +41,7 @@ if (!class_exists('Object')) {
  * @subpackage    cake.cake.libs
  */
 class Router extends Object {
+
 /**
  * Array of routes
  *
@@ -45,6 +49,7 @@ class Router extends Object {
  * @access public
  */
 	var $routes = array();
+
 /**
  * Caches admin setting from Configure class
  *
@@ -52,6 +57,7 @@ class Router extends Object {
  * @access private
  */
 	var $__admin = null;
+
 /**
  * List of action prefixes used in connected routes
  *
@@ -59,6 +65,7 @@ class Router extends Object {
  * @access private
  */
 	var $__prefixes = array();
+
 /**
  * Directive for Router to parse out file extensions for mapping to Content-types.
  *
@@ -66,6 +73,7 @@ class Router extends Object {
  * @access private
  */
 	var $__parseExtensions = false;
+
 /**
  * List of valid extensions to parse from a URL.  If null, any extension is allowed.
  *
@@ -73,6 +81,7 @@ class Router extends Object {
  * @access private
  */
 	var $__validExtensions = null;
+
 /**
  * 'Constant' regular expression definitions for named route elements
  *
@@ -87,6 +96,7 @@ class Router extends Object {
 		'ID'		=> '[0-9]+',
 		'UUID'		=> '[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}'
 	);
+
 /**
  * Stores all information necessary to decide what named arguments are parsed under what conditions.
  *
@@ -99,6 +109,7 @@ class Router extends Object {
 		'separator' => ':',
 		'rules' => false,
 	);
+
 /**
  * The route matching the URL of the current request
  *
@@ -106,6 +117,7 @@ class Router extends Object {
  * @access private
  */
 	var $__currentRoute = array();
+
 /**
  * HTTP header shortcut map.  Used for evaluating header-based route expressions.
  *
@@ -117,6 +129,7 @@ class Router extends Object {
 		'method'	=> 'request_method',
 		'server'	=> 'server_name'
 	);
+
 /**
  * Default HTTP request method => controller action map.
  *
@@ -131,6 +144,7 @@ class Router extends Object {
 		array('action' => 'delete',	'method' => 'DELETE',	'id' => true),
 		array('action' => 'edit',	'method' => 'POST', 	'id' => true)
 	);
+
 /**
  * List of resource-mapped controllers
  *
@@ -138,6 +152,7 @@ class Router extends Object {
  * @access private
  */
 	var $__resourceMapped = array();
+
 /**
  * Maintains the parameter stack for the current request
  *
@@ -145,6 +160,7 @@ class Router extends Object {
  * @access private
  */
 	var $__params = array();
+
 /**
  * Maintains the path stack for the current request
  *
@@ -152,6 +168,7 @@ class Router extends Object {
  * @access private
  */
 	var $__paths = array();
+
 /**
  * Keeps Router state to determine if default routes have already been connected
  *
@@ -159,6 +176,7 @@ class Router extends Object {
  * @access private
  */
 	var $__defaultsMapped = false;
+
 /**
  * Gets a reference to the Router object instance
  *
@@ -175,6 +193,7 @@ class Router extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Gets the named route elements for use in app/config/routes.php
  *
@@ -187,6 +206,7 @@ class Router extends Object {
 		$_this =& Router::getInstance();
 		return $_this->__named;
 	}
+
 /**
  * Returns this object's routes array. Returns false if there are no routes available.
  *
@@ -214,6 +234,7 @@ class Router extends Object {
 		$_this->routes[] = array($route, $default, $params);
 		return $_this->routes;
 	}
+
 /**
  * Specifies what named parameters CakePHP should be parsing. The most common setups are:
  *
@@ -273,6 +294,7 @@ class Router extends Object {
 		$_this->named['greedy'] = $options['greedy'];
 		return $_this->named;
 	}
+
 /**
  * Creates REST resource routes for the given controller(s)
  *
@@ -308,12 +330,13 @@ class Router extends Object {
 			$_this->__resourceMapped[] = $urlName;
 		}
 	}
+
 /**
  * Builds a route regular expression
  *
- * @param string $route			An empty string, or a route string "/"
- * @param array $default		NULL or an array describing the default route
- * @param array $params			An array matching the named elements in the route to regular expressions which that element should match.
+ * @param string $route An empty string, or a route string "/"
+ * @param array $default NULL or an array describing the default route
+ * @param array $params An array matching the named elements in the route to regular expressions which that element should match.
  * @return array
  * @see routes
  * @access public
@@ -380,6 +403,7 @@ class Router extends Object {
 		}
 		return array('#^' . join('', $parsed) . '[\/]*$#', $names);
 	}
+
 /**
  * Returns the list of prefixes used in connected routes
  *
@@ -391,6 +415,7 @@ class Router extends Object {
 		$_this =& Router::getInstance();
 		return $_this->__prefixes;
 	}
+
 /**
  * Parses given URL and returns an array of controllers, action and parameters
  * taken from that URL.
@@ -460,8 +485,6 @@ class Router extends Object {
 
 					if (isset($names[$key])) {
 						$out[$names[$key]] = $_this->stripEscape($found);
-					} elseif (isset($names[$key]) && empty($names[$key]) && empty($out[$names[$key]])) {
-						break;
 					} else {
 						$argOptions['context'] = array('action' => $out['action'], 'controller' => $out['controller']);
 						extract($_this->getArgs($found, $argOptions));
@@ -486,6 +509,7 @@ class Router extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Checks to see if the given URL matches the given route
  *
@@ -524,6 +548,7 @@ class Router extends Object {
 		}
 		return $r;
 	}
+
 /**
  * Compiles a route by numeric key and returns the compiled expression, replacing
  * the existing uncompiled route.  Do not call statically.
@@ -535,10 +560,7 @@ class Router extends Object {
 	function compile($i) {
 		$route = $this->routes[$i];
 
-		if (!list($pattern, $names) = $this->writeRoute($route[0], $route[1], $route[2])) {
-			unset($this->routes[$i]);
-			return array();
-		}
+		list($pattern, $names) = $this->writeRoute($route[0], $route[1], $route[2]);
 		$this->routes[$i] = array(
 			$route[0], $pattern, $names,
 			array_merge(array('plugin' => null, 'controller' => null), (array)$route[1]),
@@ -546,6 +568,7 @@ class Router extends Object {
 		);
 		return $this->routes[$i];
 	}
+
 /**
  * Parses a file extension out of a URL, if Router::parseExtensions() is enabled.
  *
@@ -577,6 +600,7 @@ class Router extends Object {
 		}
 		return compact('ext', 'url');
 	}
+
 /**
  * Connects the default, built-in routes, including admin routes, and (deprecated) web services
  * routes.
@@ -619,6 +643,7 @@ class Router extends Object {
 		}
 		$this->__defaultsMapped = true;
 	}
+
 /**
  * Takes parameter and path information back from the Dispatcher
  *
@@ -642,6 +667,7 @@ class Router extends Object {
 			}
 		}
 	}
+
 /**
  * Gets parameter information
  *
@@ -660,6 +686,7 @@ class Router extends Object {
 		}
 		return array();
 	}
+
 /**
  * Gets URL parameter by name
  *
@@ -676,6 +703,7 @@ class Router extends Object {
 		}
 		return null;
 	}
+
 /**
  * Gets path information
  *
@@ -694,6 +722,7 @@ class Router extends Object {
 		}
 		return $_this->__paths[0];
 	}
+
 /**
  * Reloads default Router settings
  *
@@ -708,6 +737,7 @@ class Router extends Object {
 		}
 		$_this->__admin = Configure::read('Routing.admin');
 	}
+
 /**
  * Promote a route (by default, the last one added) to the beginning of the list
  *
@@ -730,6 +760,7 @@ class Router extends Object {
 		array_unshift($_this->routes, $route);
 		return true;
 	}
+
 /**
  * Finds URL for specified action.
  *
@@ -934,6 +965,7 @@ class Router extends Object {
 
 		return $output . $extension . $_this->queryString($q, array(), $escape) . $frag;
 	}
+
 /**
  * Maps a URL array onto a route and returns the string result, or false if no match
  *
@@ -1038,6 +1070,7 @@ class Router extends Object {
 		}
 		return Router::__mapRoute($route, array_merge($filled, compact('pass', 'named', 'prefix')));
 	}
+
 /**
  * Merges URL parameters into a route string
  *
@@ -1082,7 +1115,7 @@ class Router extends Object {
 			if (isset($params[$key])) {
 				$string = $params[$key];
 				unset($params[$key]);
-			} else {
+			} elseif (strpos($out, $key) != strlen($out) - strlen($key)) {
 				$key = $key . '/';
 			}
 			$out = str_replace(':' . $key, $string, $out);
@@ -1094,6 +1127,7 @@ class Router extends Object {
 
 		return $out;
 	}
+
 /**
  * Takes an array of URL parameters and separates the ones that can be used as named arguments
  *
@@ -1119,6 +1153,7 @@ class Router extends Object {
 		}
 		return array($named, $params);
 	}
+
 /**
  * Return true if a given named $param's $val matches a given $rule depending on $context. Currently implemented
  * rule types are controller, action and match that can be combined with each other.
@@ -1152,6 +1187,7 @@ class Router extends Object {
 		$valueMatches = !isset($rule['match']) || preg_match(sprintf('/%s/', $rule['match']), $val);
 		return $valueMatches;
 	}
+
 /**
  * Generates a well-formed querystring from $q
  *
@@ -1184,6 +1220,7 @@ class Router extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Normalizes a URL for purposes of comparison
  *
@@ -1200,7 +1237,7 @@ class Router extends Object {
 		$paths = Router::getPaths();
 
 		if (!empty($paths['base']) && stristr($url, $paths['base'])) {
-			$url = preg_replace('/' . preg_quote($paths['base'], '/') . '/', '', $url, 1);
+			$url = preg_replace('/^' . preg_quote($paths['base'], '/') . '/', '', $url, 1);
 		}
 		$url = '/' . $url;
 
@@ -1214,6 +1251,7 @@ class Router extends Object {
 		}
 		return $url;
 	}
+
 /**
  * Returns the route matching the current request URL.
  *
@@ -1225,6 +1263,7 @@ class Router extends Object {
 		$_this =& Router::getInstance();
 		return $_this->__currentRoute[0];
 	}
+
 /**
  * Returns the route matching the current request (useful for requestAction traces)
  *
@@ -1236,6 +1275,7 @@ class Router extends Object {
 		$_this =& Router::getInstance();
 		return $_this->__currentRoute[count($_this->__currentRoute) - 1];
 	}
+
 /**
  * Removes the plugin name from the base URL.
  *
@@ -1245,7 +1285,7 @@ class Router extends Object {
  * @access public
  * @static
  */
-	function stripPlugin($base, $plugin) {
+	function stripPlugin($base, $plugin = null) {
 		if ($plugin != null) {
 			$base = preg_replace('/(?:' . $plugin . ')/', '', $base);
 			$base = str_replace('//', '', $base);
@@ -1274,9 +1314,9 @@ class Router extends Object {
 				return $param;
 			}
 
-			$return = preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $param);
-			return $return;
+			return preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $param);
 		}
+
 		foreach ($param as $key => $value) {
 			if (is_string($value)) {
 				$return[$key] = preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $value);
@@ -1288,6 +1328,7 @@ class Router extends Object {
 		}
 		return $return;
 	}
+
 /**
  * Instructs the router to parse out file extensions from the URL. For example,
  * http://example.com/posts.rss would yield an file extension of "rss".
@@ -1311,6 +1352,7 @@ class Router extends Object {
 			$_this->__validExtensions = func_get_args();
 		}
 	}
+
 /**
  * Takes an passed params and converts it to args
  *
@@ -1349,7 +1391,9 @@ class Router extends Object {
 				continue;
 			}
 			$param = $_this->stripEscape($param);
-			if ((!isset($options['named']) || !empty($options['named'])) && strpos($param, $_this->named['separator']) !== false) {
+
+			$separatorIsPresent = strpos($param, $_this->named['separator']) !== false;
+			if ((!isset($options['named']) || !empty($options['named'])) && $separatorIsPresent) {
 				list($key, $val) = explode($_this->named['separator'], $param, 2);
 				$hasRule = isset($rules[$key]);
 				$passIt = (!$hasRule && !$greedy) || ($hasRule && !Router::matchNamed($key, $val, $rules[$key], $context));
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 30d424faf..c72681bd1 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Washes strings from unwanted noise.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Data Sanitization.
  *
@@ -34,6 +36,7 @@
  * @subpackage    cake.cake.libs
  */
 class Sanitize {
+
 /**
  * Removes any non-alphanumeric characters.
  *
@@ -60,6 +63,7 @@ class Sanitize {
 		}
 		return $cleaned;
 	}
+
 /**
  * Makes a string SQL-safe.
  *
@@ -78,6 +82,7 @@ class Sanitize {
 		$string = substr($string, 0, -1);
 		return $string;
 	}
+
 /**
  * Returns given string safe for display as HTML. Renders entities.
  *
@@ -97,6 +102,7 @@ class Sanitize {
 		}
 		return $string;
 	}
+
 /**
  * Strips extra whitespace from output
  *
@@ -109,6 +115,7 @@ class Sanitize {
 		$r = preg_replace('/[\n\r\t]+/', '', $str);
 		return preg_replace('/\s{2,}/', ' ', $r);
 	}
+
 /**
  * Strips image tags from output
  *
@@ -123,6 +130,7 @@ class Sanitize {
 		$str = preg_replace('/<img[^>]*>/i', '', $str);
 		return $str;
 	}
+
 /**
  * Strips scripts and stylesheets from output
  *
@@ -134,6 +142,7 @@ class Sanitize {
 	function stripScripts($str) {
 		return preg_replace('/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|<img[^>]*>|style="[^"]*")|<script[^>]*>.*?<\/script>|<style[^>]*>.*?<\/style>|<!--.*?-->/i', '', $str);
 	}
+
 /**
  * Strips extra whitespace, images, scripts and stylesheets from output
  *
@@ -147,6 +156,7 @@ class Sanitize {
 		$str = Sanitize::stripScripts($str);
 		return $str;
 	}
+
 /**
  * Strips the specified tags from output. First parameter is string from
  * where to remove tags. All subsequent parameters are tags.
@@ -167,6 +177,7 @@ class Sanitize {
 		}
 		return $str;
 	}
+
 /**
  * Sanitizes given array or value for safe input. Use the options to specify
  * the connection to use, and what filters should be applied (with a boolean
@@ -234,6 +245,7 @@ class Sanitize {
 			return $data;
 		}
 	}
+
 /**
  * Formats column data from definition in DBO's $columns array
  *
@@ -305,4 +317,4 @@ class Sanitize {
 		}
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/security.php b/cake/libs/security.php
index 15ec7c1bb..72513fcd8 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs
  */
 class Security extends Object {
+
 /**
  * Default hash method
  *
@@ -40,6 +43,7 @@ class Security extends Object {
  * @access public
  */
 	var $hashType = null;
+
 /**
   * Singleton implementation to get object instance.
   *
@@ -54,6 +58,7 @@ class Security extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
   * Get allowed minutes of inactivity based on security level.
   *
@@ -76,6 +81,7 @@ class Security extends Object {
 				break;
 		}
 	}
+
 /**
   * Generate authorization hash.
   *
@@ -89,6 +95,7 @@ class Security extends Object {
 		}
 		return Security::hash(String::uuid());
 	}
+
 /**
  * Validate authorization hash.
  *
@@ -101,6 +108,7 @@ class Security extends Object {
 	function validateAuthKey($authKey) {
 		return true;
 	}
+
 /**
  * Create a hash from string using given method.
  * Fallback on next available method.
@@ -146,6 +154,7 @@ class Security extends Object {
 		}
 		return md5($string);
 	}
+
 /**
  * Sets the default hash method for the Security object.  This affects all objects using
  * Security::hash().
@@ -160,6 +169,7 @@ class Security extends Object {
 		$_this =& Security::getInstance();
 		$_this->hashType = $hash;
 	}
+
 /**
  * Encrypts/Decrypts a text using the given key.
  *
diff --git a/cake/libs/set.php b/cake/libs/set.php
index d48adc7de..0d103986e 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Library of array functions for Cake.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Class used for manipulation of arrays.
  *
@@ -31,11 +33,13 @@
  * @subpackage    cake.cake.libs
  */
 class Set extends Object {
+
 /**
  * Deprecated
  *
  */
 	var $value = array();
+
 /**
  * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
  * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
@@ -66,6 +70,7 @@ class Set extends Object {
 		}
 		return $r;
 	}
+
 /**
  * Filters empty elements out of a route array, excluding '0'.
  *
@@ -85,6 +90,7 @@ class Set extends Object {
 		}
 		return false;
 	}
+
 /**
  * Pushes the differences in $array2 onto the end of $array
  *
@@ -111,6 +117,7 @@ class Set extends Object {
 		}
 		return $array;
 	}
+
 /**
  * Maps the contents of the Set object to an object hierarchy.
  * Maintains numeric keys as arrays of objects
@@ -224,6 +231,7 @@ class Set extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Checks to see if all the values in the array are numeric
  *
@@ -253,6 +261,7 @@ class Set extends Object {
 		}
 		return $numeric;
 	}
+
 /**
  * Return a value from an array list if the key exists.
  *
@@ -282,6 +291,7 @@ class Set extends Object {
 		}
 		return $return;
 	}
+
 /**
  * Returns a series of values extracted from an array, formatted in a format string.
  *
@@ -339,6 +349,7 @@ class Set extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Implements partial support for XPath 2.0. If $path is an array or $data is empty it the call is delegated to Set::classicExtract.
  *
@@ -503,6 +514,7 @@ class Set extends Object {
 		}
 		return $r;
 	}
+
 /**
  * This function can be used to see if a single item or a given xpath match certain conditions.
  *
@@ -575,6 +587,7 @@ class Set extends Object {
 		}
 		return true;
 	}
+
 /**
  * Gets a value from an array or object that is contained in a given path using an array path syntax, i.e.:
  * "{n}.Person.{[a-z]+}" - Where "{n}" represents a numeric key, "Person" represents a string literal,
@@ -665,6 +678,7 @@ class Set extends Object {
 		}
 		return $data;
 	}
+
 /**
  * Inserts $data into an array as defined by $path.
  *
@@ -696,6 +710,7 @@ class Set extends Object {
 		}
 		return $list;
 	}
+
 /**
  * Removes an element from a Set or array as defined by $path.
  *
@@ -729,6 +744,7 @@ class Set extends Object {
 		}
 		return $list;
 	}
+
 /**
  * Checks if a particular path is set in an array
  *
@@ -761,6 +777,7 @@ class Set extends Object {
 		}
 		return true;
 	}
+
 /**
  * Computes the difference between a Set and an array, two Sets, or two arrays
  *
@@ -797,6 +814,7 @@ class Set extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Determines if two Sets or arrays are equal
  *
@@ -809,6 +827,7 @@ class Set extends Object {
 	function isEqual($val1, $val2 = null) {
 		return ($val1 == $val2);
 	}
+
 /**
  * Determines if one Set or array contains the exact keys and values of another.
  *
@@ -834,6 +853,7 @@ class Set extends Object {
 		}
 		return true;
 	}
+
 /**
  * Counts the dimensions of an array. If $all is set to false (which is the default) it will
  * only consider the dimension of the first element in the array.
@@ -863,6 +883,7 @@ class Set extends Object {
 		}
 		return $return;
 	}
+
 /**
  * Normalizes a string or array list.
  *
@@ -912,6 +933,7 @@ class Set extends Object {
 		}
 		return $list;
 	}
+
 /**
  * Creates an associative array using a $path1 as the path to build its keys, and optionally
  * $path2 as path to get the values. If $path2 is not specified, all values will be initialized
@@ -975,6 +997,7 @@ class Set extends Object {
 
 		return array_combine($keys, $vals);
 	}
+
 /**
  * Converts an object into an array. If $object is no object, reverse
  * will return the same value.
@@ -1020,6 +1043,7 @@ class Set extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Collapses a multi-dimensional array into a single dimension, using a delimited array path for
  * each array element's key, i.e. array(array('Foo' => array('Bar' => 'Far'))) becomes
@@ -1055,6 +1079,7 @@ class Set extends Object {
 		}
 		return $result;
 	}
+
 /**
  * Flattens an array for sorting
  *
@@ -1078,6 +1103,7 @@ class Set extends Object {
 		}
 		return $stack;
 	}
+
 /**
  * Sorts an array by any value, determined by a Set-compatible path
  *
@@ -1107,6 +1133,7 @@ class Set extends Object {
 		}
 		return $sorted;
 	}
+
 /**
  * Deprecated, Set class should be called statically
  *
diff --git a/cake/libs/string.php b/cake/libs/string.php
index 6ea6bfd55..a266da1b1 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -18,6 +18,7 @@
  * @since         CakePHP(tm) v 1.2.0.5551
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * String handling methods.
  *
@@ -26,6 +27,7 @@
  * @subpackage    cake.cake.libs
  */
 class String extends Object {
+
 /**
  * Gets a reference to the String object instance
  *
@@ -41,6 +43,7 @@ class String extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Generate a random UUID
  *
@@ -115,6 +118,7 @@ class String extends Object {
 
 		return $uuid;
 	}
+
 /**
  * Tokenizes a string using $separator, ignoring any instance of $separator that appears between
  * $leftBound and $rightBound
@@ -192,6 +196,7 @@ class String extends Object {
 		}
 		return $data;
 	}
+
 /**
  * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array
  * corresponds to a variable placeholder name in $str.
@@ -266,6 +271,7 @@ class String extends Object {
 		}
 		return String::cleanInsert($str, $options);
 	}
+
 /**
  * Cleans up a Set::insert formated string with given $options depending on the 'clean' key in
  * $options. The default method used is text but html is also available. The goal of this function
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index be0d20c2a..a33e2d9a8 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Validation Class.  Used for validation of model data
  *
@@ -24,25 +25,31 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Deprecated
  */
+
 /**
  * Not empty.
  */
 	define('VALID_NOT_EMPTY', '/.+/');
+
 /**
  * Numbers [0-9] only.
  */
 	define('VALID_NUMBER', '/^[-+]?\\b[0-9]*\\.?[0-9]+\\b$/');
+
 /**
  * A valid email address.
  */
 	define('VALID_EMAIL', "/^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[a-z]{2,4}|museum|travel)$/i");
+
 /**
  * A valid year (1000-2999).
  */
 	define('VALID_YEAR', '/^[12][0-9]{3}$/');
+
 /**
  * Offers different validation methods.
  *
@@ -53,6 +60,7 @@
  * @since         CakePHP v 1.2.0.3830
  */
 class Validation extends Object {
+
 /**
  * Set the the value of methods $check param.
  *
@@ -60,6 +68,7 @@ class Validation extends Object {
  * @access public
  */
 	var $check = null;
+
 /**
  * Set to a valid regular expression in the class methods.
  * Can be set from $regex param also
@@ -68,6 +77,7 @@ class Validation extends Object {
  * @access public
  */
 	var $regex = null;
+
 /**
  * Some complex patterns needed in multiple places
  *
@@ -78,6 +88,7 @@ class Validation extends Object {
 		'ip' => '(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])',
 		'hostname' => '(?:[a-z0-9][-a-z0-9]*\.)*(?:[a-z0-9][-a-z0-9]{0,62})\.(?:(?:[a-z]{2}\.)?[a-z]{2,4}|museum|travel)'
 	);
+
 /**
  * Some class methods use a country to determine proper validation.
  * This can be passed to methods in the $country param
@@ -86,6 +97,7 @@ class Validation extends Object {
  * @access public
  */
 	var $country = null;
+
 /**
  * Some class methods use a deeper validation when set to true
  *
@@ -93,6 +105,7 @@ class Validation extends Object {
  * @access public
  */
 	var $deep = null;
+
 /**
  * Some class methods use the $type param to determine which validation to perfom in the method
  *
@@ -100,6 +113,7 @@ class Validation extends Object {
  * @access public
  */
 	var $type = null;
+
 /**
  * Holds an array of errors messages set in this class.
  * These are used for debugging purposes
@@ -108,6 +122,7 @@ class Validation extends Object {
  * @access public
  */
 	var $errors = array();
+
 /**
  * Gets a reference to the Validation object instance
  *
@@ -123,6 +138,7 @@ class Validation extends Object {
 		}
 		return $instance[0];
 	}
+
 /**
  * Checks that a string contains something other than whitespace
  *
@@ -150,6 +166,7 @@ class Validation extends Object {
 		$_this->regex = '/[^\s]+/m';
 		return $_this->_check();
 	}
+
 /**
  * Checks that a string contains only integer or letters
  *
@@ -177,6 +194,7 @@ class Validation extends Object {
 		$_this->regex = '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/mu';
 		return $_this->_check();
 	}
+
 /**
  * Checks that a string length is within s specified range.
  * Spaces are included in the character count.
@@ -192,6 +210,7 @@ class Validation extends Object {
 		$length = strlen($check);
 		return ($length >= $min && $length <= $max);
 	}
+
 /**
  * Returns true if field is left blank -OR- only whitespace characters are present in it's value
  * Whitespace characters include Space, Tab, Carriage Return, Newline
@@ -215,6 +234,7 @@ class Validation extends Object {
 		$_this->regex = '/[^\\s]/';
 		return !$_this->_check();
 	}
+
 /**
  * Validation of credit card numbers.
  * Returns true if $check is in the proper credit card format.
@@ -290,6 +310,7 @@ class Validation extends Object {
 			}
 		}
 	}
+
 /**
  * Used to compare 2 numeric values.
  *
@@ -352,6 +373,7 @@ class Validation extends Object {
 		}
 		return false;
 	}
+
 /**
  * Used when a custom regular expression is needed.
  *
@@ -375,6 +397,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Date validation, determines if the string passed is a valid date.
  * keys that expect full month, day and year will validate leap years
@@ -476,6 +499,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Validates for an email address.
  *
@@ -511,6 +535,7 @@ class Validation extends Object {
 		}
 		return false;
 	}
+
 /**
  * Check that value is exactly $comparedTo.
  *
@@ -522,6 +547,7 @@ class Validation extends Object {
 	function equalTo($check, $comparedTo) {
 		return ($check === $comparedTo);
 	}
+
 /**
  * Check that value has a valid file extension.
  *
@@ -542,6 +568,7 @@ class Validation extends Object {
 		}
 		return false;
 	}
+
 /**
  * Check that value is a file name
  *
@@ -561,6 +588,7 @@ class Validation extends Object {
 		//
 		// return preg_match('/[\w| |_]+\.[\w]+/', $check);
 	}
+
 /**
  * Validation of an IPv4 address.
  *
@@ -574,6 +602,7 @@ class Validation extends Object {
 		$_this->regex = '/^' . $_this->__pattern['ip'] . '$/';
 		return $_this->_check();
 	}
+
 /**
  * Checks whether the length of a string is greater or equal to a minimal length.
  *
@@ -586,6 +615,7 @@ class Validation extends Object {
 		$length = strlen($check);
 		return ($length >= $min);
 	}
+
 /**
  * Checks whether the length of a string is smaller or equal to a maximal length..
  *
@@ -598,6 +628,7 @@ class Validation extends Object {
 		$length = strlen($check);
 		return ($length <= $max);
 	}
+
 /**
  * Checks that a value is a monetary amount.
  *
@@ -617,6 +648,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Validate a multiple select.
  *
@@ -651,6 +683,7 @@ class Validation extends Object {
 		}
 		return true;
 	}
+
 /**
  * Checks if a value is numeric.
  *
@@ -661,6 +694,7 @@ class Validation extends Object {
 	function numeric($check) {
 		return is_numeric($check);
 	}
+
 /**
  * Check that a value is a valid phone number.
  *
@@ -690,6 +724,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Checks that a given value is a valid postal code.
  *
@@ -731,6 +766,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Validate that a number is in specified range.
  * if $lower and $upper are not set, will return true if
@@ -751,6 +787,7 @@ class Validation extends Object {
 		}
 		return is_finite($check);
 	}
+
 /**
  * Checks that a value is a valid Social Security Number.
  *
@@ -785,6 +822,7 @@ class Validation extends Object {
 		}
 		return $_this->_check();
 	}
+
 /**
  * Checks that a value is a valid URL according to http://www.w3.org/Addressing/URL/url-spec.txt
  *
@@ -813,6 +851,7 @@ class Validation extends Object {
 			'(?:#' . $validChars . '*)?$/i';
 		return $_this->_check();
 	}
+
 /**
  * Checks if a value is in a given list.
  *
@@ -824,6 +863,7 @@ class Validation extends Object {
 	function inList($check, $list) {
 		return in_array($check, $list);
 	}
+
 /**
  * Runs an user-defined validation.
  *
@@ -837,6 +877,7 @@ class Validation extends Object {
 	function userDefined($check, $object, $method, $args = null) {
 		return call_user_func_array(array(&$object, $method), array($check, $args));
 	}
+
 /**
  * Runs a regular expression match.
  *
@@ -853,6 +894,7 @@ class Validation extends Object {
 			return false;
 		}
 	}
+
 /**
  * Get the values to use when value sent to validation method is
  * an array.
@@ -881,6 +923,7 @@ class Validation extends Object {
 			$_this->type = $type;
 		}
 	}
+
 /**
  * Luhn algorithm
  *
@@ -910,6 +953,7 @@ class Validation extends Object {
 
 		return ($sum % 10 == 0);
 	}
+
 /**
  * Reset internal variables for another validation run.
  *
@@ -926,4 +970,4 @@ class Validation extends Object {
 		$this->errors = array();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/view/elements/dump.ctp b/cake/libs/view/elements/dump.ctp
index 54c59acf6..f6e311ffc 100644
--- a/cake/libs/view/elements/dump.ctp
+++ b/cake/libs/view/elements/dump.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp
index 6e51c0fd4..b6afa3e66 100644
--- a/cake/libs/view/elements/email/html/default.ctp
+++ b/cake/libs/view/elements/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp
index cbb261c64..bd5f1aca6 100644
--- a/cake/libs/view/elements/email/text/default.ctp
+++ b/cake/libs/view/elements/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp
index b849db72f..eea79dfee 100644
--- a/cake/libs/view/errors/error404.ctp
+++ b/cake/libs/view/errors/error404.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp
index 857ac206c..787e8e089 100644
--- a/cake/libs/view/errors/missing_action.ctp
+++ b/cake/libs/view/errors/missing_action.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,11 +26,11 @@
 <h2><?php echo sprintf(__('Missing Method in %s', true), $controller);?></h2>
 <p class="error">
 	<strong><?php __('Error') ?>: </strong>
-	<?php echo sprintf(__('The action %1$s is not defined in controller %2$s', true), "<em>".$action."</em>", "<em>".$controller."</em>");?>
+	<?php echo sprintf(__('The action %1$s is not defined in controller %2$s', true), "<em>" . $action . "</em>", "<em>" . $controller . "</em>");?>
 </p>
 <p class="error">
 	<strong><?php __('Error') ?>: </strong>
-	<?php echo sprintf(__('Create %1$s%2$s in file: %3$s.', true), "<em>".$controller."::</em>", "<em>".$action."()</em>", APP_DIR.DS."controllers".DS.Inflector::underscore($controller).".php");?>
+	<?php echo sprintf(__('Create %1$s%2$s in file: %3$s.', true), "<em>" . $controller . "::</em>", "<em>" . $action . "()</em>", APP_DIR . DS . "controllers" . DS . Inflector::underscore($controller) . ".php");?>
 </p>
 <pre>
 &lt;?php
@@ -47,5 +48,5 @@ class <?php echo $controller;?> extends AppController {
 </pre>
 <p class="notice">
 	<strong><?php __('Notice') ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s.', true), APP_DIR.DS."views".DS."errors".DS."missing_action.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_action.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp
index 49af6e3a3..e83b4f75b 100644
--- a/cake/libs/view/errors/missing_component_class.ctp
+++ b/cake/libs/view/errors/missing_component_class.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,11 +26,11 @@
 <h2><?php __('Missing Component Class'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Component class %1$s in %2$s was not found.', true), "<em>". $component ."Component</em>", "<em>". $controller ."Controller</em>");?>
+	<?php echo sprintf(__('Component class %1$s in %2$s was not found.', true), "<em>" . $component . "Component</em>", "<em>" . $controller . "Controller</em>");?>
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>". $component ."Component</em>", APP_DIR.DS."controllers".DS."components".DS.$file);?>
+	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>" . $component . "Component</em>", APP_DIR . DS . "controllers" . DS . "components" . DS . $file);?>
 </p>
 <pre>
 &lt;?php
@@ -40,5 +41,5 @@ class <?php echo $component;?>Component extends Object {<br />
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_component_class.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_component_class.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp
index e4eb675b9..ac8e4fce4 100644
--- a/cake/libs/view/errors/missing_component_file.ctp
+++ b/cake/libs/view/errors/missing_component_file.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -29,7 +30,7 @@
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>". $component ."Component</em>", APP_DIR.DS."controllers".DS."components".DS.$file);?>
+	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>" . $component . "Component</em>", APP_DIR . DS . "controllers" . DS . "components" . DS . $file);?>
 </p>
 <pre>
 &lt;?php
@@ -40,5 +41,5 @@ class <?php echo $component;?>Component extends Object {<br />
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_component_file.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_component_file.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp
index 1a1c1ad4a..4f419e0bd 100644
--- a/cake/libs/view/errors/missing_connection.ctp
+++ b/cake/libs/view/errors/missing_connection.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp
index 829cc53ca..bb837a833 100644
--- a/cake/libs/view/errors/missing_controller.ctp
+++ b/cake/libs/view/errors/missing_controller.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,11 +26,11 @@
 <h2><?php __('Missing Controller'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('%s could not be found.', true), "<em>".$controller."</em>");?>
+	<?php echo sprintf(__('%s could not be found.', true), "<em>" . $controller . "</em>");?>
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class %s below in file: %s', true), "<em>".$controller."</em>", APP_DIR.DS."controllers".DS.Inflector::underscore($controller).".php");?>
+	<?php echo sprintf(__('Create the class %s below in file: %s', true), "<em>" . $controller . "</em>", APP_DIR . DS . "controllers" . DS . Inflector::underscore($controller) . ".php");?>
 </p>
 <pre>
 &lt;?php
@@ -41,5 +42,5 @@ class <?php echo $controller;?> extends AppController {
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_controller.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_controller.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp
index d94d1ab1d..17cb1b2df 100644
--- a/cake/libs/view/errors/missing_helper_class.ctp
+++ b/cake/libs/view/errors/missing_helper_class.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -29,7 +30,7 @@
 </p>
 <p  class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR.DS."views".DS."helpers".DS.$file);?>
+	<?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . "views" . DS . "helpers" . DS . $file);?>
 </p>
 <pre>
 &lt;?php
@@ -40,5 +41,5 @@ class <?php echo $helperClass;?> extends AppHelper {
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_helper_class.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_helper_class.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp
index 7affb0fd4..34d6d5dc7 100644
--- a/cake/libs/view/errors/missing_helper_file.ctp
+++ b/cake/libs/view/errors/missing_helper_file.ctp
@@ -25,11 +25,11 @@
 <h2><?php __('Missing Helper File'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__("The helper file %s can not be found or does not exist.", true), APP_DIR.DS."views".DS."helpers".DS.$file);?>
+	<?php echo sprintf(__("The helper file %s can not be found or does not exist.", true), APP_DIR . DS . "views" . DS . "helpers" . DS . $file);?>
 </p>
 <p  class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR.DS."views".DS."helpers".DS.$file);?>
+	<?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . "views" . DS . "helpers" . DS . $file);?>
 </p>
 <pre>
 &lt;?php
@@ -40,5 +40,5 @@ class <?php echo $helperClass;?> extends AppHelper {
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_helper_file.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_helper_file.ctp");?>
 </p>
diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp
index c41c59d45..d6660624b 100644
--- a/cake/libs/view/errors/missing_layout.ctp
+++ b/cake/libs/view/errors/missing_layout.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,13 +26,13 @@
 <h2><?php __('Missing Layout'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__("The layout file %s can not be found or does not exist.", true), "<em>". $file ."</em>");?>
+	<?php echo sprintf(__("The layout file %s can not be found or does not exist.", true), "<em>" . $file . "</em>");?>
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Confirm you have created the file: %s', true), "<em>". $file ."</em>");?>
+	<?php echo sprintf(__('Confirm you have created the file: %s', true), "<em>" . $file . "</em>");?>
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_layout.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_layout.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp
index 49cf8f7a4..76fd10498 100644
--- a/cake/libs/view/errors/missing_model.ctp
+++ b/cake/libs/view/errors/missing_model.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -29,7 +30,7 @@
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>". $model . "</em>", APP_DIR.DS."models".DS.Inflector::underscore($model).".php");?>
+	<?php echo sprintf(__('Create the class %s in file: %s', true), "<em>" . $model . "</em>", APP_DIR . DS . "models" . DS . Inflector::underscore($model) . ".php");?>
 </p>
 <pre>
 &lt;?php
@@ -42,5 +43,5 @@ class <?php echo $model;?> extends AppModel {
 </pre>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_model.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_model.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp
index 2477d3207..1f568dfdf 100644
--- a/cake/libs/view/errors/missing_scaffolddb.ctp
+++ b/cake/libs/view/errors/missing_scaffolddb.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -29,9 +30,9 @@
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Confirm you have created the file: %s', true), APP_DIR.DS."config".DS."database.php");?>
+	<?php echo sprintf(__('Confirm you have created the file: %s', true), APP_DIR . DS . "config" . DS . "database.php");?>
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_scaffolddb.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_scaffolddb.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp
index 341897680..88e3666d0 100644
--- a/cake/libs/view/errors/missing_table.ctp
+++ b/cake/libs/view/errors/missing_table.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,9 +26,9 @@
 <h2><?php __('Missing Database Table'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('Database table %1$s for model %2$s was not found.', true),"<em>". $table ."</em>",  "<em>". $model ."</em>");?>
+	<?php echo sprintf(__('Database table %1$s for model %2$s was not found.', true),"<em>" . $table . "</em>",  "<em>" . $model . "</em>");?>
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_table.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_table.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp
index 184573751..676f69253 100644
--- a/cake/libs/view/errors/missing_view.ctp
+++ b/cake/libs/view/errors/missing_view.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,7 +26,7 @@
 <h2><?php __('Missing View'); ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__('The view for %1$s%2$s was not found.', true), "<em>". $controller."Controller::</em>", "<em>". $action ."()</em>");?>
+	<?php echo sprintf(__('The view for %1$s%2$s was not found.', true), "<em>" . $controller . "Controller::</em>", "<em>". $action . "()</em>");?>
 </p>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
@@ -33,5 +34,5 @@
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."missing_view.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "missing_view.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp
index f172c50aa..93d857fa0 100644
--- a/cake/libs/view/errors/private_action.ctp
+++ b/cake/libs/view/errors/private_action.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,9 +26,9 @@
 <h2><?php echo sprintf(__('Private Method in %s', true), $controller);?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo sprintf(__("%s%s cannot be accessed directly.", true), "<em>". $controller ."::</em>",  "<em>". $action ."()</em>");?>
+	<?php echo sprintf(__("%s%s cannot be accessed directly.", true), "<em>" . $controller . "::</em>",  "<em>" . $action . "()</em>");?>
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."private_action.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "private_action.ctp");?>
 </p>
\ No newline at end of file
diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp
index d20843cbd..146aaf438 100644
--- a/cake/libs/view/errors/scaffold_error.ctp
+++ b/cake/libs/view/errors/scaffold_error.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -29,7 +30,7 @@
 </p>
 <p class="notice">
 	<strong><?php __('Notice'); ?>: </strong>
-	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR.DS."views".DS."errors".DS."scaffold_error.ctp");?>
+	<?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . "views" . DS . "errors" . DS . "scaffold_error.ctp");?>
 </p>
 <pre>
 &lt;?php
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 076622c73..fedb9586f 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Backend for helpers.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libs
  */
@@ -38,72 +40,84 @@ App::import('Core', 'Overloadable');
  * @subpackage    cake.cake.libs.view
  */
 class Helper extends Overloadable {
+
 /**
  * List of helpers used by this helper
  *
  * @var array
  */
 	var $helpers = null;
+
 /**
  * Base URL
  *
  * @var string
  */
 	var $base = null;
+
 /**
  * Webroot path
  *
  * @var string
  */
 	var $webroot = null;
+
 /**
  * Theme name
  *
  * @var string
  */
 	var $themeWeb = null;
+
 /**
  * URL to current action.
  *
  * @var string
  */
 	var $here = null;
+
 /**
  * Parameter array.
  *
  * @var array
  */
 	var $params = array();
+
 /**
  * Current action.
  *
  * @var string
  */
 	var $action = null;
+
 /**
  * Plugin path
  *
  * @var string
  */
 	var $plugin = null;
+
 /**
  * POST data for models
  *
  * @var array
  */
 	var $data = null;
+
 /**
  * List of named arguments
  *
  * @var array
  */
 	var $namedArgs = null;
+
 /**
  * URL argument separator character
  *
  * @var string
  */
 	var $argSeparator = null;
+
 /**
  * Contains model validation errors of form post-backs
  *
@@ -111,6 +125,7 @@ class Helper extends Overloadable {
  * @var array
  */
 	var $validationErrors = null;
+
 /**
  * Holds tag templates.
  *
@@ -118,6 +133,7 @@ class Helper extends Overloadable {
  * @var array
  */
 	var $tags = array();
+
 /**
  * Holds the content to be cleaned.
  *
@@ -125,6 +141,7 @@ class Helper extends Overloadable {
  * @var mixed
  */
 	var $__tainted = null;
+
 /**
  * Holds the cleaned content.
  *
@@ -132,6 +149,7 @@ class Helper extends Overloadable {
  * @var mixed
  */
 	var $__cleaned = null;
+
 /**
  * Default overload methods
  *
@@ -158,6 +176,7 @@ class Helper extends Overloadable {
 		}
 		return $this->tags;
 	}
+
 /**
  * Finds URL for specified action.
  *
@@ -177,6 +196,7 @@ class Helper extends Overloadable {
 	function url($url = null, $full = false) {
 		return h(Router::url($url, $full));
 	}
+
 /**
  * Checks if a file exists when theme is used, if no file is found default location is returned
  *
@@ -226,6 +246,7 @@ class Helper extends Overloadable {
 		$this->__clean();
 		return $this->__cleaned;
 	}
+
 /**
  * Returns a space-delimited string with items of the $options array. If a
  * key of $options array happens to be one of:
@@ -278,6 +299,7 @@ class Helper extends Overloadable {
 		}
 		return $out ? $insertBefore . $out . $insertAfter : '';
 	}
+
 /**
  * @param  string $key
  * @param  string $value
@@ -301,6 +323,7 @@ class Helper extends Overloadable {
 		}
 		return $attribute;
 	}
+
 /**
  * Sets this helper's model and field properties to the dot-separated value-pair in $entity.
  *
@@ -415,6 +438,7 @@ class Helper extends Overloadable {
 			$view->modelScope = true;
 		}
 	}
+
 /**
  * Gets the currently-used model of the rendering context.
  *
@@ -428,6 +452,7 @@ class Helper extends Overloadable {
 			return $view->model;
 		}
 	}
+
 /**
  * Gets the ID of the currently-used model of the rendering context.
  *
@@ -437,6 +462,7 @@ class Helper extends Overloadable {
 		$view =& ClassRegistry::getObject('view');
 		return $view->modelId;
 	}
+
 /**
  * Gets the currently-used model field of the rendering context.
  *
@@ -446,6 +472,7 @@ class Helper extends Overloadable {
 		$view =& ClassRegistry::getObject('view');
 		return $view->field;
 	}
+
 /**
  * Returns false if given FORM field has no errors. Otherwise it returns the constant set in the array Model->validationErrors.
  *
@@ -473,6 +500,7 @@ class Helper extends Overloadable {
 			return empty($errors[$model][$modelID][$field]) ? 0 : $errors[$model][$modelID][$field];
 		}
 	}
+
 /**
  * Generates a DOM ID for the selected element, if one is not set.
  *
@@ -500,6 +528,7 @@ class Helper extends Overloadable {
 		}
 		return $options;
 	}
+
 /**
  * Gets the input field name for the current tag
  *
@@ -541,6 +570,7 @@ class Helper extends Overloadable {
 			return $name;
 		}
 	}
+
 /**
  * Gets the data for the current tag
  *
@@ -610,6 +640,7 @@ class Helper extends Overloadable {
 			return $result;
 		}
 	}
+
 /**
  * Sets the defaults for an input tag
  *
@@ -631,6 +662,7 @@ class Helper extends Overloadable {
 		}
 		return $options;
 	}
+
 /**
  * Adds the given class to the element options
  *
@@ -647,6 +679,7 @@ class Helper extends Overloadable {
 		}
 		return $options;
 	}
+
 /**
  * Returns a string generated by a helper method
  *
@@ -658,30 +691,35 @@ class Helper extends Overloadable {
 	function output($str) {
 		return $str;
 	}
+
 /**
  * Before render callback.  Overridden in subclasses.
  *
  */
 	function beforeRender() {
 	}
+
 /**
  * After render callback.  Overridden in subclasses.
  *
  */
 	function afterRender() {
 	}
+
 /**
  * Before layout callback.  Overridden in subclasses.
  *
  */
 	function beforeLayout() {
 	}
+
 /**
  * After layout callback.  Overridden in subclasses.
  *
  */
 	function afterLayout() {
 	}
+
 /**
  * Transforms a recordset from a hasAndBelongsToMany association to a list of selected
  * options for a multiple select element
@@ -709,6 +747,7 @@ class Helper extends Overloadable {
 		}
 		return $array;
 	}
+
 /**
  * Resets the vars used by Helper::clean() to null
  *
@@ -718,6 +757,7 @@ class Helper extends Overloadable {
 		$this->__tainted = null;
 		$this->__cleaned = null;
 	}
+
 /**
  * Removes harmful content from output
  *
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index 97d5c9580..708a89b87 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Helper for AJAX operations.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * AjaxHelper helper library.
  *
@@ -33,12 +35,14 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class AjaxHelper extends AppHelper {
+
 /**
  * Included helpers.
  *
  * @var array
  */
 	var $helpers = array('Html', 'Javascript', 'Form');
+
 /**
  * HtmlHelper instance
  *
@@ -46,6 +50,7 @@ class AjaxHelper extends AppHelper {
  * @access public
  */
 	var $Html = null;
+
 /**
  * JavaScriptHelper instance
  *
@@ -53,6 +58,7 @@ class AjaxHelper extends AppHelper {
  * @access public
  */
 	var $Javascript = null;
+
 /**
  * Names of Javascript callback functions.
  *
@@ -62,6 +68,7 @@ class AjaxHelper extends AppHelper {
 		'complete', 'create', 'exception', 'failure', 'interactive', 'loading',
 		'loaded', 'success', 'uninitialized'
 	);
+
 /**
  * Names of AJAX options.
  *
@@ -74,6 +81,7 @@ class AjaxHelper extends AppHelper {
 		'onInteractive', 'onLoaded', 'onLoading', 'onSuccess', 'onUninitialized', 'parameters',
 		'position', 'postBody', 'requestHeaders', 'success', 'type', 'update', 'with'
 	);
+
 /**
  * Options for draggable.
  *
@@ -84,6 +92,7 @@ class AjaxHelper extends AppHelper {
 		'starteffect', 'reverteffect', 'endeffect', 'scroll', 'scrollSensitivity',
 		'onStart', 'onDrag', 'onEnd'
 	);
+
 /**
  * Options for droppable.
  *
@@ -92,6 +101,7 @@ class AjaxHelper extends AppHelper {
 	var $dropOptions = array(
 		'accept', 'containment', 'greedy', 'hoverclass', 'onHover', 'onDrop', 'overlap'
 	);
+
 /**
  * Options for sortable.
  *
@@ -102,6 +112,7 @@ class AjaxHelper extends AppHelper {
 		'onChange', 'only', 'overlap', 'scroll', 'scrollSensitivity', 'scrollSpeed', 'tag', 'tree',
 		'treeTag', 'update'
 	);
+
 /**
  * Options for slider.
  *
@@ -111,6 +122,7 @@ class AjaxHelper extends AppHelper {
 		'alignX', 'alignY', 'axis', 'disabled', 'handleDisabled', 'handleImage', 'increment',
 		'maximum', 'minimum', 'onChange', 'onSlide', 'range', 'sliderValue', 'values'
 	);
+
 /**
  * Options for in-place editor.
  *
@@ -122,6 +134,7 @@ class AjaxHelper extends AppHelper {
 		'loadingText', 'callback', 'ajaxOptions', 'clickToEditText', 'collection', 'okControl',
 		'cancelControl', 'submitOnBlur'
 	);
+
 /**
  * Options for auto-complete editor.
  *
@@ -131,12 +144,14 @@ class AjaxHelper extends AppHelper {
 		'afterUpdateElement', 'callback', 'frequency', 'indicator', 'minChars', 'onShow', 'onHide',
 		'parameters', 'paramName', 'tokens', 'updateElement'
 	);
+
 /**
  * Output buffer for Ajax update content
  *
  * @var array
  */
 	var $__ajaxBuffer = array();
+
 /**
  * Returns link to remote action
  *
@@ -230,6 +245,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $return;
 	}
+
 /**
  * Creates JavaScript function for remote AJAX call
  *
@@ -277,6 +293,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $func;
 	}
+
 /**
  * Periodically call remote url via AJAX.
  *
@@ -295,6 +312,7 @@ class AjaxHelper extends AppHelper {
 		$code = "new PeriodicalExecuter(function() {{$callback}}, $frequency)";
 		return $this->Javascript->codeBlock($code);
 	}
+
 /**
  * Returns form tag that will submit using Ajax.
  *
@@ -340,6 +358,7 @@ class AjaxHelper extends AppHelper {
 		$script = $this->Javascript->event("'" . $htmlOptions['id']. "'", 'submit', $callback);
 		return $form . $script;
 	}
+
 /**
  * Returns a button input tag that will submit using Ajax
  *
@@ -370,6 +389,7 @@ class AjaxHelper extends AppHelper {
 		$script = $this->Javascript->event('"' . $htmlOptions['id'] . '"', 'click', $callback);
 		return $form . $script;
 	}
+
 /**
  * Observe field and call ajax on change.
  *
@@ -410,6 +430,7 @@ class AjaxHelper extends AppHelper {
 			$this->_buildObserver('Form.Element.' . $observer, $field, $options)
 		);
 	}
+
 /**
  * Observe entire form and call ajax on change.
  *
@@ -434,6 +455,7 @@ class AjaxHelper extends AppHelper {
 			$this->_buildObserver('Form.' . $observer, $form, $options)
 		);
 	}
+
 /**
  * Create a text field with Autocomplete.
  *
@@ -494,6 +516,7 @@ class AjaxHelper extends AppHelper {
 
 		return  "{$text}\n{$div}\n" . $this->Javascript->codeBlock($script);
 	}
+
 /**
  * Creates an Ajax-updateable DIV element
  *
@@ -514,6 +537,7 @@ class AjaxHelper extends AppHelper {
 		$attr = $this->_parseAttributes(array_merge($options, array('id' => $id)));
 		return $this->output(sprintf($this->Html->tags['blockstart'], $attr));
 	}
+
 /**
  * Closes an Ajax-updateable DIV element
  *
@@ -532,6 +556,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $this->output($this->Html->tags['blockend']);
 	}
+
 /**
  * Detects Ajax requests
  *
@@ -540,6 +565,7 @@ class AjaxHelper extends AppHelper {
 	function isAjax() {
 		return (isset($this->params['isAjax']) && $this->params['isAjax'] === true);
 	}
+
 /**
  * Creates a draggable element.  For a reference on the options for this function,
  * check out http://github.com/madrobby/scriptaculous/wikis/draggable
@@ -559,6 +585,7 @@ class AjaxHelper extends AppHelper {
 		);
 		return $this->Javascript->codeBlock("{$var}new Draggable('$id', " .$options . ");");
 	}
+
 /**
  * For a reference on the options for this function, check out
  * http://github.com/madrobby/scriptaculous/wikis/droppables
@@ -579,6 +606,7 @@ class AjaxHelper extends AppHelper {
 		);
 		return $this->Javascript->codeBlock("Droppables.add('{$id}', {$options});");
 	}
+
 /**
  * Make an element with the given $id droppable, and trigger an Ajax call when a draggable is
  * dropped on it.
@@ -608,6 +636,7 @@ class AjaxHelper extends AppHelper {
 		);
 		return $this->Javascript->codeBlock("Droppables.add('{$id}', {$options});");
 	}
+
 /**
  * Makes a slider control.
  *
@@ -645,6 +674,7 @@ class AjaxHelper extends AppHelper {
 		$script = "{$var}new Control.Slider('$id', '$trackId', $options);";
 		return $this->Javascript->codeBlock($script);
 	}
+
 /**
  * Makes an Ajax In Place editor control.
  *
@@ -688,6 +718,7 @@ class AjaxHelper extends AppHelper {
 		$script = "{$var}new Ajax.{$type}('{$id}', '{$url}', {$options});";
 		return $this->Javascript->codeBlock($script);
 	}
+
 /**
  * Makes a list or group of floated objects sortable.
  *
@@ -732,6 +763,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $this->Javascript->codeBlock($result);
 	}
+
 /**
  * Private helper function for Javascript.
  *
@@ -805,6 +837,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $this->_buildOptions($jsOptions, $this->ajaxOptions);
 	}
+
 /**
  * Private Method to return a string of html options
  * option data as a JavaScript options hash.
@@ -822,6 +855,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $options;
 	}
+
 /**
  * Returns a string of JavaScript with the given option data as a JavaScript options hash.
  *
@@ -853,6 +887,7 @@ class AjaxHelper extends AppHelper {
 			return false;
 		}
 	}
+
 /**
  * Return JavaScript text for an observer...
  *
@@ -872,6 +907,7 @@ class AjaxHelper extends AppHelper {
 
 		return "new $klass('$name', {$frequency}function(element, value) {{$callback}})";
 	}
+
 /**
  * Return Javascript text for callbacks.
  *
@@ -916,6 +952,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $callbacks;
 	}
+
 /**
  * Returns a string of JavaScript with a string representation of given options array.
  *
@@ -943,6 +980,7 @@ class AjaxHelper extends AppHelper {
 		}
 		return $options;
 	}
+
 /**
  * Executed after a view has rendered, used to include bufferred code
  * blocks.
@@ -958,7 +996,7 @@ class AjaxHelper extends AppHelper {
 			$keys = array_keys($this->__ajaxBuffer);
 
 			if (count($divs) == 1 && in_array($divs[0], $keys)) {
-				e($this->__ajaxBuffer[$divs[0]]);
+				echo $this->__ajaxBuffer[$divs[0]];
 			} else {
 				foreach ($this->__ajaxBuffer as $key => $val) {
 					if (in_array($key, $divs)) {
@@ -969,14 +1007,13 @@ class AjaxHelper extends AppHelper {
 				$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
 				$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
 				$out .= '__ajaxUpdater__[n]))); }';
-				e($this->Javascript->codeBlock($out, false));
+				echo $this->Javascript->codeBlock($out, false);
 			}
 			$scripts = $this->Javascript->getCache();
 
 			if (!empty($scripts)) {
-				e($this->Javascript->codeBlock($scripts, false));
+				echo $this->Javascript->codeBlock($scripts, false);
 			}
-
 			$this->_stop();
 		}
 	}
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index c57f438b8..81e0b90c2 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,7 +26,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Helper');
+App::import('View', 'Helper', false);
+
 /**
  * This is a placeholder class.
  * Create the same file in app/app_helper.php
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index d8e60b12f..30e6378f3 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class CacheHelper extends AppHelper {
+
 /**
  * Array of strings replaced in cached views.
  * The strings are found between <cake:nocache><cake:nocache> in views
@@ -41,6 +44,7 @@ class CacheHelper extends AppHelper {
  * @access private
  */
 	var $__replace = array();
+
 /**
  * Array of string that are replace with there var replace above.
  * The strings are any content inside <cake:nocache><cake:nocache> and includes the tags in views
@@ -49,6 +53,7 @@ class CacheHelper extends AppHelper {
  * @access private
  */
 	var $__match = array();
+
 /**
  * holds the View object passed in final call to CacheHelper::cache()
  *
@@ -56,6 +61,7 @@ class CacheHelper extends AppHelper {
  * @access public
  */
 	var $view;
+
 /**
  * cache action time
  *
@@ -63,6 +69,7 @@ class CacheHelper extends AppHelper {
  * @access public
  */
 	var $cacheAction;
+
 /**
  * Main method used to cache a view
  *
@@ -144,6 +151,7 @@ class CacheHelper extends AppHelper {
 			return $out;
 		}
 	}
+
 /**
  * Parse file searching for no cache tags
  *
@@ -181,6 +189,7 @@ class CacheHelper extends AppHelper {
 			}
 		}
 	}
+
 /**
  * Parse the output and replace cache tags
  *
@@ -214,6 +223,7 @@ class CacheHelper extends AppHelper {
 		}
 		return $cache;
 	}
+
 /**
  * Write a cached version of the file
  *
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 6394ce5ee..72b203977 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Automatic generation of HTML FORMs from given data.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Form helper library.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class FormHelper extends AppHelper {
+
 /**
  * Other helpers used by FormHelper
  *
@@ -40,6 +43,7 @@ class FormHelper extends AppHelper {
  * @access public
  */
 	var $helpers = array('Html');
+
 /**
  * Holds the fields array('field_name' => array('type'=> 'string', 'length'=> 100),
  * primaryKey and validates array('field_name')
@@ -47,6 +51,7 @@ class FormHelper extends AppHelper {
  * @access public
  */
 	var $fieldset = array('fields' => array(), 'key' => 'id', 'validates' => array());
+
 /**
  * Options used by DateTime fields
  *
@@ -56,6 +61,7 @@ class FormHelper extends AppHelper {
 		'day' => array(), 'minute' => array(), 'hour' => array(),
 		'month' => array(), 'year' => array(), 'meridian' => array()
 	);
+
 /**
  * List of fields created, used with secure forms.
  *
@@ -63,6 +69,7 @@ class FormHelper extends AppHelper {
  * @access public
  */
 	var $fields = array();
+
 /**
  * Defines the type of form being created.  Set by FormHelper::create().
  *
@@ -70,6 +77,7 @@ class FormHelper extends AppHelper {
  * @access public
  */
 	var $requestType = null;
+
 /**
  * Returns an HTML FORM element.
  *
@@ -247,6 +255,7 @@ class FormHelper extends AppHelper {
 		$attributes = $this->_parseAttributes($htmlAttributes, null, '');
 		return $this->output(sprintf($this->Html->tags['form'], $attributes)) . $append;
 	}
+
 /**
  * Closes an HTML form, cleans up values set by FormHelper::create(), and writes hidden
  * input fields where appropriate.
@@ -299,6 +308,7 @@ class FormHelper extends AppHelper {
 		$view->modelScope = false;
 		return $this->output($out);
 	}
+
 /**
  * Generates a hidden field with a security hash based on the fields used in the form.
  *
@@ -332,6 +342,7 @@ class FormHelper extends AppHelper {
 		));
 		return $out .= '</fieldset>';
 	}
+
 /**
  * Determine which fields of a form should be used for hash
  *
@@ -363,6 +374,7 @@ class FormHelper extends AppHelper {
 			$this->fields[] = $field;
 		}
 	}
+
 /**
  * Returns true if there is an error for the given field, otherwise false
  *
@@ -374,6 +386,7 @@ class FormHelper extends AppHelper {
 		$this->setEntity($field);
 		return (bool)$this->tagIsInvalid();
 	}
+
 /**
  * Returns a formatted error message for given FORM field, NULL if no errors.
  *
@@ -435,6 +448,7 @@ class FormHelper extends AppHelper {
 			return null;
 		}
 	}
+
 /**
  * Returns a formatted LABEL element for HTML FORMs.
  *
@@ -478,6 +492,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($attributes), $text
 		));
 	}
+
 /**
  * Will display all the fields passed in an array expects fieldName as an array key
  * replaces generateFields
@@ -560,10 +575,11 @@ class FormHelper extends AppHelper {
 			return $out;
 		}
 	}
+
 /**
  * Generates a form input element complete with label and wrapper div
  *
- * Options - See each field type method for more information. Any options that are part of 
+ * Options - See each field type method for more information. Any options that are part of
  * $attributes or $options for the different type methods can be included in $options for input().
  *
  * - 'type' - Force the type of widget you want. e.g. ```type => 'select'```
@@ -830,6 +846,7 @@ class FormHelper extends AppHelper {
 		}
 		return $out;
 	}
+
 /**
  * Creates a checkbox input widget.
  *
@@ -868,6 +885,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($options, array('name'), null, ' ')
 		));
 	}
+
 /**
  * Creates a set of radio widgets.
  *
@@ -952,6 +970,7 @@ class FormHelper extends AppHelper {
 		}
 		return $this->output($out);
 	}
+
 /**
  * Creates a text input widget.
  *
@@ -969,6 +988,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($options, array('name'), null, ' ')
 		));
 	}
+
 /**
  * Creates a password input widget.
  *
@@ -984,6 +1004,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($options, array('name'), null, ' ')
 		));
 	}
+
 /**
  * Creates a textarea widget.
  *
@@ -1009,6 +1030,7 @@ class FormHelper extends AppHelper {
 			$value
 		));
 	}
+
 /**
  * Creates a hidden input field.
  *
@@ -1039,6 +1061,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($options, array('name', 'class'), '', ' ')
 		));
 	}
+
 /**
  * Creates file input widget.
  *
@@ -1060,6 +1083,7 @@ class FormHelper extends AppHelper {
 		$attributes = $this->_parseAttributes($options, array('name'), '', ' ');
 		return $this->output(sprintf($this->Html->tags['file'], $options['name'], $attributes));
 	}
+
 /**
  * Creates a button tag.
  *
@@ -1085,6 +1109,7 @@ class FormHelper extends AppHelper {
 			$this->_parseAttributes($options, array('type'), '', ' ')
 		));
 	}
+
 /**
  * Creates a submit button element.
  *
@@ -1092,7 +1117,7 @@ class FormHelper extends AppHelper {
  *  extension .jpg, .jpe, .jpeg, .gif, .png use an image if the extension
  *  exists, AND the first character is /, image is relative to webroot,
  *  OR if the first character is not /, image is relative to webroot/img.
- * @param array $options 
+ * @param array $options
  * @return string A HTML submit button
  */
 	function submit($caption = null, $options = array()) {
@@ -1151,6 +1176,7 @@ class FormHelper extends AppHelper {
 		}
 		return $out;
 	}
+
 /**
  * Returns a formatted SELECT element.
  *
@@ -1244,6 +1270,7 @@ class FormHelper extends AppHelper {
 		$select[] = $this->Html->tags[$template];
 		return $this->output(implode("\n", $select));
 	}
+
 /**
  * Returns a SELECT element for days.
  *
@@ -1278,6 +1305,7 @@ class FormHelper extends AppHelper {
 			$fieldName . ".day", $this->__generateOptions('day'), $selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a SELECT element for years
  *
@@ -1319,6 +1347,7 @@ class FormHelper extends AppHelper {
 			$selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a SELECT element for months.
  *
@@ -1364,6 +1393,7 @@ class FormHelper extends AppHelper {
 			$selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a SELECT element for hours.
  *
@@ -1407,6 +1437,7 @@ class FormHelper extends AppHelper {
 			$selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a SELECT element for minutes.
  *
@@ -1448,6 +1479,7 @@ class FormHelper extends AppHelper {
 			$selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a SELECT element for AM or PM.
  *
@@ -1481,6 +1513,7 @@ class FormHelper extends AppHelper {
 			$selected, $attributes, $showEmpty
 		);
 	}
+
 /**
  * Returns a set of SELECT elements for a full datetime setup: day, month and year, and then time.
  *
@@ -1634,6 +1667,7 @@ class FormHelper extends AppHelper {
 		}
 		return $opt;
 	}
+
 /**
  * Gets the input field name for the current tag
  *
@@ -1668,6 +1702,7 @@ class FormHelper extends AppHelper {
 		}
 		return parent::__name($options, $field, $key);
 	}
+
 /**
  * Returns an array of formatted OPTION/OPTGROUP elements
  * @access private
@@ -1757,6 +1792,7 @@ class FormHelper extends AppHelper {
 
 		return array_reverse($select, true);
 	}
+
 /**
  * Generates option lists for common <select /> menus
  * @access private
@@ -1854,12 +1890,13 @@ class FormHelper extends AppHelper {
 		$this->__options[$name] = $data;
 		return $this->__options[$name];
 	}
+
 /**
  * Sets field defaults and adds field to form security input hash
- * 
+ *
  * Options
  *  - secure - boolean whether or not the the field should be added to the security fields.
- * 
+ *
  * @param string $field
  * @param array $options
  * @return array
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index ce6ea9302..31c4a2e8c 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Html Helper class file.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Html Helper class for easy use of HTML widgets.
  *
@@ -31,12 +33,15 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class HtmlHelper extends AppHelper {
+
 /*************************************************************************
  * Public variables
  *************************************************************************/
+
 /**#@+
  * @access public
  */
+
 /**
  * html tags used by this helper.
  *
@@ -96,43 +101,52 @@ class HtmlHelper extends AppHelper {
 		'li' => '<li%s>%s</li>',
 		'error' => '<div%s>%s</div>'
 	);
+
 /**
  * Base URL
  *
  * @var string
  */
 	var $base = null;
+
 /**
  * URL to current action.
  *
  * @var string
  */
 	var $here = null;
+
 /**
  * Parameter array.
  *
  * @var array
  */
 	var $params = array();
+
 /**
  * Current action.
  *
  * @var string
  */
 	var $action = null;
+
 /**
  * Enter description here...
  *
  * @var array
  */
 	var $data = null;
+
 /**#@-*/
+
 /*************************************************************************
  * Private variables
  *************************************************************************/
+
 /**#@+
  * @access private
  */
+
 /**
  * Breadcrumbs.
  *
@@ -140,6 +154,7 @@ class HtmlHelper extends AppHelper {
  * @access private
  */
 	var $_crumbs = array();
+
 /**
  * Document type definitions
  *
@@ -155,6 +170,7 @@ class HtmlHelper extends AppHelper {
 		'xhtml-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
 		'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
 	);
+
 /**
  * Adds a link to the breadcrumbs array.
  *
@@ -165,6 +181,7 @@ class HtmlHelper extends AppHelper {
 	function addCrumb($name, $link = null, $options = null) {
 		$this->_crumbs[] = array($name, $link, $options);
 	}
+
 /**
  * Returns a doctype string.
  *
@@ -186,6 +203,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return null;
 	}
+
 /**
  * Creates a link to an external resource and handles basic meta tags
  *
@@ -248,6 +266,7 @@ class HtmlHelper extends AppHelper {
 			$view->addScript($out);
 		}
 	}
+
 /**
  * Returns a charset META-tag.
  *
@@ -260,6 +279,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->output(sprintf($this->tags['charset'], (!empty($charset) ? $charset : 'utf-8')));
 	}
+
 /**
  * Creates an HTML link.
  *
@@ -313,10 +333,11 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->output(sprintf($this->tags['link'], $url, $this->_parseAttributes($htmlAttributes), $title));
 	}
+
 /**
  * Creates a link element for CSS stylesheets.
  *
- * @param mixed $path The name of a CSS style sheet or an array containing names of 
+ * @param mixed $path The name of a CSS style sheet or an array containing names of
  *   CSS stylesheets. If `$path` is prefixed with '/', the path will be relative to the webroot
  *   of your application. Otherwise, the path will be relative to your CSS path, usually webroot/css.
  * @param string $rel Rel attribute. Defaults to "stylesheet". If equal to 'import' the stylesheet will be imported.
@@ -378,6 +399,7 @@ class HtmlHelper extends AppHelper {
 			$view->addScript($out);
 		}
 	}
+
 /**
  * Builds CSS style data from an array of CSS properties
  *
@@ -398,6 +420,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return join("\n", $out);
 	}
+
 /**
  * Returns the breadcrumb trail as a sequence of &raquo;-separated links.
  *
@@ -424,6 +447,7 @@ class HtmlHelper extends AppHelper {
 			return null;
 		}
 	}
+
 /**
  * Creates a formatted IMG element.
  *
@@ -437,10 +461,11 @@ class HtmlHelper extends AppHelper {
 		} elseif ($path[0] === '/') {
 			$path = $this->webroot($path);
 		} elseif (strpos($path, '://') === false) {
-			if ((Configure::read('Asset.timestamp') == true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force') {
-				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . IMAGES_URL . $path));
-			}
 			$path = $this->webroot(IMAGES_URL . $path);
+
+			if ((Configure::read('Asset.timestamp') == true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force') {
+				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . $path));
+			}
 		}
 
 		if (!isset($options['alt'])) {
@@ -461,6 +486,7 @@ class HtmlHelper extends AppHelper {
 
 		return $this->output($image);
 	}
+
 /**
  * Returns a row of formatted and named TABLE headers.
  *
@@ -477,6 +503,7 @@ class HtmlHelper extends AppHelper {
 		$data = sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
 		return $this->output($data);
 	}
+
 /**
  * Returns a formatted string of table rows (TR's with TD's in them).
  *
@@ -528,6 +555,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->output(join("\n", $out));
 	}
+
 /**
  * Returns a formatted block tag, i.e DIV, SPAN, P.
  *
@@ -552,6 +580,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->output(sprintf($this->tags[$tag], $name, $this->_parseAttributes($attributes, null, ' ', ''), $text, $name));
 	}
+
 /**
  * Returns a formatted DIV tag for HTML FORMs.
  *
@@ -568,6 +597,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->tag('div', $text, $attributes, $escape);
 	}
+
 /**
  * Returns a formatted P tag.
  *
@@ -591,6 +621,7 @@ class HtmlHelper extends AppHelper {
 		}
 		return $this->output(sprintf($this->tags[$tag], $this->_parseAttributes($attributes, null, ' ', ''), $text));
 	}
+
 /**
  * Build a nested list (UL/OL) out of an associative array.
  *
@@ -609,6 +640,7 @@ class HtmlHelper extends AppHelper {
 		$items = $this->__nestedListItem($list, $attributes, $itemAttributes, $tag);
 		return sprintf($this->tags[$tag], $this->_parseAttributes($attributes, null, ' ', ''), $items);
 	}
+
 /**
  * Internal function to build a nested list (UL/OL) out of an associative array.
  *
@@ -639,4 +671,4 @@ class HtmlHelper extends AppHelper {
 		return $out;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index bd1a804f0..ba2c5a383 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Javascript Helper class file.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Javascript Helper class for easy use of JavaScript.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class JavascriptHelper extends AppHelper {
+
 /**
  * Determines whether native JSON extension is used for encoding.  Set by object constructor.
  *
@@ -38,6 +41,7 @@ class JavascriptHelper extends AppHelper {
  * @access public
  */
 	var $useNative = false;
+
 /**
  * If true, automatically writes events to the end of a script or to an external JavaScript file
  * at the end of page execution
@@ -46,6 +50,7 @@ class JavascriptHelper extends AppHelper {
  * @access public
  */
 	var $enabled = true;
+
 /**
  * Indicates whether <script /> blocks should be written 'safely,' i.e. wrapped in CDATA blocks
  *
@@ -53,6 +58,7 @@ class JavascriptHelper extends AppHelper {
  * @access public
  */
 	var $safe = false;
+
 /**
  * HTML tags used by this helper.
  *
@@ -60,11 +66,12 @@ class JavascriptHelper extends AppHelper {
  * @access public
  */
 	var $tags = array(
-		'javascriptblock' => '<script type="text/javascript">%s</script>',
 		'javascriptstart' => '<script type="text/javascript">',
-		'javascriptlink' => '<script type="text/javascript" src="%s"></script>',
-		'javascriptend' => '</script>'
+		'javascriptend' => '</script>',
+		'javascriptblock' => '<script type="text/javascript">%s</script>',
+		'javascriptlink' => '<script type="text/javascript" src="%s"></script>'
 	);
+
 /**
  * Holds options passed to codeBlock(), saved for when block is dumped to output
  *
@@ -73,6 +80,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::codeBlock()
  */
 	var $_blockOptions = array();
+
 /**
  * Caches events written by event() for output at the end of page execution
  *
@@ -81,6 +89,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::event()
  */
 	var $_cachedEvents = array();
+
 /**
  * Indicates whether generated events should be cached for later output (can be written at the
  * end of the page, in the <head />, or to an external file).
@@ -91,6 +100,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::writeEvents()
  */
 	var $_cacheEvents = false;
+
 /**
  * Indicates whether cached events should be written to an external file
  *
@@ -100,6 +110,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::writeEvents()
  */
 	var $_cacheToFile = false;
+
 /**
  * Indicates whether *all* generated JavaScript should be cached for later output
  *
@@ -109,6 +120,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::blockEnd()
  */
 	var $_cacheAll = false;
+
 /**
  * Contains event rules attached with CSS selectors.  Used with the event:Selectors JavaScript
  * library.
@@ -119,11 +131,13 @@ class JavascriptHelper extends AppHelper {
  * @link          http://alternateidea.com/event-selectors/
  */
 	var $_rules = array();
+
 /**
  * @var string
  * @access private
  */
 	var $__scriptBuffer = null;
+
 /**
  * Constructor. Checks for presence of native PHP JSON extension to use for object encoding
  *
@@ -149,6 +163,7 @@ class JavascriptHelper extends AppHelper {
 		$this->useNative = function_exists('json_encode');
 		return parent::__construct($options);
 	}
+
 /**
  * Returns a JavaScript script tag.
  *
@@ -173,71 +188,56 @@ class JavascriptHelper extends AppHelper {
 			$options = array();
 		}
 		$defaultOptions = array('allowCache' => true, 'safe' => true, 'inline' => true);
-		$options = array_merge($defaultOptions, compact('safe'), $options);
+		$options = array_merge($defaultOptions, $options);
 
-		if ($this->_cacheEvents && $this->_cacheAll && $options['allowCache'] && $script !== null) {
+		if (empty($script)) {
+			$this->__scriptBuffer = @ob_get_contents();
+			$this->_blockOptions = $options;
+			$this->inBlock = true;
+			@ob_end_clean();
+			ob_start();
+			return null;
+		}
+		if ($this->_cacheEvents && $this->_cacheAll && $options['allowCache']) {
 			$this->_cachedEvents[] = $script;
+			return null;
+		}
+		if ($options['safe'] || $this->safe) {
+			$script  = "\n" . '//<![CDATA[' . "\n" . $script . "\n" . '//]]>' . "\n";
+		}
+		if ($options['inline']) {
+			return sprintf($this->tags['javascriptblock'], $script);
 		} else {
-			$block = ($script !== null);
-			$safe = ($options['safe'] || $this->safe);
-			if ($safe && !($this->_cacheAll && $options['allowCache'])) {
-				$script  = "\n" . '//<![CDATA[' . "\n" . $script;
-				if ($block) {
-					$script .= "\n" . '//]]>' . "\n";
-				}
-			}
-
-			if ($script === null) {
-				$this->__scriptBuffer = @ob_get_contents();
-				$this->_blockOptions = $options;
-				$this->inBlock = true;
-				@ob_end_clean();
-				ob_start();
-				return null;
-			} else if (!$block) {
-				$this->_blockOptions = $options;
-			}
-
-			if ($options['inline']) {
-				if ($block) {
-					return sprintf($this->tags['javascriptblock'], $script);
-				} else {
-					$safe = ($safe ? "\n" . '//<![CDATA[' . "\n" : '');
-					return $this->tags['javascriptstart'] . $safe;
-				}
-			} elseif ($block) {
-				$view =& ClassRegistry::getObject('view');
-				$view->addScript(sprintf($this->tags['javascriptblock'], $script));
-			}
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript(sprintf($this->tags['javascriptblock'], $script));
 		}
 	}
+
 /**
  * Ends a block of cached JavaScript code
  *
  * @return mixed
  */
 	function blockEnd() {
+		if (!isset($this->inBlock) || !$this->inBlock) {
+			return;
+		}
 		$script = @ob_get_contents();
 		@ob_end_clean();
 		ob_start();
 		echo $this->__scriptBuffer;
 		$this->__scriptBuffer = null;
 		$options = $this->_blockOptions;
-		$safe = ((isset($options['safe']) && $options['safe']) || $this->safe);
 		$this->_blockOptions = array();
 		$this->inBlock = false;
 
-		if (isset($options['inline']) && !$options['inline']) {
-			$view =& ClassRegistry::getObject('view');
-			$view->addScript(sprintf($this->tags['javascriptblock'], $script));
-		}
-
-		if (!empty($script) && $this->_cacheAll && $options['allowCache']) {
-			$this->_cachedEvents[] = $script;
+		if (empty($script)) {
 			return null;
 		}
-		return ife($safe, "\n" . '//]]>' . "\n", '').$this->tags['javascriptend'];
+
+		return $this->codeBlock($script, $options);
 	}
+
 /**
  * Returns a JavaScript include tag (SCRIPT element).  If the filename is prefixed with "/",
  * the path will be relative to the base path of your application.  Otherwise, the path will
@@ -294,6 +294,7 @@ class JavascriptHelper extends AppHelper {
 			$view->addScript($out);
 		}
 	}
+
 /**
  * Escape carriage returns and single and double quotes for JavaScript segments.
  *
@@ -305,6 +306,7 @@ class JavascriptHelper extends AppHelper {
 		$script = str_replace(array('"', "'"), array('\"', "\\'"), $script);
 		return $script;
 	}
+
 /**
  * Escape a string to be JavaScript friendly.
  *
@@ -324,6 +326,7 @@ class JavascriptHelper extends AppHelper {
 		$string = str_replace(array_keys($escape), array_values($escape), $string);
 		return $this->_utf8ToHex($string);
 	}
+
 /**
  * Encode a string into JSON.  Converts and escapes necessary characters.
  *
@@ -418,6 +421,7 @@ class JavascriptHelper extends AppHelper {
 		}
 		return $return;
 	}
+
 /**
  * Attach an event to an element. Used with the Prototype library.
  *
@@ -480,6 +484,7 @@ class JavascriptHelper extends AppHelper {
 			}
 		}
 	}
+
 /**
  * Cache JavaScript events created with event()
  *
@@ -492,6 +497,7 @@ class JavascriptHelper extends AppHelper {
 		$this->_cacheToFile = $file;
 		$this->_cacheAll = $all;
 	}
+
 /**
  * Gets (and clears) the current JavaScript event cache
  *
@@ -520,6 +526,7 @@ class JavascriptHelper extends AppHelper {
 		}
 		return $data;
 	}
+
 /**
  * Write cached JavaScript events
  *
@@ -558,6 +565,7 @@ class JavascriptHelper extends AppHelper {
 			$view->addScript($out);
 		}
 	}
+
 /**
  * Includes the Prototype Javascript library (and anything else) inside a single script tag.
  *
@@ -585,6 +593,7 @@ class JavascriptHelper extends AppHelper {
 		}
 		return $this->codeBlock("\n\n" . $javascript, $options);
 	}
+
 /**
  * Generates a JavaScript object in JavaScript Object Notation (JSON)
  * from an array
@@ -667,6 +676,7 @@ class JavascriptHelper extends AppHelper {
 
 		return $rt;
 	}
+
 /**
  * Converts a PHP-native variable of any type to a JSON-equivalent representation
  *
@@ -700,6 +710,7 @@ class JavascriptHelper extends AppHelper {
 		}
 		return $val;
 	}
+
 /**
  * AfterRender callback.  Writes any cached events to the view, or to a temp file.
  *
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 15e25099f..ccbe41de9 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Javascript Generator class file.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Javascript Generator helper class for easy use of JavaScript.
  *
@@ -101,6 +103,7 @@ class JsHelper extends Overloadable2 {
 	function prompt_($message, $default = '') {
 		return 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '");';
 	}
+
 /*
  * Tries a series of expressions, and executes after first successful completion.
  * (See Prototype's Try.these).
@@ -109,6 +112,7 @@ class JsHelper extends Overloadable2 {
  */
 	function tryThese_($expr1, $expr2, $expr3) {
 	}
+
 /**
  * Loads a remote URL
  *
@@ -154,6 +158,7 @@ class JsHelper extends Overloadable2 {
 		}
 		return $func;
 	}
+
 /**
  * Redirects to a URL
  *
@@ -164,6 +169,7 @@ class JsHelper extends Overloadable2 {
 	function redirect_($url = null) {
 		return 'window.location = "' . Router::url($url) . '";';
 	}
+
 /**
  * Escape a string to be JavaScript friendly.
  *
@@ -201,6 +207,7 @@ class JsHelper extends Overloadable2 {
 		}
 		return $this->__objects[$name];
 	}
+
 /**
  * Generates a JavaScript object in JavaScript Object Notation (JSON)
  * from an array
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 6c814e0f8..8949d6c1c 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Number Helper.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Number helper library.
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class NumberHelper extends AppHelper {
+
 /**
  * Formats a number with a level of precision.
  *
@@ -44,6 +47,7 @@ class NumberHelper extends AppHelper {
 	function precision($number, $precision = 3) {
 		return sprintf("%01.{$precision}f", $number);
 	}
+
 /**
  * Returns a formatted-for-humans file size.
  *
@@ -65,6 +69,7 @@ class NumberHelper extends AppHelper {
 				return sprintf(__('%.2f TB', true), $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
 		}
 	}
+
 /**
  * Formats a number into a percentage string.
  *
@@ -76,6 +81,7 @@ class NumberHelper extends AppHelper {
 	function toPercentage($number, $precision = 2) {
 		return $this->precision($number, $precision) . '%';
 	}
+
 /**
  * Formats a number into a currency format.
  *
@@ -119,6 +125,7 @@ class NumberHelper extends AppHelper {
 		}
 		return $out;
 	}
+
 /**
  * Formats a number into a currency format.
  *
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index ab212cce1..cb9a48e31 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -17,6 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /**
  * Pagination Helper class for easy generation of pagination links.
  *
@@ -26,18 +27,21 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class PaginatorHelper extends AppHelper {
+
 /**
  * Helper dependencies
  *
  * @var array
  */
 	var $helpers = array('Html', 'Ajax');
+
 /**
  * Holds the default model for paged recordsets
  *
  * @var string
  */
 	var $__defaultModel = null;
+
 /**
  * Holds the default options for pagination links
  *
@@ -61,6 +65,7 @@ class PaginatorHelper extends AppHelper {
  * @var array
  */
 	var $options = array();
+
 /**
  * Gets the current page of the in the recordset for the given model
  *
@@ -76,6 +81,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return $this->params['paging'][$model];
 	}
+
 /**
  * Sets default options for all pagination links
  *
@@ -107,6 +113,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		$this->options = array_filter(array_merge($this->options, $options));
 	}
+
 /**
  * Gets the current page of the recordset for the given model
  *
@@ -121,6 +128,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return 1;
 	}
+
 /**
  * Gets the current key by which the recordset is sorted
  *
@@ -152,6 +160,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return null;
 	}
+
 /**
  * Gets the current direction the recordset is sorted
  *
@@ -179,6 +188,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return 'asc';
 	}
+
 /**
  * Generates a "previous" link for a set of paged records
  *
@@ -191,6 +201,7 @@ class PaginatorHelper extends AppHelper {
 	function prev($title = '<< Previous', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
 		return $this->__pagingLink('Prev', $title, $options, $disabledTitle, $disabledOptions);
 	}
+
 /**
  * Generates a "next" link for a set of paged records
  *
@@ -203,6 +214,7 @@ class PaginatorHelper extends AppHelper {
 	function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
 		return $this->__pagingLink('Next', $title, $options, $disabledTitle, $disabledOptions);
 	}
+
 /**
  * Generates a sorting link
  *
@@ -223,11 +235,12 @@ class PaginatorHelper extends AppHelper {
 		}
 		$dir = 'asc';
 		$sortKey = $this->sortKey($options['model']);
-		$isSorted = ($sortKey === $key);
+		$isSorted = ($sortKey === $key || $sortKey === $this->defaultModel() . '.' . $key);
 
 		if ($isSorted && $this->sortDir($options['model']) === 'asc') {
 			$dir = 'desc';
 		}
+
 		if (is_array($title) && array_key_exists($dir, $title)) {
 			$title = $title[$dir];
 		}
@@ -235,6 +248,7 @@ class PaginatorHelper extends AppHelper {
 		$url = array_merge(array('sort' => $key, 'direction' => $dir), $url, array('order' => null));
 		return $this->link($title, $url, $options);
 	}
+
 /**
  * Generates a plain or Ajax link with pagination parameters
  *
@@ -262,6 +276,7 @@ class PaginatorHelper extends AppHelper {
 		$url = array_merge(Set::filter($url, true), array_intersect_key($url, array('plugin'=>true)));
 		return $this->{$obj}->link($title, $url, $options);
 	}
+
 /**
  * Merges passed URL options with current pagination state to generate a pagination URL.
  *
@@ -290,6 +305,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return parent::url($url);
 	}
+
 /**
  * Protected method for generating prev/next links
  *
@@ -321,6 +337,7 @@ class PaginatorHelper extends AppHelper {
 			return $this->Html->tag($tag, $title, $options, $escape);
 		}
 	}
+
 /**
  * Returns true if the given result set is not at the first page
  *
@@ -330,6 +347,7 @@ class PaginatorHelper extends AppHelper {
 	function hasPrev($model = null) {
 		return $this->__hasPage($model, 'prev');
 	}
+
 /**
  * Returns true if the given result set is not at the last page
  *
@@ -339,6 +357,7 @@ class PaginatorHelper extends AppHelper {
 	function hasNext($model = null) {
 		return $this->__hasPage($model, 'next');
 	}
+
 /**
  * Returns true if the given result set has the page number given by $page
  *
@@ -354,6 +373,7 @@ class PaginatorHelper extends AppHelper {
 		$paging = $this->params($model);
 		return $page <= $paging['pageCount'];
 	}
+
 /**
  * Protected method
  *
@@ -367,6 +387,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return false;
 	}
+
 /**
  * Gets the default model of the paged sets
  *
@@ -382,6 +403,7 @@ class PaginatorHelper extends AppHelper {
 		list($this->__defaultModel) = array_keys($this->params['paging']);
 		return $this->__defaultModel;
 	}
+
 /**
  * Returns a counter string for the paged result set
  *
@@ -445,6 +467,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return $this->output($out);
 	}
+
 /**
  * Returns a set of numbers for the paged result set
  * uses a modulus to decide how many numbers to show on each side of the current page (default: 8)
@@ -491,11 +514,12 @@ class PaginatorHelper extends AppHelper {
 				$end = $params['page'] + ($modulus  - $params['page']) + 1;
 			}
 
-			if ($first && $start > (int)$first) {
-				if ($start == $first + 1) {
-					$out .= $this->first($first, array('tag' => $tag, 'after' => $separator));
+			if ($first && $start > 1) {
+				$offset = ($start <= (int)$first) ? $start - 1 : $first;
+				if ($offset < $start - 1) {
+					$out .= $this->first($offset, array('tag' => $tag, 'separator' => $separator));
 				} else {
-					$out .= $this->first($first, array('tag' => $tag));
+					$out .= $this->first($offset, array('tag' => $tag, 'after' => $separator, 'separator' => $separator));
 				}
 			}
 
@@ -523,11 +547,12 @@ class PaginatorHelper extends AppHelper {
 
 			$out .= $after;
 
-			if ($last && $end <= $params['pageCount'] - (int)$last) {
-				if ($end + 1 == $params['pageCount']) {
-					$out .= $this->last($last, array('tag' => $tag, 'before' => $separator));
+			if ($last && $end < $params['pageCount']) {
+				$offset = ($params['pageCount'] < $end + (int)$last) ? $params['pageCount'] - $end : $last;
+				if ($offset <= $last && $params['pageCount'] - $end > $offset) {
+					$out .= $this->last($offset, array('tag' => $tag, 'separator' => $separator));
 				} else {
-					$out .= $this->last($last, array('tag' => $tag));
+					$out .= $this->last($offset, array('tag' => $tag, 'before' => $separator, 'separator' => $separator));
 				}
 			}
 
@@ -550,6 +575,7 @@ class PaginatorHelper extends AppHelper {
 
 		return $this->output($out);
 	}
+
 /**
  * Returns a first or set of numbers for the first pages
  *
@@ -595,6 +621,7 @@ class PaginatorHelper extends AppHelper {
 		}
 		return $out;
 	}
+
 /**
  * Returns a last or set of numbers for the last pages
  *
@@ -644,4 +671,4 @@ class PaginatorHelper extends AppHelper {
 		return $out;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index a7889a2e0..5c0b294d1 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * RSS Helper class file.
  *
@@ -33,6 +34,7 @@ App::import('Helper', 'Xml');
  * @subpackage    cake.cake.libs.view.helpers
  */
 class RssHelper extends XmlHelper {
+
 /**
  * Helpers used by RSS Helper
  *
@@ -40,6 +42,7 @@ class RssHelper extends XmlHelper {
  * @access public
  **/
 	var $helpers = array('Time');
+
 /**
  * Base URL
  *
@@ -47,6 +50,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $base = null;
+
 /**
  * URL to current action.
  *
@@ -54,6 +58,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $here = null;
+
 /**
  * Parameter array.
  *
@@ -61,6 +66,7 @@ class RssHelper extends XmlHelper {
  * @var array
  */
 	var $params = array();
+
 /**
  * Current action.
  *
@@ -68,6 +74,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $action = null;
+
 /**
  * POSTed model data
  *
@@ -75,6 +82,7 @@ class RssHelper extends XmlHelper {
  * @var array
  */
 	var $data = null;
+
 /**
  * Name of the current model
  *
@@ -82,6 +90,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $model = null;
+
 /**
  * Name of the current field
  *
@@ -89,6 +98,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $field = null;
+
 /**
  * Default spec version of generated RSS
  *
@@ -96,6 +106,7 @@ class RssHelper extends XmlHelper {
  * @var string
  */
 	var $version = '2.0';
+
 /**
  * Returns an RSS document wrapped in <rss /> tags
  *
@@ -113,6 +124,7 @@ class RssHelper extends XmlHelper {
 
 		return $this->elem('rss', $attrib, $content);
 	}
+
 /**
  * Returns an RSS <channel /> element
  *
@@ -157,6 +169,7 @@ class RssHelper extends XmlHelper {
 		}
 		return $this->elem('channel', $attrib, $elems . $content, !($content === null));
 	}
+
 /**
  * Transforms an array of data using an optional callback, and maps it to a set
  * of <item /> tags
@@ -179,6 +192,7 @@ class RssHelper extends XmlHelper {
 		}
 		return $out;
 	}
+
 /**
  * Converts an array into an <item /> element and its contents
  *
@@ -263,6 +277,7 @@ class RssHelper extends XmlHelper {
 		}
 		return $this->output($this->elem('item', $att, $content, !($content === null)));
 	}
+
 /**
  * Converts a time in any format to an RSS time
  *
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index adc0813dd..6681cb9cd 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,9 +26,8 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 if (!class_exists('cakesession')) {
-	uses('session');
+	require LIBS . 'cake_session.php';
 }
-
 /**
  * Session Helper.
  *
@@ -38,18 +38,21 @@ if (!class_exists('cakesession')) {
  *
  */
 class SessionHelper extends CakeSession {
+
 /**
  * List of helpers used by this helper
  *
  * @var array
  */
 	var $helpers = null;
+
 /**
  * Used to determine if methods implementation is used, or bypassed
  *
  * @var boolean
  */
 	var $__active = true;
+
 /**
  * Class constructor
  *
@@ -62,6 +65,7 @@ class SessionHelper extends CakeSession {
 			$this->__active = false;
 		}
 	}
+
 /**
  * Turn sessions on if 'Session.start' is set to false in core.php
  *
@@ -70,6 +74,7 @@ class SessionHelper extends CakeSession {
 	function activate($base = null) {
 		$this->__active = true;
 	}
+
 /**
  * Used to read a session values set in a controller for a key or return values for all keys.
  *
@@ -87,6 +92,7 @@ class SessionHelper extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to check is a session key has been set
  *
@@ -102,6 +108,7 @@ class SessionHelper extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Returns last error encountered in a session
  *
@@ -116,6 +123,7 @@ class SessionHelper extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to render the message set in Controller::Session::setFlash()
  *
@@ -142,10 +150,10 @@ class SessionHelper extends CakeSession {
 					$out = $flash['message'];
 				} else {
 					$view =& ClassRegistry::getObject('view');
-					list($tmpLayout, $tmpVars, $tmpTitle) = array($view->layout, $view->viewVars, $view->pageTitle);
-					list($view->layout, $view->viewVars, $view->pageTitle) = array($flash['layout'], $flash['params'], '');
-					$out = $view->renderLayout($flash['message']);
-					list($view->layout, $view->viewVars, $view->pageTitle) = array($tmpLayout, $tmpVars, $tmpTitle);
+					list($tmpVars, $tmpTitle) = array($view->viewVars, $view->pageTitle);
+					list($view->viewVars, $view->pageTitle) = array($flash['params'], '');
+					$out = $view->renderLayout($flash['message'], $flash['layout']);
+					list($view->viewVars, $view->pageTitle) = array($tmpVars, $tmpTitle);
 				}
 				echo($out);
 				parent::del('Message.' . $key);
@@ -154,6 +162,7 @@ class SessionHelper extends CakeSession {
 		}
 		return false;
 	}
+
 /**
  * Used to check is a session is valid in a view
  *
@@ -165,6 +174,7 @@ class SessionHelper extends CakeSession {
 			return parent::valid();
 		}
 	}
+
 /**
  * Override CakeSession::write().
  * This method should not be used in a view
@@ -175,6 +185,7 @@ class SessionHelper extends CakeSession {
 	function write() {
 		trigger_error(__('You can not write to a Session from the view', true), E_USER_WARNING);
 	}
+
 /**
  * Session id
  *
@@ -184,6 +195,7 @@ class SessionHelper extends CakeSession {
 	function id() {
 		return parent::id();
 	}
+
 /**
  * Determine if Session has been started
  * and attempt to start it if not
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index d12a0396b..12bf9c85b 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Text Helper
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  *
@@ -34,6 +36,7 @@ if (!class_exists('HtmlHelper')) {
 if (!class_exists('Multibyte')) {
 	App::import('Core', 'Multibyte');
 }
+
 /**
  * Text helper library.
  *
@@ -43,6 +46,7 @@ if (!class_exists('Multibyte')) {
  * @subpackage    cake.cake.libs.view.helpers
  */
 class TextHelper extends AppHelper {
+
 /**
  * Highlights a given phrase in a text. You can specify any expression in highlighter that
  * may include the \1 expression to include the $phrase found.
@@ -84,6 +88,7 @@ class TextHelper extends AppHelper {
 			return preg_replace('|'.$phrase.'|iu', $highlighter, $text);
 		}
 	}
+
 /**
  * Strips given text of all links (<a href=....)
  *
@@ -94,6 +99,7 @@ class TextHelper extends AppHelper {
 	function stripLinks($text) {
 		return preg_replace('|<a\s+[^>]+>|im', '', preg_replace('|<\/a>|im', '', $text));
 	}
+
 /**
  * Adds links (<a href=....) to a given text, by finding text that begins with
  * strings like http:// and ftp://.
@@ -117,6 +123,7 @@ class TextHelper extends AppHelper {
 		return preg_replace_callback('#(?<!href="|">)(?<!http://|https://|ftp://|nntp://)(www\.[^\n\%\ <]+[^<\n\%\,\.\ <])(?<!\))#i',
 			create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . strtolower($matches[0]),' . $options . ');'), $text);
 	}
+
 /**
  * Adds email links (<a href="mailto:....) to a given text.
  *
@@ -136,6 +143,7 @@ class TextHelper extends AppHelper {
 		return preg_replace_callback('#([_A-Za-z0-9+-]+(?:\.[_A-Za-z0-9+-]+)*@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*)#',
 						create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "mailto:" . $matches[0],' . $options . ');'), $text);
 	}
+
 /**
  * Convert all links and email adresses to HTML links.
  *
@@ -147,6 +155,7 @@ class TextHelper extends AppHelper {
 	function autoLink($text, $htmlOptions = array()) {
 		return $this->autoLinkEmails($this->autoLinkUrls($text, $htmlOptions), $htmlOptions);
 	}
+
 /**
  * Truncates text.
  *
@@ -246,6 +255,7 @@ class TextHelper extends AppHelper {
 
 		return $truncate;
 	}
+
 /**
  * Alias for truncate().
  *
@@ -256,6 +266,7 @@ class TextHelper extends AppHelper {
 		$args = func_get_args();
 		return call_user_func_array(array(&$this, 'truncate'), $args);
 	}
+
 /**
  * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side determined by radius.
  *
@@ -277,17 +288,20 @@ class TextHelper extends AppHelper {
 		}
 
 		$pos = strpos(strtolower($text), strtolower($phrase));
+
 		$startPos = 0;
 		if ($pos > $radius) {
 			$startPos = $pos - $radius;
 		}
+
 		$textLen = strlen($text);
+
 		$endPos = $pos + $phraseLen + $radius;
 		if ($endPos >= $textLen) {
 			$endPos = $textLen;
 		}
-		$excerpt = substr($text, $startPos, $endPos - $startPos);
 
+		$excerpt = substr($text, $startPos, $endPos - $startPos);
 		if ($startPos != 0) {
 			$excerpt = substr_replace($excerpt, $ending, 0, $phraseLen);
 		}
@@ -298,6 +312,7 @@ class TextHelper extends AppHelper {
 
 		return $excerpt;
 	}
+
 /**
  * Creates a comma separated list where the last two items are joined with 'and', forming natural English
  *
@@ -310,32 +325,11 @@ class TextHelper extends AppHelper {
 		$c = count($list) - 1;
 		foreach ($list as $i => $item) {
 			$r .= $item;
-			if ($c > 0 && $i < $c)
-			{
+			if ($c > 0 && $i < $c) {
 				$r .= ($i < $c - 1 ? ', ' : " {$and} ");
 			}
 		}
 		return $r;
 	}
-/**
- * Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax.
- *
- * @param string $text String to "flay"
- * @param boolean $allowHtml Set to true if if html is allowed
- * @return string "Flayed" text
- * @access public
- * @todo Change this. We need a real Textile parser.
- * @codeCoverageIgnoreStart
- */
-	function flay($text, $allowHtml = false) {
-		trigger_error(__('(TextHelper::flay) Deprecated: the Flay library is no longer supported and will be removed in a future version.', true), E_USER_WARNING);
-		if (!class_exists('Flay')) {
-			uses('flay');
-		}
-		return Flay::toHtml($text, false, $allowHtml);
-	}
-/**
- * @codeCoverageIgnoreEnd
- */
 }
 ?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 066d97906..19a19f8a5 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Time Helper class file.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Time Helper class for easy use of time data.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.cake.libs.view.helpers
  */
 class TimeHelper extends AppHelper {
+
 /**
  * Converts given time (in server's time zone) to user's local time, given his/her offset from GMT.
  *
@@ -44,6 +47,7 @@ class TimeHelper extends AppHelper {
 		$userTime = $gmtTime + $userOffset * (60*60);
 		return $userTime;
 	}
+
 /**
  * Returns server's offset from GMT in seconds.
  *
@@ -52,6 +56,7 @@ class TimeHelper extends AppHelper {
 	function serverOffset() {
 		return date('Z', time());
 	}
+
 /**
  * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
@@ -73,6 +78,7 @@ class TimeHelper extends AppHelper {
 		}
 		return $date;
 	}
+
 /**
  * Returns a nicely formatted date string for given Datetime string.
  *
@@ -90,6 +96,7 @@ class TimeHelper extends AppHelper {
 		$ret = date("D, M jS Y, H:i", $date);
 		return $this->output($ret);
 	}
+
 /**
  * Returns a formatted descriptive date string for given datetime string.
  *
@@ -117,6 +124,7 @@ class TimeHelper extends AppHelper {
 
 		return $this->output($ret);
 	}
+
 /**
  * Returns a partial SQL string to search for all records between two dates.
  *
@@ -135,6 +143,7 @@ class TimeHelper extends AppHelper {
 		$ret  ="($fieldName >= '$begin') AND ($fieldName <= '$end')";
 		return $this->output($ret);
 	}
+
 /**
  * Returns a partial SQL string to search for all records between two times
  * occurring on the same day.
@@ -149,6 +158,7 @@ class TimeHelper extends AppHelper {
 		$ret = $this->daysAsSql($dateString, $dateString, $fieldName);
 		return $this->output($ret);
 	}
+
 /**
  * Returns true if given datetime string is today.
  *
@@ -160,6 +170,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString, $userOffset);
 		return date('Y-m-d', $date) == date('Y-m-d', time());
 	}
+
 /**
  * Returns true if given datetime string is within this week
  * @param string $dateString
@@ -170,6 +181,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString, $userOffset);
 		return date('W Y', $date) == date('W Y', time());
 	}
+
 /**
  * Returns true if given datetime string is within this month
  * @param string $dateString
@@ -180,6 +192,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString);
 		return date('m Y',$date) == date('m Y', time());
 	}
+
 /**
  * Returns true if given datetime string is within current year.
  *
@@ -190,6 +203,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString, $userOffset);
 		return  date('Y', $date) == date('Y', time());
 	}
+
 /**
  * Returns true if given datetime string was yesterday.
  *
@@ -201,6 +215,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString, $userOffset);
 		return date('Y-m-d', $date) == date('Y-m-d', strtotime('yesterday'));
 	}
+
 /**
  * Returns true if given datetime string is tomorrow.
  *
@@ -212,6 +227,7 @@ class TimeHelper extends AppHelper {
 		$date = $this->fromString($dateString, $userOffset);
 		return date('Y-m-d', $date) == date('Y-m-d', strtotime('tomorrow'));
 	}
+
 /**
  * Returns the quart
  * @param string $dateString
@@ -246,6 +262,7 @@ class TimeHelper extends AppHelper {
 		}
 		return $this->output($date);
 	}
+
 /**
  * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime().
  *
@@ -257,6 +274,7 @@ class TimeHelper extends AppHelper {
 		$ret = $this->fromString($dateString, $userOffset);
 		return $this->output($ret);
 	}
+
 /**
  * Returns a date formatted for Atom RSS feeds.
  *
@@ -269,6 +287,7 @@ class TimeHelper extends AppHelper {
 		$ret = date('Y-m-d\TH:i:s\Z', $date);
 		return $this->output($ret);
 	}
+
 /**
  * Formats date for RSS feeds
  *
@@ -281,6 +300,7 @@ class TimeHelper extends AppHelper {
 		$ret = date("r", $date);
 		return $this->output($ret);
 	}
+
 /**
  * Returns either a relative date or a formatted date depending
  * on the difference between the current time and given datetime.
@@ -460,6 +480,7 @@ class TimeHelper extends AppHelper {
 		}
 		return $this->output($relativeDate);
 	}
+
 /**
  * Alias for timeAgoInWords
  *
@@ -472,6 +493,7 @@ class TimeHelper extends AppHelper {
 	function relativeTime($dateTime, $options = array()) {
 		return $this->timeAgoInWords($dateTime, $options);
 	}
+
 /**
  * Returns true if specified datetime was within the interval specified, else false.
  *
@@ -481,7 +503,7 @@ class TimeHelper extends AppHelper {
  * @return bool
  */
 	function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
-		$tmp = r(' ', '', $timeInterval);
+		$tmp = str_replace(' ', '', $timeInterval);
 		if (is_numeric($tmp)) {
 			$timeInterval = $tmp . ' ' . __('days', true);
 		}
@@ -495,6 +517,7 @@ class TimeHelper extends AppHelper {
 
 		return false;
 	}
+
 /**
  * Returns gmt, given either a UNIX timestamp or a valid strtotime() date string.
  *
@@ -518,6 +541,7 @@ class TimeHelper extends AppHelper {
 		$return = gmmktime($hour, $minute, $second, $month, $day, $year);
 		return $return;
 	}
+
 /**
  * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index 6377a5260..2a2bb3f52 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XML Helper class file.
  *
@@ -33,6 +34,7 @@ App::import('Core', array('Xml', 'Set'));
  * @subpackage    cake.cake.libs.view.helpers
  */
 class XmlHelper extends AppHelper {
+
 /**
  * Default document encoding
  *
@@ -40,6 +42,7 @@ class XmlHelper extends AppHelper {
  * @var string
  */
 	var $encoding = 'UTF-8';
+
 /**
  * Constructor
  * @return void
@@ -49,6 +52,7 @@ class XmlHelper extends AppHelper {
 		$this->Xml =& new Xml();
 		$this->Xml->options(array('verifyNs' => false));
 	}
+
 /**
  * Returns an XML document header
  *
@@ -69,6 +73,7 @@ class XmlHelper extends AppHelper {
 
 		return $this->output($this->Xml->header($attrib));
 	}
+
 /**
  * Adds a namespace to any documents generated
  *
@@ -82,6 +87,7 @@ class XmlHelper extends AppHelper {
 	function addNs($name, $url = null) {
 		return $this->Xml->addNamespace($name, $url);
 	}
+
 /**
  * Removes a namespace added in addNs()
  *
@@ -92,6 +98,7 @@ class XmlHelper extends AppHelper {
 	function removeNs($name) {
 		return $this->Xml->removeGlobalNamespace($name);
 	}
+
 /**
  * Generates an XML element
  *
@@ -132,6 +139,7 @@ class XmlHelper extends AppHelper {
 		}
 		return $this->output($out);
 	}
+
 /**
  * Create closing tag for current element
  *
@@ -144,6 +152,7 @@ class XmlHelper extends AppHelper {
 		}
 		return $this->output('</' . $name . '>');
 	}
+
 /**
  * Serializes a model resultset into XML
  *
diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp
index ca3459af8..4da27c73a 100644
--- a/cake/libs/view/layouts/ajax.ctp
+++ b/cake/libs/view/layouts/ajax.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index 3b6fac081..0b326d6c0 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp
index a41315a3a..8668b9983 100644
--- a/cake/libs/view/layouts/email/html/default.ctp
+++ b/cake/libs/view/layouts/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp
index 4b0b62c41..eebf48a62 100644
--- a/cake/libs/view/layouts/email/text/default.ctp
+++ b/cake/libs/view/layouts/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -25,4 +26,3 @@
 <?php echo $content_for_layout;?>
 
 This email was sent using the CakePHP Framework, http://cakephp.org.
-
diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp
index d896896eb..6be3e4d29 100644
--- a/cake/libs/view/layouts/flash.ctp
+++ b/cake/libs/view/layouts/flash.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/layouts/xml/default.ctp b/cake/libs/view/layouts/xml/default.ctp
index c68870298..566ca2158 100644
--- a/cake/libs/view/layouts/xml/default.ctp
+++ b/cake/libs/view/layouts/xml/default.ctp
@@ -1,2 +1,2 @@
-<?php e($xml->header()); ?>
+<?php echo $xml->header(); ?>
 <?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 5be837840..739199335 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Methods to display or download any type of file
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 class MediaView extends View {
+
 /**
  * Holds known mime type mappings
  *
@@ -79,6 +81,7 @@ class MediaView extends View {
 								'iges' => 'model/iges', 'igs' => 'model/iges', 'mesh' => 'model/mesh', 'msh' => 'model/mesh',
 								'silo' => 'model/mesh', 'vrml' => 'model/vrml', 'wrl' => 'model/vrml',
 								'mime' => 'www/mime', 'pdb' => 'chemical/x-pdb', 'xyz' => 'chemical/x-pdb');
+
 /**
  * Holds headers sent to browser before rendering media
  *
@@ -86,6 +89,7 @@ class MediaView extends View {
  * @access protected
  */
 	var $_headers = array();
+
 /**
  * Constructor
  *
@@ -94,6 +98,7 @@ class MediaView extends View {
 	function __construct(&$controller) {
 		parent::__construct($controller);
 	}
+
 /**
  * Display or download the given file
  *
@@ -215,6 +220,7 @@ class MediaView extends View {
 		}
 		return false;
 	}
+
 /**
  * Method to set headers
  * @param mixed $header
@@ -235,6 +241,7 @@ class MediaView extends View {
 		$this->_headers[] = array($header => $boolean);
 		return;
 	}
+
 /**
  * Method to output headers
  * @access protected
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index f0e3d9c63..46cc3db3d 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/libs/view/scaffolds/edit.ctp b/cake/libs/view/scaffolds/edit.ctp
index fd537d239..2ff4171bd 100644
--- a/cake/libs/view/scaffolds/edit.ctp
+++ b/cake/libs/view/scaffolds/edit.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -40,8 +41,8 @@
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t<li>".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index'))."</li>\n";
-					echo "\t\t<li>".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add'))."</li>\n";
+					echo "\t\t<li>" . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
+					echo "\t\t<li>" . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index 5d18fef54..004efccf1 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -86,8 +87,8 @@ echo "\n";
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t<li>".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index'))."</li>\n";
-					echo "\t\t<li>".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'))."</li>\n";
+					echo "\t\t<li>" . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+					echo "\t\t<li>" . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 0c5ef7420..3b3de10dd 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -37,14 +38,14 @@ foreach ($scaffoldFields as $_field) {
 		foreach ($associations['belongsTo'] as $_alias => $_details) {
 			if ($_field === $_details['foreignKey']) {
 				$isKey = true;
-				echo "\t\t<dt{$class}>".Inflector::humanize($_alias)."</dt>\n";
+				echo "\t\t<dt{$class}>" . Inflector::humanize($_alias) . "</dt>\n";
 				echo "\t\t<dd{$class}>\n\t\t\t" . $html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t&nbsp;</dd>\n";
 				break;
 			}
 		}
 	}
 	if ($isKey !== true) {
-		echo "\t\t<dt{$class}>".Inflector::humanize($_field)."</dt>\n";
+		echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
 		echo "\t\t<dd{$class}>\n\t\t\t{${$singularVar}[$modelClass][$_field]}\n&nbsp;\t\t</dd>\n";
 	}
 }
@@ -63,8 +64,8 @@ foreach ($scaffoldFields as $_field) {
 	foreach ($associations as $_type => $_data) {
 		foreach ($_data as $_alias => $_details) {
 			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-				echo "\t\t<li>".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index'))."</li>\n";
-				echo "\t\t<li>".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'))."</li>\n";
+				echo "\t\t<li>" . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+				echo "\t\t<li>" . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
 				$done[] = $_details['controller'];
 			}
 		}
@@ -87,8 +88,8 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
 			if ($i++ % 2 == 0) {
 				$class = ' class="altrow"';
 			}
-			echo "\t\t<dt{$class}>".Inflector::humanize($_field)."</dt>\n";
-			echo "\t\t<dd{$class}>\n\t" .${$singularVar}[$_alias][$_field] ."\n&nbsp;</dd>\n";
+			echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
+			echo "\t\t<dd{$class}>\n\t" . ${$singularVar}[$_alias][$_field] . "\n&nbsp;</dd>\n";
 		}
 ?>
 	</dl>
@@ -122,7 +123,7 @@ $otherSingularVar = Inflector::variable($_alias);
 <?php
 		$otherFields = array_keys(${$singularVar}[$_alias][0]);
 		foreach ($otherFields as $_field) {
-			echo "\t\t<th>".Inflector::humanize($_field)."</th>\n";
+			echo "\t\t<th>" . Inflector::humanize($_field) . "</th>\n";
 		}
 ?>
 		<th class="actions">Actions</th>
@@ -137,7 +138,7 @@ $otherSingularVar = Inflector::variable($_alias);
 		echo "\t\t<tr{$class}>\n";
 
 			foreach ($otherFields as $_field) {
-				echo "\t\t\t<td>".${$otherSingularVar}[$_field]."</td>\n";
+				echo "\t\t\t<td>" . ${$otherSingularVar}[$_field] . "</td>\n";
 			}
 
 			echo "\t\t\t<td class=\"actions\">\n";
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 97e2569a5..697328fbb 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * A custom view class that is used for themeing
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Theme view class
  *
@@ -29,24 +31,28 @@
  * @subpackage    cake.cake.libs.view
  */
 class ThemeView extends View {
+
 /**
  * System path to themed element: themed . DS . theme . DS . elements . DS
  *
  * @var string
  */
 	var $themeElement = null;
+
 /**
  * System path to themed layout: themed . DS . theme . DS . layouts . DS
  *
  * @var string
  */
 	var $themeLayout = null;
+
 /**
  * System path to themed: themed . DS . theme . DS
  *
  * @var string
  */
 	var $themePath = null;
+
 /**
  * Enter description here...
  *
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 52fcf76f7..236ef2b9a 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Methods for displaying presentation data in the view.
  *
@@ -22,10 +23,13 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Included libraries.
  */
-App::import('Core', array('Helper', 'ClassRegistry'));
+App::import('Core', 'ClassRegistry');
+App::import('View', 'Helper', false);
+
 /**
  * View, the V in the MVC triad.
  *
@@ -35,6 +39,7 @@ App::import('Core', array('Helper', 'ClassRegistry'));
  * @subpackage    cake.cake.libs.view
  */
 class View extends Object {
+
 /**
  * Path parts for creating links in views.
  *
@@ -42,12 +47,14 @@ class View extends Object {
  * @access public
  */
 	var $base = null;
+
 /**
  * Stores the current URL (for links etc.)
  *
  * @var string Current URL
  */
 	var $here = null;
+
 /**
  * Name of the plugin.
  *
@@ -55,6 +62,7 @@ class View extends Object {
  * @var string
  */
 	var $plugin = null;
+
 /**
  * Name of the controller.
  *
@@ -62,6 +70,7 @@ class View extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * Action to be performed.
  *
@@ -69,24 +78,28 @@ class View extends Object {
  * @access public
  */
 	var $action = null;
+
 /**
  * Array of parameter data
  *
  * @var array Parameter data
  */
 	var $params = array();
+
 /**
  * Current passed params
  *
  * @var mixed
  */
 	var $passedArgs = array();
+
 /**
  * Array of data
  *
  * @var array Parameter data
  */
 	var $data = array();
+
 /**
  * An array of names of built-in helpers to include.
  *
@@ -94,12 +107,14 @@ class View extends Object {
  * @access public
  */
 	var $helpers = array('Html');
+
 /**
  * Path to View.
  *
  * @var string Path to View
  */
 	var $viewPath = null;
+
 /**
  * Variables for the view
  *
@@ -107,6 +122,7 @@ class View extends Object {
  * @access public
  */
 	var $viewVars = array();
+
 /**
  * Name of layout to use with this View.
  *
@@ -114,12 +130,14 @@ class View extends Object {
  * @access public
  */
 	var $layout = 'default';
+
 /**
  * Path to Layout.
  *
  * @var string Path to Layout
  */
 	var $layoutPath = null;
+
 /**
  * Title HTML element of this View.
  *
@@ -127,6 +145,7 @@ class View extends Object {
  * @access public
  */
 	var $pageTitle = false;
+
 /**
  * Turns on or off Cake's conventional mode of rendering views. On by default.
  *
@@ -134,6 +153,7 @@ class View extends Object {
  * @access public
  */
 	var $autoRender = true;
+
 /**
  * Turns on or off Cake's conventional mode of finding layout files. On by default.
  *
@@ -141,24 +161,28 @@ class View extends Object {
  * @access public
  */
 	var $autoLayout = true;
+
 /**
  * File extension. Defaults to Cake's template ".ctp".
  *
  * @var string
  */
 	var $ext = '.ctp';
+
 /**
  * Sub-directory for this view file.
  *
  * @var string
  */
 	var $subDir = null;
+
 /**
  * Theme name.
  *
  * @var string
  */
 	var $themeWeb = null;
+
 /**
  * Used to define methods a controller that will be cached.
  *
@@ -167,72 +191,84 @@ class View extends Object {
  * @access public
  */
 	var $cacheAction = false;
+
 /**
  * holds current errors for the model validation
  *
  * @var array
  */
 	var $validationErrors = array();
+
 /**
  * True when the view has been rendered.
  *
  * @var boolean
  */
 	var $hasRendered = false;
+
 /**
  * Array of loaded view helpers.
  *
  * @var array
  */
 	var $loaded = array();
+
 /**
  * True if in scope of model-specific region
  *
  * @var boolean
  */
 	var $modelScope = false;
+
 /**
  * Name of current model this view context is attached to
  *
  * @var string
  */
 	var $model = null;
+
 /**
  * Name of association model this view context is attached to
  *
  * @var string
  */
 	var $association = null;
+
 /**
  * Name of current model field this view context is attached to
  *
  * @var string
  */
 	var $field = null;
+
 /**
  * Suffix of current field this view context is attached to
  *
  * @var string
  */
 	var $fieldSuffix = null;
+
 /**
  * The current model ID this view context is attached to
  *
  * @var mixed
  */
 	var $modelId = null;
+
 /**
  * List of generated DOM UUIDs
  *
  * @var array
  */
 	var $uuids = array();
+
 /**
  * Holds View output.
  *
  * @var string
  **/
 	var $output = false;
+
 /**
  * List of variables to collect from the associated controller
  *
@@ -244,6 +280,7 @@ class View extends Object {
 		'helpers', 'here', 'layout', 'name', 'pageTitle', 'layoutPath', 'viewPath',
 		'params', 'data', 'plugin', 'passedArgs', 'cacheAction'
 	);
+
 /**
  * Scripts (and/or other <head /> tags) for the layout
  *
@@ -251,12 +288,14 @@ class View extends Object {
  * @access private
  */
 	var $__scripts = array();
+
 /**
  * Holds an array of paths.
  *
  * @var array
  */
 	var $__paths = array();
+
 /**
  * Constructor
  *
@@ -276,6 +315,7 @@ class View extends Object {
 			ClassRegistry::addObject('view', $this);
 		}
 	}
+
 /**
  * Renders a piece of PHP with provided parameters and returns HTML, XML, or any other string.
  *
@@ -352,6 +392,7 @@ class View extends Object {
 			return "Not Found: " . $file;
 		}
 	}
+
 /**
  * Renders view for given action and layout. If $file is given, that is used
  * for a view filename (e.g. customFunkyView.ctp).
@@ -404,6 +445,7 @@ class View extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Renders a layout. Returns output from _render(). Returns false on error.
  * Several variables are created for use in layout.
@@ -417,6 +459,10 @@ class View extends Object {
  */
 	function renderLayout($content_for_layout, $layout = null) {
 		$layoutFileName = $this->_getLayoutFileName($layout);
+		if (empty($layoutFileName)) {
+			return $this->output;
+		}
+
 		$debug = '';
 
 		if (isset($this->viewVars['cakeDebug']) && Configure::read() > 2) {
@@ -463,6 +509,7 @@ class View extends Object {
 
 		return $this->output;
 	}
+
 /**
  * Fire a callback on all loaded Helpers
  *
@@ -484,6 +531,7 @@ class View extends Object {
 			}
 		}
 	}
+
 /**
  * Render cached view
  *
@@ -513,6 +561,7 @@ class View extends Object {
 			}
 		}
 	}
+
 /**
  * Returns a list of variables available in the current View context
  *
@@ -522,6 +571,7 @@ class View extends Object {
 	function getVars() {
 		return array_keys($this->viewVars);
 	}
+
 /**
  * Returns the contents of the given View variable(s)
  *
@@ -535,6 +585,7 @@ class View extends Object {
 			return $this->viewVars[$var];
 		}
 	}
+
 /**
  * Adds a script block or other element to be inserted in $scripts_for_layout in
  * the <head /> of a document layout
@@ -553,6 +604,7 @@ class View extends Object {
 			$this->__scripts[$name] = $content;
 		}
 	}
+
 /**
  * Generates a unique, non-random DOM ID for an object, based on the object type and the target URL.
  *
@@ -572,6 +624,7 @@ class View extends Object {
 		$this->uuids[] = $hash;
 		return $hash;
 	}
+
 /**
  * Returns the entity reference of the current context as an array of identity parts
  *
@@ -583,6 +636,7 @@ class View extends Object {
 			array($assoc, $this->modelId, $this->field, $this->fieldSuffix)
 		));
 	}
+
 /**
  * Allows a template or element to set a variable that will be available in
  * a layout or other element. Analagous to Controller::set.
@@ -617,6 +671,7 @@ class View extends Object {
 			}
 		}
 	}
+
 /**
  * Displays an error page to the user. Uses layouts/error.ctp to render the page.
  *
@@ -631,6 +686,7 @@ class View extends Object {
 			array('code' => $code, 'name' => $name, 'message' => $message)
 		));
 	}
+
 /**
  * Renders and returns output for given view filename with its
  * array of data.
@@ -689,6 +745,7 @@ class View extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Loads helpers, with their dependencies.
  *
@@ -764,6 +821,7 @@ class View extends Object {
 		}
 		return $loaded;
 	}
+
 /**
  * Returns filename of given action's template file (.ctp) as a string.
  * CamelCased action names will be under_scored! This means that you can have
@@ -853,6 +911,7 @@ class View extends Object {
 		}
 		return $this->_missingView($paths[0] . $file . $this->ext, 'missingLayout');
 	}
+
 /**
  * Return a misssing view error message
  *
@@ -878,6 +937,7 @@ class View extends Object {
 			return false;
 		}
 	}
+
 /**
  * Return all possible paths to find view files in order
  *
@@ -892,7 +952,7 @@ class View extends Object {
 		$paths = array();
 		$viewPaths = App::path('views');
 
-		if ($plugin !== null) {
+		if (!empty($plugin)) {
 			$count = count($viewPaths);
 			for ($i = 0; $i < $count; $i++) {
 				$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
@@ -911,6 +971,7 @@ class View extends Object {
 		}
 		return $paths;
 	}
+
 /**
  * @deprecated
  * @see View::element
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 3c79eb630..3d908bea6 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XML handling for Cake.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Core', 'Set');
+
 /**
  * XML node.
  *
@@ -35,6 +37,7 @@ App::import('Core', 'Set');
  * @since         CakePHP v .0.10.3.1400
  */
 class XmlNode extends Object {
+
 /**
  * Name of node
  *
@@ -42,6 +45,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $name = null;
+
 /**
  * Node namespace
  *
@@ -49,6 +53,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $namespace = null;
+
 /**
  * Namespaces defined for this node and all child nodes
  *
@@ -56,6 +61,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $namespaces = array();
+
 /**
  * Value of node
  *
@@ -63,6 +69,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $value;
+
 /**
  * Attributes on this node
  *
@@ -70,6 +77,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $attributes = array();
+
 /**
  * This node's children
  *
@@ -77,6 +85,7 @@ class XmlNode extends Object {
  * @access public
  */
 	var $children = array();
+
 /**
  * Reference to parent node.
  *
@@ -84,6 +93,7 @@ class XmlNode extends Object {
  * @access private
  */
 	var $__parent = null;
+
 /**
  * Constructor.
  *
@@ -125,6 +135,7 @@ class XmlNode extends Object {
 		}
 		return false;
 	}
+
 /**
  * Adds a namespace to the current node
  *
@@ -138,6 +149,7 @@ class XmlNode extends Object {
 		}
 		return false;
 	}
+
 /**
  * Creates an XmlNode object that can be appended to this document or a node in it
  *
@@ -151,6 +163,7 @@ class XmlNode extends Object {
 		$node->setParent($this);
 		return $node;
 	}
+
 /**
  * Creates an XmlElement object that can be appended to this document or a node in it
  *
@@ -165,6 +178,7 @@ class XmlNode extends Object {
 		$element->setParent($this);
 		return $element;
 	}
+
 /**
  * Creates an XmlTextNode object that can be appended to this document or a node in it
  *
@@ -176,6 +190,7 @@ class XmlNode extends Object {
 		$node->setParent($this);
 		return $node;
 	}
+
 /**
  * Gets the XML element properties from an object.
  *
@@ -281,6 +296,7 @@ class XmlNode extends Object {
 		}
 		return $children;
 	}
+
 /**
  * Gets the tag-specific options for the given node name
  *
@@ -308,6 +324,7 @@ class XmlNode extends Object {
 		}
 		return null;
 	}
+
 /**
  * Returns the fully-qualified XML node name, with namespace
  *
@@ -322,6 +339,7 @@ class XmlNode extends Object {
 		}
 		return $this->name;
 	}
+
 /**
  * Sets the parent node of this XmlNode.
  *
@@ -349,6 +367,7 @@ class XmlNode extends Object {
 			$this->__parent =& $parent;
 		}
 	}
+
 /**
  * Returns a copy of self.
  *
@@ -358,6 +377,7 @@ class XmlNode extends Object {
 	function cloneNode() {
 		return clone($this);
 	}
+
 /**
  * Compares $node to this XmlNode object
  *
@@ -369,6 +389,7 @@ class XmlNode extends Object {
 		$keys = array(get_object_vars($this), get_object_vars($node));
 		return ($keys[0] === $keys[1]);
 	}
+
 /**
  * Append given node as a child.
  *
@@ -423,6 +444,7 @@ class XmlNode extends Object {
 
 		return $child;
 	}
+
 /**
  * Returns first child node, or null if empty.
  *
@@ -437,6 +459,7 @@ class XmlNode extends Object {
 			return $return;
 		}
 	}
+
 /**
  * Returns last child node, or null if empty.
  *
@@ -451,6 +474,7 @@ class XmlNode extends Object {
 			return $return;
 		}
 	}
+
 /**
  * Returns child node with given ID.
  *
@@ -476,6 +500,7 @@ class XmlNode extends Object {
 		}
 		return $null;
 	}
+
 /**
  * Gets a list of childnodes with the given tag name.
  *
@@ -493,6 +518,7 @@ class XmlNode extends Object {
 		}
 		return $nodes;
 	}
+
 /**
  * Gets a reference to the next child node in the list of this node's parent.
  *
@@ -512,6 +538,7 @@ class XmlNode extends Object {
 		}
 		return $null;
 	}
+
 /**
  * Gets a reference to the previous child node in the list of this node's parent.
  *
@@ -531,6 +558,7 @@ class XmlNode extends Object {
 		}
 		return $null;
 	}
+
 /**
  * Returns parent node.
  *
@@ -540,6 +568,7 @@ class XmlNode extends Object {
 	function &parent() {
 		return $this->__parent;
 	}
+
 /**
  * Returns the XML document to which this node belongs
  *
@@ -556,6 +585,7 @@ class XmlNode extends Object {
 		}
 		return $document;
 	}
+
 /**
  * Returns true if this structure has child nodes.
  *
@@ -568,6 +598,7 @@ class XmlNode extends Object {
 		}
 		return false;
 	}
+
 /**
  * Returns this XML structure as a string.
  *
@@ -651,6 +682,7 @@ class XmlNode extends Object {
 		}
 		return $d;
 	}
+
 /**
  * Return array representation of current object.
  *
@@ -717,6 +749,7 @@ class XmlNode extends Object {
 		}
 		return $out;
 	}
+
 /**
  * Returns data from toString when this object is converted to a string.
  *
@@ -726,6 +759,7 @@ class XmlNode extends Object {
 	function __toString() {
 		return $this->toString();
 	}
+
 /**
  * Debug method. Deletes the parent. Also deletes this node's children,
  * if given the $recursive parameter.
@@ -761,6 +795,7 @@ class Xml extends XmlNode {
  * @access private
  */
 	var $__parser;
+
 /**
  * File handle to XML indata file.
  *
@@ -768,6 +803,7 @@ class Xml extends XmlNode {
  * @access private
  */
 	var $__file;
+
 /**
  * Raw XML string data (for loading purposes)
  *
@@ -858,6 +894,7 @@ class Xml extends XmlNode {
 		// 	$this->encoding = Configure::read('App.encoding');
 		// }
 	}
+
 /**
  * Initialize XML object from a given XML string. Returns false on error.
  *
@@ -886,6 +923,7 @@ class Xml extends XmlNode {
 		}
 		return $this->parse();
 	}
+
 /**
  * Parses and creates XML nodes from the __rawData property.
  *
@@ -928,6 +966,7 @@ class Xml extends XmlNode {
 		}
 		return true;
 	}
+
 /**
  * Initializes the XML parser resource
  *
@@ -942,6 +981,7 @@ class Xml extends XmlNode {
 			xml_parser_set_option($this->__parser, XML_OPTION_SKIP_WHITE, 1);
 		}
 	}
+
 /**
  * Returns a string representation of the XML object
  *
@@ -955,6 +995,7 @@ class Xml extends XmlNode {
 	function compose($options = array()) {
 		return $this->toString($options);
 	}
+
 /**
  * If debug mode is on, this method echoes an error message.
  *
@@ -968,6 +1009,7 @@ class Xml extends XmlNode {
 			echo $msg . " " . $code . " " . $line;
 		}
 	}
+
 /**
  * Returns a string with a textual description of the error code, or FALSE if no description was found.
  *
@@ -992,6 +1034,7 @@ class Xml extends XmlNode {
 		$return = null;
 		return $return;
 	}
+
 /**
  * Get previous element. NOT implemented.
  *
@@ -1002,6 +1045,7 @@ class Xml extends XmlNode {
 		$return = null;
 		return $return;
 	}
+
 /**
  * Get parent element. NOT implemented.
  *
@@ -1012,6 +1056,7 @@ class Xml extends XmlNode {
 		$return = null;
 		return $return;
 	}
+
 /**
  * Adds a namespace to the current document
  *
@@ -1028,6 +1073,7 @@ class Xml extends XmlNode {
 		}
 		return parent::addNamespace($prefix, $url);
 	}
+
 /**
  * Removes a namespace to the current document
  *
@@ -1043,6 +1089,7 @@ class Xml extends XmlNode {
 		}
 		return parent::removeNamespace($prefix);
 	}
+
 /**
  * Return string representation of current object.
  *
@@ -1067,6 +1114,7 @@ class Xml extends XmlNode {
 
 		return $data;
 	}
+
 /**
  * Return a header used on the first line of the xml file
  *
@@ -1097,6 +1145,7 @@ class Xml extends XmlNode {
 			xml_parser_free($this->__parser);
 		}
 	}
+
 /**
  * Adds a namespace to any XML documents generated or parsed
  *
@@ -1115,6 +1164,7 @@ class Xml extends XmlNode {
 		}
 		return false;
 	}
+
 /**
  * Resolves current namespace
  *
@@ -1137,6 +1187,7 @@ class Xml extends XmlNode {
 		}
 		return array($name => $url);
 	}
+
 /**
  * Alias to Xml::addNs
  *
@@ -1146,6 +1197,7 @@ class Xml extends XmlNode {
 	function addGlobalNamespace($name, $url = null) {
 		return Xml::addGlobalNs($name, $url);
 	}
+
 /**
  * Removes a namespace added in addNs()
  *
@@ -1172,6 +1224,7 @@ class Xml extends XmlNode {
 		}
 		return false;
 	}
+
 /**
  * Alias to Xml::removeNs
  *
@@ -1181,6 +1234,7 @@ class Xml extends XmlNode {
 	function removeGlobalNamespace($name) {
 		return Xml::removeGlobalNs($name);
 	}
+
 /**
  * Sets/gets global XML options
  *
@@ -1195,11 +1249,13 @@ class Xml extends XmlNode {
 		return $_this->options;
 	}
 }
+
 /**
  * The XML Element
  *
  */
 class XmlElement extends XmlNode {
+
 /**
  * Construct an Xml element
  *
@@ -1213,6 +1269,7 @@ class XmlElement extends XmlNode {
 		parent::__construct($name, $value, $namespace);
 		$this->addAttribute($attributes);
 	}
+
 /**
  * Get all the attributes for this element
  *
@@ -1221,6 +1278,7 @@ class XmlElement extends XmlNode {
 	function attributes() {
 		return $this->attributes;
 	}
+
 /**
  * Add attributes to this element
  *
@@ -1257,6 +1315,7 @@ class XmlElement extends XmlNode {
 		}
 		return false;
 	}
+
 /**
  * Remove attributes to this element
  *
@@ -1282,18 +1341,21 @@ class XmlElement extends XmlNode {
  * @since         CakePHP v .1.2.6000
  */
 class XmlTextNode extends XmlNode {
+
 /**
  * Harcoded XML node name, represents this object as a text node
  *
  * @var string
  */
 	var $name = '#text';
+
 /**
  * The text/data value which this node contains
  *
  * @var string
  */
 	var $value = null;
+
 /**
  * Construct text node with the given parent object and data
  *
@@ -1303,6 +1365,7 @@ class XmlTextNode extends XmlNode {
 	function __construct($value = null) {
 		$this->value = $value;
 	}
+
 /**
  * Looks for child nodes in this element
  *
@@ -1311,6 +1374,7 @@ class XmlTextNode extends XmlNode {
 	function hasChildren() {
 		return false;
 	}
+
 /**
  * Append an XML node: XmlTextNode does not support this operation
  *
@@ -1320,6 +1384,7 @@ class XmlTextNode extends XmlNode {
 	function append() {
 		return false;
 	}
+
 /**
  * Return string representation of current text node object.
  *
@@ -1350,6 +1415,7 @@ class XmlTextNode extends XmlNode {
 		return $val;
 	}
 }
+
 /**
  * Manages application-wide namespaces and XML parsing/generation settings.
  * Private class, used exclusively within scope of XML class.
@@ -1365,6 +1431,7 @@ class XmlManager {
  * @access public
  */
 	var $namespaces = array();
+
 /**
  * Global XML document parsing/generation settings.
  *
@@ -1372,6 +1439,7 @@ class XmlManager {
  * @access public
  */
 	var $options = array();
+
 /**
  * Map of common namespace URIs
  *
@@ -1390,6 +1458,7 @@ class XmlManager {
 		'xhtml'		=> 'http://www.w3.org/1999/xhtml',					// XHTML,
 		'atom'	 	=> 'http://www.w3.org/2005/Atom'					// Atom
 	);
+
 /**
  * Returns a reference to the global XML object that manages app-wide XML settings
  *
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 1f277e5f2..972fa0f92 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * BasicsTest file
  *
@@ -26,6 +27,7 @@
  */
 require_once CAKE . 'basics.php';
 App::import('Core', 'Folder');
+
 /**
  * BasicsTest class
  *
@@ -33,6 +35,7 @@ App::import('Core', 'Folder');
  * @subpackage    cake.tests.cases
  */
 class BasicsTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -45,6 +48,7 @@ class BasicsTest extends CakeTestCase {
 		));
 		$this->_language = Configure::read('Config.language');
 	}
+
 /**
  * tearDown method
  *
@@ -55,6 +59,7 @@ class BasicsTest extends CakeTestCase {
 		App::build();
 		Configure::write('Config.language', $this->_language);
 	}
+
 /**
  * testHttpBase method
  *
@@ -95,12 +100,29 @@ class BasicsTest extends CakeTestCase {
 
 		$_SERVER = $_ENV = array();
 
+		$this->assertFalse(env('HTTPS'));
+
 		$_SERVER['HTTPS'] = 'on';
 		$this->assertTrue(env('HTTPS'));
 
+		$_SERVER['HTTPS'] = '1';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 'I am not empty';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 1;
+		$this->assertTrue(env('HTTPS'));
+
 		$_SERVER['HTTPS'] = 'off';
 		$this->assertFalse(env('HTTPS'));
 
+		$_SERVER['HTTPS'] = false;
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = '';
+		$this->assertFalse(env('HTTPS'));
+
 		$_SERVER = array();
 
 		$_ENV['SCRIPT_URI'] = 'https://domain.test/a/test.php';
@@ -125,6 +147,7 @@ class BasicsTest extends CakeTestCase {
 		$_SERVER = $__SERVER;
 		$_ENV = $__ENV;
 	}
+
 /**
  * test uses()
  *
@@ -142,6 +165,7 @@ class BasicsTest extends CakeTestCase {
 		$this->assertTrue(class_exists('Security'));
 		$this->assertTrue(class_exists('Sanitize'));
 	}
+
 /**
  * Test h()
  *
@@ -158,6 +182,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = array('this &amp; that', '&lt;p&gt;Which one&lt;/p&gt;');
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * Test a()
  *
@@ -168,6 +193,7 @@ class BasicsTest extends CakeTestCase {
 		$result = a('this', 'that', 'bar');
 		$this->assertEqual(array('this', 'that', 'bar'), $result);
 	}
+
 /**
  * Test aa()
  *
@@ -183,6 +209,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = array('a' => 'b', 'c' => 'd', 'e' => null);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Test am()
  *
@@ -198,6 +225,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = array('one' => array(4, 5),'two' => array('foo'));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test cache()
  *
@@ -230,6 +258,7 @@ class BasicsTest extends CakeTestCase {
 
 		Configure::write('Cache.disable', $_cacheDisable);
 	}
+
 /**
  * test clearCache()
  *
@@ -272,6 +301,7 @@ class BasicsTest extends CakeTestCase {
 		$this->assertFalse(file_exists(CACHE . 'models' . DS . 'basics_test_2.cache'));
 		$this->assertFalse(file_exists(CACHE . 'models' . DS . 'basics_test_3.cache'));
 	}
+
 /**
  * test __()
  *
@@ -295,6 +325,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __n()
  *
@@ -322,6 +353,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = '%d = 0 or > 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __d()
  *
@@ -349,6 +381,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __dn()
  *
@@ -380,6 +413,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = '%d = 0 or > 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __c()
  *
@@ -389,20 +423,21 @@ class BasicsTest extends CakeTestCase {
 	function test__c() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __c('Plural Rule 1', 5, true);
+		$result = __c('Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __c('Plural Rule 1 (from core)', 5, true);
+		$result = __c('Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__c('Plural Rule 1 (from core)', 5);
+			__c('Plural Rule 1 (from core)', 6);
 		$result = ob_get_clean();
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __dc()
  *
@@ -412,28 +447,29 @@ class BasicsTest extends CakeTestCase {
 	function test__dc() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __dc('default', 'Plural Rule 1', 5, true);
+		$result = __dc('default', 'Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('default', 'Plural Rule 1 (from core)', 5, true);
+		$result = __dc('default', 'Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('core', 'Plural Rule 1', 5, true);
+		$result = __dc('core', 'Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('core', 'Plural Rule 1 (from core)', 5, true);
+		$result = __dc('core', 'Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__dc('default', 'Plural Rule 1 (from core)', 5);
+			__dc('default', 'Plural Rule 1 (from core)', 6);
 		$result = ob_get_clean();
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test __dcn()
  *
@@ -443,24 +479,25 @@ class BasicsTest extends CakeTestCase {
 	function test__dcn() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 5, true);
+		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 6, true);
 		$expected = '%d = 0 or > 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 5, true);
+		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6, true);
 		$expected = '%d = 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 5, true);
+		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 6, true);
 		$expected = '%d = 0 or > 1';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 5);
+			__dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6);
 		$result = ob_get_clean();
 		$expected = '%d = 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test LogError()
  *
@@ -478,6 +515,7 @@ class BasicsTest extends CakeTestCase {
 		$this->assertNoPattern("/Error: Testing with\nmulti-line\nstring/", $result);
 		$this->assertPattern('/Error: Testing with multi-line string/', $result);
 	}
+
 /**
  * test fileExistsInPath()
  *
@@ -522,6 +560,7 @@ class BasicsTest extends CakeTestCase {
 
 		ini_set('include_path', $_includePath);
 	}
+
 /**
  * test convertSlash()
  *
@@ -537,6 +576,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = 'path_to_location';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test debug()
  *
@@ -560,6 +600,7 @@ class BasicsTest extends CakeTestCase {
 		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
 		$this->assertPattern($pattern, $result);
 	}
+
 /**
  * test pr()
  *
@@ -579,6 +620,7 @@ class BasicsTest extends CakeTestCase {
 		$expected = "<pre>Array\n(\n    [this] => is\n    [a] => test\n)\n</pre>";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test params()
  *
@@ -596,6 +638,7 @@ class BasicsTest extends CakeTestCase {
 		$multiple = array(array('weekend'), 'jean-luc', 'godard');
 		$this->assertEqual(params($multiple), $multiple);
 	}
+
 /**
  * test stripslashes_deep()
  *
@@ -633,6 +676,7 @@ class BasicsTest extends CakeTestCase {
 			);
 		$this->assertEqual(stripslashes_deep($nested), $expected);
 	}
+
 /**
  * test stripslashes_deep() with magic_quotes_sybase on
  *
@@ -666,6 +710,7 @@ class BasicsTest extends CakeTestCase {
 			);
 		$this->assertEqual(stripslashes_deep($nested), $expected);
 	}
+
 /**
  * test ife()
  *
diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php
index 901dfc685..04900aa9f 100644
--- a/cake/tests/cases/console/cake.test.php
+++ b/cake/tests/cases/console/cake.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ShellDispatcherTest file
  *
@@ -34,6 +35,9 @@ if (!class_exists('ShellDispatcher')) {
 	require CAKE . 'console' .  DS . 'cake.php';
 	ob_end_clean();
 }
+
+
+require_once CONSOLE_LIBS . 'shell.php';
 /**
  * TestShellDispatcher class
  *
@@ -41,6 +45,7 @@ if (!class_exists('ShellDispatcher')) {
  * @subpackage    cake.tests.cases.console
  */
 class TestShellDispatcher extends ShellDispatcher {
+
 /**
  * params property
  *
@@ -48,6 +53,7 @@ class TestShellDispatcher extends ShellDispatcher {
  * @access public
  */
 	var $params = array();
+
 /**
  * stdout property
  *
@@ -55,6 +61,7 @@ class TestShellDispatcher extends ShellDispatcher {
  * @access public
  */
 	var $stdout = '';
+
 /**
  * stderr property
  *
@@ -62,6 +69,7 @@ class TestShellDispatcher extends ShellDispatcher {
  * @access public
  */
 	var $stderr = '';
+
 /**
  * stopped property
  *
@@ -69,6 +77,14 @@ class TestShellDispatcher extends ShellDispatcher {
  * @access public
  */
 	var $stopped = null;
+
+/**
+ * TestShell
+ *
+ * @var mixed
+ * @access public
+ */
+	var $TestShell;
 /**
  * _initEnvironment method
  *
@@ -77,6 +93,7 @@ class TestShellDispatcher extends ShellDispatcher {
  */
 	function _initEnvironment() {
 	}
+
 /**
  * stderr method
  *
@@ -86,6 +103,7 @@ class TestShellDispatcher extends ShellDispatcher {
 	function stderr($string) {
 		$this->stderr .= rtrim($string, ' ');
 	}
+
 /**
  * stdout method
  *
@@ -99,6 +117,17 @@ class TestShellDispatcher extends ShellDispatcher {
 			$this->stdout .= rtrim($string, ' ');
 		}
 	}
+
+/**
+ * clear method
+ *
+ * @access public
+ * @return void
+ */
+	function clear() {
+		
+	}
+
 /**
  * _stop method
  *
@@ -107,15 +136,41 @@ class TestShellDispatcher extends ShellDispatcher {
  */
 	function _stop($status = 0) {
 		$this->stopped = 'Stopped with status: ' . $status;
+		return $status;
+	}
+/**
+ * getShell
+ *
+ * @param mixed $plugin
+ * @access public
+ * @return mixed
+ */
+	function getShell($plugin = null) {
+		return $this->_getShell($plugin);
+	}
+/**
+ * _getShell
+ *
+ * @param mixed $plugin
+ * @access protected
+ * @return mixed
+ */
+	function _getShell($plugin = null) {
+		if (isset($this->TestShell)) {
+			return $this->TestShell;
+		}
+		return parent::_getShell($plugin);
 	}
 }
+
 /**
  * ShellDispatcherTest
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs
  */
-class ShellDispatcherTest extends UnitTestCase {
+class ShellDispatcherTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -133,6 +188,7 @@ class ShellDispatcherTest extends UnitTestCase {
 			)
 		), true);
 	}
+
 /**
  * tearDown method
  *
@@ -142,6 +198,7 @@ class ShellDispatcherTest extends UnitTestCase {
 	function tearDown() {
 		App::build();
 	}
+
 /**
  * testParseParams method
  *
@@ -394,7 +451,27 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
+
+
+		$params = array(
+			'cake.php',
+			'-working',
+			'D:\www',
+			'bake',
+			'my_app',
+		);
+		$expected = array(
+			'working' => 'D:\www',
+			'app' => 'www',
+			'root' => 'D:',
+			'webroot' => 'webroot'
+		);
+
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
 	}
+
 /**
  * testBuildPaths method
  *
@@ -417,22 +494,422 @@ class ShellDispatcherTest extends UnitTestCase {
 		$this->assertIdentical(array_diff($result, $expected), array());
 		$this->assertIdentical(array_diff($expected, $result), array());
 	}
+
 /**
- * testDispatch method
+ * Verify loading of (plugin-) shells
  *
  * @access public
  * @return void
  */
-	function testDispatch() {
-		$Dispatcher =& new TestShellDispatcher(array('sample'));
-		$this->assertPattern('/This is the main method called from SampleShell/', $Dispatcher->stdout);
+	function testGetShell() {
+		$this->skipIf(class_exists('SampleShell'), '%s SampleShell Class already loaded');
+		$this->skipIf(class_exists('ExampleShell'), '%s ExampleShell Class already loaded');
 
-		$Dispatcher =& new TestShellDispatcher(array('test_plugin_two.example'));
-		$this->assertPattern('/This is the main method called from TestPluginTwo.ExampleShell/', $Dispatcher->stdout);
+		$Dispatcher =& new TestShellDispatcher();
 
-		$Dispatcher =& new TestShellDispatcher(array('test_plugin_two.welcome', 'say_hello'));
-		$this->assertPattern('/This is the say_hello method called from TestPluginTwo.WelcomeShell/', $Dispatcher->stdout);
+		$Dispatcher->shell = 'sample';
+		$Dispatcher->shellName = 'Sample';
+		$Dispatcher->shellClass = 'SampleShell';
+
+		$result = $Dispatcher->getShell();
+		$this->assertIsA($result, 'SampleShell');
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Dispatcher->shell = 'example';
+		$Dispatcher->shellName = 'Example';
+		$Dispatcher->shellClass = 'ExampleShell';
+
+		$result = $Dispatcher->getShell('test_plugin');
+		$this->assertIsA($result, 'ExampleShell');
 	}
+/**
+ * Verify correct dispatch of Shell subclasses with a main method
+ *
+ * @access public
+ * @return void
+ */
+	function testDispatchShellWithMain() {
+		Mock::generate('Shell', 'MockWithMainShell', array('main', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('initdb'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('help');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'help');
+		$result = $Dispatcher->dispatch();
+		$this->assertNull($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectNever('hr');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('dispatch'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('idontexist'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+/**
+ * Verify correct dispatch of Shell subclasses without a main method
+ *
+ * @access public
+ * @return void
+ */
+	function testDispatchShellWithoutMain() {
+		Mock::generate('Shell', 'MockWithoutMainShell', array('initDb', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('initDb');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Shell->expectNever('hr');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+/**
+ * Verify correct dispatch of custom classes with a main method
+ *
+ * @access public
+ * @return void
+ */
+	function testDispatchNotAShellWithMain() {
+		Mock::generate('Object', 'MockWithMainNotAShell',
+			array('main', 'initialize', 'loadTasks', 'startup', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectNever('initialize');
+		$Shell->expectNever('loadTasks');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('initdb'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('dispatch'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('idontexist'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+/**
+ * Verify correct dispatch of custom classes without a main method
+ *
+ * @access public
+ * @return void
+ */
+	function testDispatchNotAShellWithoutMain() {
+		Mock::generate('Object', 'MockWithoutMainNotAShell',
+			array('initDb', 'initialize', 'loadTasks', 'startup', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('initialize');
+		$Shell->expectNever('loadTasks');
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('initDb');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+/**
+ * Verify that a task is called instead of the shell if the first arg equals
+ * the name of the task
+ *
+ * @access public
+ * @return void
+ */
+	function testDispatchTask() {
+		Mock::generate('Shell', 'MockWeekShell', array('main'));
+		Mock::generate('Shell', 'MockOnSundayTask', array('execute'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWeekShell();
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+
+		$Task = new MockOnSundayTask();
+		$Task->setReturnValue('execute', true);
+		$Task->expectOnce('initialize');
+		$Task->expectOnce('loadTasks');
+		$Task->expectOnce('startup');
+		$Task->expectOnce('execute');
+
+		$Shell->MockOnSunday =& $Task;
+		$Shell->taskNames = array('MockOnSunday');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_week', 'mock_on_sunday');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWeekShell();
+		$Task = new MockOnSundayTask();
+		$Task->expectNever('execute');
+		$Task->expectOnce('help');
+
+		$Shell->MockOnSunday =& $Task;
+		$Shell->taskNames = array('MockOnSunday');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_week', 'mock_on_sunday', 'help');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+	}
+/**
+ * Verify shifting of arguments
+ *
+ * @access public
+ * @return void
+ */
+	function testShiftArgs() {
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Dispatcher->args = array('a', 'b', 'c');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array('b', 'c'));
+
+		$Dispatcher->args = array('a' => 'b', 'c', 'd');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'b');
+		$this->assertIdentical($Dispatcher->args, array('c', 'd'));
+
+		$Dispatcher->args = array('a', 'b' => 'c', 'd');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array('b' => 'c', 'd'));
+
+		$Dispatcher->args = array(0 => 'a',  2 => 'b', 30 => 'c');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array(0 => 'b', 1 => 'c'));
+
+		$Dispatcher->args = array();
+		$this->assertNull($Dispatcher->shiftArgs());
+		$this->assertIdentical($Dispatcher->args, array());
+	}
+
 /**
  * testHelpCommand method
  *
@@ -475,7 +952,7 @@ class ShellDispatcherTest extends UnitTestCase {
 	 	$expected = "/ CORE(\\\|\/)tests(\\\|\/)test_app(\\\|\/)vendors(\\\|\/)shells:";
 	 	$expected .= "\n\t sample";
 	 	$expected .= "\n/";
-	 	$this->assertPattern($expected, $Dispatcher->stdout);
+		$this->assertPattern($expected, $Dispatcher->stdout);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index df4e337d8..69185f12f 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AclShell Test file
  *
@@ -22,7 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Shell');
+App::import('Shell', 'Shell', false);
 
 if (!defined('DISABLE_AUTO_DISPATCH')) {
 	define('DISABLE_AUTO_DISPATCH', true);
@@ -47,6 +48,7 @@ Mock::generatePartial(
 	'AclShell', 'MockAclShell',
 	array('in', 'out', 'hr', 'createFile')
 );
+
 /**
  * AclShellTest class
  *
@@ -55,6 +57,7 @@ Mock::generatePartial(
  */
 class AclShellTest extends CakeTestCase {
 	var $fixtures = array('core.aco', 'core.aro', 'core.aros_aco');
+
 /**
  * configure Configure for testcase
  *
@@ -77,6 +80,7 @@ class AclShellTest extends CakeTestCase {
 		Configure::write('Acl.database', $this->_aclDb);
 		Configure::write('Acl.classname', $this->_aclClass);
 	}
+
 /**
  * setUp method
  *
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
index 80a83f586..32208d477 100644
--- a/cake/tests/cases/console/libs/api.test.php
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -1,9 +1,8 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
- * TestTaskTest file
- *
- * Test Case for test generation shell task
+ * ApiShellTest file
  *
  * PHP versions 4 and 5
  *
@@ -24,7 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Shell');
+App::import('Shell', 'Shell', false);
 
 if (!defined('DISABLE_AUTO_DISPATCH')) {
 	define('DISABLE_AUTO_DISPATCH', true);
@@ -51,12 +50,13 @@ Mock::generatePartial(
 );
 
 /**
- * TestTaskTest class
+ * ApiShellTest class
  *
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
-class TestTaskTest extends CakeTestCase {
+class ApiShellTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -68,6 +68,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Shell =& new MockApiShell($this->Dispatcher);
 		$this->Shell->Dispatch = new $this->Dispatcher;
 	}
+
 /**
  * tearDown method
  *
@@ -77,6 +78,7 @@ class TestTaskTest extends CakeTestCase {
 	function endTest() {
 		ClassRegistry::flush();
 	}
+
 /**
  * Test that method names are detected properly including those with no arguments.
  *
@@ -106,10 +108,10 @@ class TestTaskTest extends CakeTestCase {
 				'16. setAction($action)',
 				'17. validate()',
 				'18. validateErrors()'
-			)A
+			)
 		);
 		$this->Shell->expectAt(1, 'out', $expected);
-	
+
 		$this->Shell->args = array('controller');
 		$this->Shell->paths['controller'] = CAKE_CORE_INCLUDE_PATH . DS . LIBS . 'controller' . DS;
 		$this->Shell->main();
diff --git a/cake/tests/cases/console/libs/bake.test.php b/cake/tests/cases/console/libs/bake.test.php
new file mode 100644
index 000000000..cdd42cf39
--- /dev/null
+++ b/cake/tests/cases/console/libs/bake.test.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * BakeShell Test Case
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'bake.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'BakeShellMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'BakeShell', 'MockBakeShell',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generate('DbConfigTask', 'BakeShellMockDbConfigTask');
+Mock::generate('ModelTask', 'BakeShellMockModelTask');
+Mock::generate('ControllerTask', 'BakeShellMockControllerTask');
+
+if (!class_exists('UsersController')) {
+	class UsersController extends Controller {
+		var $name = 'Users';
+	}
+}
+
+class BakeShellTestCase extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ **/
+	var $fixtures = array('core.user');
+
+/**
+ * start test
+ *
+ * @return void
+ **/
+	function startTest() {
+		$this->Dispatch =& new BakeShellMockShellDispatcher();
+		$this->Shell =& new MockBakeShell();
+		$this->Shell->Dispatch =& $this->Dispatch;
+		$this->Shell->Dispatch->shellPaths = App::path('shells');
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ **/
+	function endTest() {
+		unset($this->Dispatch, $this->Shell);
+	}
+
+/**
+ * test bake all
+ *
+ * @return void
+ **/
+	function testAllWithModelName() {
+		$this->Shell->Model =& new BakeShellMockModelTask();
+		$this->Shell->Controller =& new BakeShellMockControllerTask();
+		$this->Shell->View =& new BakeShellMockModelTask();
+		$this->Shell->DbConfig =& new BakeShellMockDbConfigTask();
+
+		$this->Shell->DbConfig->expectOnce('getConfig');
+		$this->Shell->DbConfig->setReturnValue('getConfig', 'test_suite');
+
+		$this->Shell->Model->setReturnValue('bake', true);
+		$this->Shell->Model->expectNever('getName');
+		$this->Shell->Model->expectOnce('bake');
+
+		$this->Shell->Controller->expectOnce('bake');
+		$this->Shell->Controller->setReturnValue('bake', true);
+
+		$this->Shell->View->expectOnce('execute');
+
+		$this->Shell->expectAt(0, 'out', array('Bake All'));
+		$this->Shell->expectAt(1, 'out', array('User Model was baked.'));
+		$this->Shell->expectAt(2, 'out', array('User Controller was baked.'));
+		$this->Shell->expectAt(3, 'out', array('User Views were baked.'));
+		$this->Shell->expectAt(4, 'out', array('Bake All complete'));
+
+		$this->Shell->params = array();
+		$this->Shell->args = array('User');
+		$this->Shell->all();
+	}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index d622cda54..5acf7d6fa 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ShellTest file
  *
@@ -24,7 +25,9 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', array('Shell', 'Folder'));
+App::import('Core', 'Folder');
+App::import('Shell', 'Shell', false);
+
 
 if (!defined('DISABLE_AUTO_DISPATCH')) {
 	define('DISABLE_AUTO_DISPATCH', true);
@@ -41,6 +44,7 @@ Mock::generatePartial(
 				'ShellDispatcher', 'TestShellMockShellDispatcher',
 				array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
 				);
+
 /**
  * TestShell class
  *
@@ -48,7 +52,25 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs
  */
 class TestShell extends Shell {
+/**
+ * stopped property
+ *
+ * @var integer
+ * @access public
+ */
+	var $stopped;
+/**
+ * stop method
+ *
+ * @param integer $status
+ * @access protected
+ * @return void
+ */
+	function _stop($status = 0) {
+		$this->stopped = $status;
+	}
 }
+
 /**
  * TestAppleTask class
  *
@@ -57,6 +79,7 @@ class TestShell extends Shell {
  */
 class TestAppleTask extends Shell {
 }
+
 /**
  * TestBananaTask class
  *
@@ -65,6 +88,7 @@ class TestAppleTask extends Shell {
  */
 class TestBananaTask extends Shell {
 }
+
 /**
  * ShellTest class
  *
@@ -72,6 +96,7 @@ class TestBananaTask extends Shell {
  * @subpackage    cake.tests.cases.console.libs
  */
 class ShellTest extends CakeTestCase {
+
 /**
  * Fixtures used in this test case
  *
@@ -82,6 +107,7 @@ class ShellTest extends CakeTestCase {
 		'core.post', 'core.comment', 'core.article', 'core.user',
 		'core.tag', 'core.articles_tag', 'core.attachment'
 	);
+
 /**
  * setUp method
  *
@@ -92,6 +118,7 @@ class ShellTest extends CakeTestCase {
 		$this->Dispatcher =& new TestShellMockShellDispatcher();
 		$this->Shell =& new TestShell($this->Dispatcher);
 	}
+
 /**
  * tearDown method
  *
@@ -101,6 +128,7 @@ class ShellTest extends CakeTestCase {
 	function tearDown() {
 		ClassRegistry::flush();
 	}
+
 /**
  * testConstruct method
  *
@@ -112,6 +140,7 @@ class ShellTest extends CakeTestCase {
 		$this->assertEqual($this->Shell->name, 'TestShell');
 		$this->assertEqual($this->Shell->alias, 'TestShell');
 	}
+
 /**
  * testInitialize method
  *
@@ -144,19 +173,7 @@ class ShellTest extends CakeTestCase {
 
 		App::build();
 	}
-/**
- * testOut method
- *
- * @return void
- * @access public
- */
-	function testOut() {
-		$this->Shell->Dispatch->expectAt(0, 'stdout', array('Just a test', true));
-		$this->Shell->out('Just a test');
 
-		$this->Shell->Dispatch->expectAt(1, 'stdout', array("Just\na\ntest\n", true));
-		$this->Shell->out(array('Just', 'a', 'test'));
-	}
 /**
  * testIn method
  *
@@ -194,6 +211,95 @@ class ShellTest extends CakeTestCase {
 		$result = $this->Shell->in('Just a test?', 'y/n', 'n');
 		$this->assertEqual($result, 'n');
 	}
+
+/**
+ * testOut method
+ *
+ * @return void
+ * @access public
+ */
+	function testOut() {
+		$this->Shell->Dispatch->expectAt(0, 'stdout', array("Just a test\n", false));
+		$this->Shell->out('Just a test');
+
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array("Just\na\ntest\n", false));
+		$this->Shell->out(array('Just', 'a', 'test'));
+
+		$this->Shell->Dispatch->expectAt(2, 'stdout', array("Just\na\ntest\n\n", false));
+		$this->Shell->out(array('Just', 'a', 'test'), 2);
+	}
+/**
+ * testErr method
+ *
+ * @return void
+ * @access public
+ */
+	function testErr() {
+		$this->Shell->Dispatch->expectAt(0, 'stderr', array("Just a test\n"));
+		$this->Shell->err('Just a test');
+
+		$this->Shell->Dispatch->expectAt(1, 'stderr', array("Just\na\ntest\n"));
+		$this->Shell->err(array('Just', 'a', 'test'));
+
+		$this->Shell->Dispatch->expectAt(2, 'stderr', array("Just\na\ntest\n\n"));
+		$this->Shell->err(array('Just', 'a', 'test'), 2);
+	}
+/**
+ * testNl
+ *
+ * @access public
+ * @return void
+ */
+	function testNl() {
+		$this->assertEqual($this->Shell->nl(), "\n");
+		$this->assertEqual($this->Shell->nl(true), "\n");
+		$this->assertEqual($this->Shell->nl(false), "");
+		$this->assertEqual($this->Shell->nl(2), "\n\n");
+		$this->assertEqual($this->Shell->nl(1), "\n");
+		$this->assertEqual($this->Shell->nl("custom"), "custom\n");
+	}
+/**
+ * testHr
+ *
+ * @access public
+ * @return void
+ */
+	function testHr() {
+		$bar = '---------------------------------------------------------------';
+
+		$this->Shell->Dispatch->expectAt(0, 'stdout', array('', false));
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(2, 'stdout', array('', false));
+		$this->Shell->hr();
+
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array("\n", false));
+		$this->Shell->Dispatch->expectAt(4, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(5, 'stdout', array("\n", false));
+		$this->Shell->hr(true);
+
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array("\n\n", false));
+		$this->Shell->Dispatch->expectAt(4, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(5, 'stdout', array("\n\n", false));
+		$this->Shell->hr(2);
+	}
+/**
+ * testError
+ *
+ * @access public
+ * @return void
+ */
+	function testError() {
+		$this->Shell->Dispatch->expectAt(0, 'stderr', array("Error: Foo Not Found\n"));
+		$this->Shell->error('Foo Not Found');
+		$this->assertIdentical($this->Shell->stopped, 1);
+
+		$this->Shell->stopped = null;
+
+		$this->Shell->Dispatch->expectAt(1, 'stderr', array("Error: Foo Not Found\n"));
+		$this->Shell->Dispatch->expectAt(2, 'stderr', array("Searched all...\n"));
+		$this->Shell->error('Foo Not Found', 'Searched all...');
+		$this->assertIdentical($this->Shell->stopped, 1);
+	}
 /**
  * testLoadTasks method
  *
@@ -236,6 +342,7 @@ class ShellTest extends CakeTestCase {
 		$this->assertIsA($this->Shell->TestApple, 'TestAppleTask');
 		$this->assertIsA($this->Shell->TestBanana, 'TestBananaTask');
 	}
+
 /**
  * testShortPath method
  *
@@ -277,6 +384,7 @@ class ShellTest extends CakeTestCase {
 		$expected = DS . basename(APP) . DS . 'index.php';
 		$this->assertEqual($this->Shell->shortPath($path), $expected);
 	}
+
 /**
  * testCreateFile method
  *
@@ -327,6 +435,7 @@ class ShellTest extends CakeTestCase {
 		$Folder = new Folder($path);
 		$Folder->delete();
 	}
+
 /**
  * testCreateFileWindows method
  *
@@ -334,7 +443,7 @@ class ShellTest extends CakeTestCase {
  * @access public
  */
 	function testCreateFileWindows() {
-		$this->skipUnless(DIRECTORY_SEPARATOR === '\\', '%s Supported on Windows only');
+		$this->skipUnless(DIRECTORY_SEPARATOR === '\\', 'testCreateFileWindows supported on Windows only');
 
 		$path = TMP . 'shell_test';
 		$file = $path . DS . 'file1.php';
diff --git a/cake/tests/cases/console/libs/tasks/controller.test.php b/cake/tests/cases/console/libs/tasks/controller.test.php
new file mode 100644
index 000000000..a55cc71cd
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/controller.test.php
@@ -0,0 +1,478 @@
+<?php
+/**
+ * ControllerTask Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'ClassRegistry');
+App::import('View', 'Helper', false);
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'test.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestControllerTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'ControllerTask', 'MockControllerTask',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generatePartial(
+	'ModelTask', 'ControllerMockModelTask',
+	array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generatePartial(
+	'ProjectTask', 'ControllerMockProjectTask',
+	array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest', 'getAdmin')
+);
+
+Mock::generate('TestTask', 'ControllerMockTestTask');
+
+$imported = App::import('Model', 'Article');
+$imported = $imported || App::import('Model', 'Comment');
+$imported = $imported || App::import('Model', 'Tag');
+
+if (!$imported) {
+	define('ARTICLE_MODEL_CREATED', true);
+	App::import('Core', 'Model');
+
+	class Article extends Model {
+		var $name = 'Article';
+		var $hasMany = array('Comment');
+		var $hasAndBelongsToMany = array('Tag');
+	}
+
+}
+
+/**
+ * ControllerTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ControllerTaskTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ **/
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestControllerTaskMockShellDispatcher();
+		$this->Task =& new MockControllerTask($this->Dispatcher);
+		$this->Task->Dispatch =& new $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Template->params['theme'] = 'default';
+		$this->Task->Model =& new ControllerMockModelTask($this->Task->Dispatch);
+		$this->Task->Project =& new ControllerMockProjectTask($this->Task->Dispatch);
+		$this->Task->Test =& new ControllerMockTestTask();
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * test ListAll
+ *
+ * @return void
+ **/
+	function testListAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = true;
+		$this->Task->expectAt(1, 'out', array('1. Articles'));
+		$this->Task->expectAt(2, 'out', array('2. ArticlesTags'));
+		$this->Task->expectAt(3, 'out', array('3. Comments'));
+		$this->Task->expectAt(4, 'out', array('4. Tags'));
+
+		$expected = array('Articles', 'ArticlesTags', 'Comments', 'Tags');
+		$result = $this->Task->listAll('test_suite');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->expectAt(6, 'out', array('1. Articles'));
+		$this->Task->expectAt(7, 'out', array('2. ArticlesTags'));
+		$this->Task->expectAt(8, 'out', array('4. Comments'));
+		$this->Task->expectAt(9, 'out', array('5. Tags'));
+
+		$this->Task->interactive = false;
+		$result = $this->Task->listAll();
+
+		$expected = array('articles', 'articles_tags', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that getName interacts with the user and returns the controller name.
+ *
+ * @return void
+ **/
+	function testGetName() {
+		$this->Task->setReturnValue('in', 1);
+
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->expectOnce('_stop');
+		$this->Task->getName('test_suite');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Articles';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 3);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Comments';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 10);
+		$result = $this->Task->getName('test_suite');
+		$this->Task->expectOnce('err');
+	}
+
+/**
+ * test helper interactions
+ *
+ * @return void
+ **/
+	function testDoHelpers() {
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->doHelpers();
+		$this->assertEqual($result, array());
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', ' Javascript, Ajax, CustomOne  ');
+		$result = $this->Task->doHelpers();
+		$expected = array('Javascript', 'Ajax', 'CustomOne');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 'y');
+		$this->Task->setReturnValueAt(4, 'in', ' Javascript, Ajax, CustomOne, , ');
+		$result = $this->Task->doHelpers();
+		$expected = array('Javascript', 'Ajax', 'CustomOne');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test component interactions
+ *
+ * @return void
+ **/
+	function testDoComponents() {
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->doComponents();
+		$this->assertEqual($result, array());
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', ' RequestHandler, Security  ');
+		$result = $this->Task->doComponents();
+		$expected = array('RequestHandler', 'Security');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 'y');
+		$this->Task->setReturnValueAt(4, 'in', ' RequestHandler, Security, , ');
+		$result = $this->Task->doComponents();
+		$expected = array('RequestHandler', 'Security');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Confirming controller user interaction
+ *
+ * @return void
+ **/
+	function testConfirmController() {
+		$controller = 'Posts';
+		$scaffold = false;
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$uses = array('Comment', 'User');
+
+		$this->Task->expectAt(2, 'out', array("Controller Name:\n\t$controller"));
+		$this->Task->expectAt(3, 'out', array("Helpers:\n\tAjax, Time"));
+		$this->Task->expectAt(4, 'out', array("Components:\n\tAcl, Auth"));
+		$this->Task->confirmController($controller, $scaffold, $helpers, $components);
+	}
+
+/**
+ * test the bake method
+ *
+ * @return void
+ **/
+	function testBake() {
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$this->Task->setReturnValue('createFile', true);
+
+		$result = $this->Task->bake('Articles', '--actions--', $helpers, $components);
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertPattern('/\$components \= array\(\'Acl\', \'Auth\'\)/', $result);
+		$this->assertPattern('/\$helpers \= array\(\'Html\', \'Form\', \'Ajax\', \'Time\'\)/', $result);
+		$this->assertPattern('/\-\-actions\-\-/', $result);
+
+		$result = $this->Task->bake('Articles', 'scaffold', $helpers, $components);
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertPattern('/var \$scaffold/', $result);
+		$this->assertNoPattern('/helpers/', $result);
+		$this->assertNoPattern('/components/', $result);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ **/
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'ControllerTest';
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$uses = array('Comment', 'User');
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Articles', '--actions--', array(), array(), array());
+
+		$this->Task->plugin = 'controllerTest';
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$this->Task->expectAt(1, 'createFile', array(
+			$path, new PatternExpectation('/ArticlesController extends ControllerTestAppController/')));
+		$this->Task->bake('Articles', '--actions--', array(), array(), array());
+	}
+
+/**
+ * test that bakeActions is creating the correct controller Code. (Using sessions)
+ *
+ * @return void
+ **/
+	function testBakeActionsUsingSessions() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Testing bakeActions requires Article, Comment & Tag Model to be undefined. %s');
+		if ($skip) {
+			return;
+		}
+		$result = $this->Task->bakeActions('Articles', null, true);
+
+		$this->assertTrue(strpos($result, 'function index() {') !== false);
+		$this->assertTrue(strpos($result, '$this->Article->recursive = 0;') !== false);
+		$this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false);
+
+		$this->assertTrue(strpos($result, 'function view($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Invalid Article', true))") !== false);
+		$this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false);
+
+		$this->assertTrue(strpos($result, 'function add()') !== false);
+		$this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The Article has been saved', true))") !== false);
+
+		$this->assertTrue(strpos($result, 'function edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The Article could not be saved. Please, try again.', true));") !== false);
+
+		$this->assertTrue(strpos($result, 'function delete($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->del($id))') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Article deleted', true))") !== false);
+
+
+		$result = $this->Task->bakeActions('Articles', 'admin_', true);
+
+		$this->assertTrue(strpos($result, 'function admin_index() {') !== false);
+		$this->assertTrue(strpos($result, 'function admin_add()') !== false);
+		$this->assertTrue(strpos($result, 'function admin_view($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'function admin_edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'function admin_delete($id = null)') !== false);
+	}
+
+/**
+ * Test baking with Controller::flash() or no sessions.
+ *
+ * @return void
+ **/
+	function testBakeActionsWithNoSessions() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Testing bakeActions requires Article, Tag, Comment Models to be undefined. %s');
+		if ($skip) {
+			return;
+		}
+		$result = $this->Task->bakeActions('Articles', null, false);
+
+		$this->assertTrue(strpos($result, 'function index() {') !== false);
+		$this->assertTrue(strpos($result, '$this->Article->recursive = 0;') !== false);
+		$this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false);
+
+		$this->assertTrue(strpos($result, 'function view($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('Invalid Article', true), array('action' => 'index'))") !== false);
+		$this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false);
+
+		$this->assertTrue(strpos($result, 'function add()') !== false);
+		$this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('The Article has been saved.', true), array('action' => 'index'))") !== false);
+
+		$this->assertTrue(strpos($result, 'function edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Article->Tag->find('list')") !== false);
+		$this->assertTrue(strpos($result, "\$this->set(compact('tags'))") !== false);
+
+		$this->assertTrue(strpos($result, 'function delete($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->del($id))') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('Article deleted', true), array('action' => 'index'))") !== false);
+	}
+
+/**
+ * test baking a test
+ *
+ * @return void
+ **/
+	function testBakeTest() {
+		$this->Task->plugin = 'ControllerTest';
+		$this->Task->connection = 'test_suite';
+
+		$this->Task->Test->expectOnce('bake', array('Controller', 'Articles'));
+		$this->Task->bakeTest('Articles');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
+	}
+
+/**
+ * test Interactive mode.
+ *
+ * @return void
+ **/
+	function testInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path';
+		$this->Task->setReturnValue('in', '1');
+		$this->Task->setReturnValueAt(1, 'in', 'y'); // build interactive
+		$this->Task->setReturnValueAt(2, 'in', 'n'); // build no scaffolds
+		$this->Task->setReturnValueAt(3, 'in', 'y'); // build normal methods
+		$this->Task->setReturnValueAt(4, 'in', 'n'); // build admin methods
+		$this->Task->setReturnValueAt(5, 'in', 'n'); // helpers?
+		$this->Task->setReturnValueAt(6, 'in', 'n'); // components?
+		$this->Task->setReturnValueAt(7, 'in', 'y'); // use sessions
+		$this->Task->setReturnValueAt(8, 'in', 'y'); // looks good
+
+		$this->Task->execute();
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/')));
+	}
+
+/**
+ * test that execute runs all when the first arg == all
+ *
+ * @return void
+ **/
+	function testExecuteIntoAll() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute into all could not be run as an Article, Tag or Comment model was already loaded. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('_checkUnitTest', true);
+		$this->Task->Test->expectCallCount('bake', 1);
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/')));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foo scaffold` works.
+ *
+ * @return void
+ **/
+	function testExecuteWithScaffoldParam() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles', 'scaffold');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new NoPatternExpectation('/admin_index/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foo scaffold admin` works
+ *
+ * @return void
+ **/
+	function testExecuteWithAdminScaffoldParams() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold admin param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->Project->setReturnValue('getAdmin', 'admin_');
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles', 'scaffold', 'admin');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expect('createFile', array(
+			$filename, new PatternExpectation('/admin_index/')
+		));
+
+		$this->Task->execute();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/db_config.test.php b/cake/tests/cases/console/libs/tasks/db_config.test.php
new file mode 100644
index 000000000..4b510a523
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/db_config.test.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * DBConfigTask Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
+//require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestDbConfigTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'DbConfigTask', 'MockDbConfigTask',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+class TEST_DATABASE_CONFIG {
+	var $default = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'database_name',
+		'prefix' => '',
+	);
+	
+	var $otherOne = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'other_one',
+		'prefix' => '',
+	);
+}
+
+/**
+ * DbConfigTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class DbConfigTaskTest extends CakeTestCase {
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestDbConfigTaskMockShellDispatcher();
+		$this->Task =& new MockDbConfigTask($this->Dispatcher);
+		$this->Task->Dispatch =& new $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+
+		$this->Task->params['working'] = rtrim(APP, '/');
+		$this->Task->databaseClassName = 'TEST_DATABASE_CONFIG';
+	}
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+/**
+ * Test the getConfig method.
+ *
+ * @return void
+ **/
+	function testGetConfig() {
+		$this->Task->setReturnValueAt(0, 'in', 'otherOne');
+		$result = $this->Task->getConfig();
+		$this->assertEqual($result, 'otherOne');
+	}
+/**
+ * test that initialize sets the path up.
+ *
+ * @return void
+ **/
+	function testInitialize() {
+		$this->assertTrue(empty($this->Task->path));
+		$this->Task->initialize();
+		$this->assertFalse(empty($this->Task->path));
+		$this->assertEqual($this->Task->path, APP . 'config' . DS);
+		
+	}
+/**
+ * test execute and by extension __interactive
+ *
+ * @return void
+ **/
+	function testExecuteIntoInteractive() {
+		$this->Task->initialize();
+
+		$this->Task->expectOnce('_stop');
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', 'default');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'localhost');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+		$this->Task->setReturnValueAt(4, 'in', 'root');
+		$this->Task->setReturnValueAt(5, 'in', 'password');
+		$this->Task->setReturnValueAt(6, 'in', 'cake_test');
+		$this->Task->setReturnValueAt(7, 'in', 'n');
+		$this->Task->setReturnValueAt(8, 'in', 'y');
+		$this->Task->setReturnValueAt(9, 'in', 'y');
+		$this->Task->setReturnValueAt(10, 'in', 'y');
+		$this->Task->setReturnValueAt(11, 'in', 'n');
+
+		$result = $this->Task->execute();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php
index d393a5275..dbeb7f80c 100644
--- a/cake/tests/cases/console/libs/tasks/extract.test.php
+++ b/cake/tests/cases/console/libs/tasks/extract.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ExtractTaskTest file
  *
@@ -24,7 +25,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', array('Shell', 'Folder'));
+App::import('Core', 'Folder');
+App::import('Shell', 'Shell', false);
 
 if (!defined('DISABLE_AUTO_DISPATCH')) {
 	define('DISABLE_AUTO_DISPATCH', true);
@@ -45,6 +47,7 @@ Mock::generatePartial(
 				'ShellDispatcher', 'TestExtractTaskMockShellDispatcher',
 				array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
 				);
+
 /**
  * ExtractTaskTest class
  *
@@ -52,6 +55,7 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class ExtractTaskTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -62,6 +66,7 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Dispatcher =& new TestExtractTaskMockShellDispatcher();
 		$this->Task =& new ExtractTask($this->Dispatcher);
 	}
+
 /**
  * tearDown method
  *
@@ -71,6 +76,7 @@ class ExtractTaskTest extends CakeTestCase {
 	function tearDown() {
 		ClassRegistry::flush();
 	}
+
 /**
  * testExecute method
  *
diff --git a/cake/tests/cases/console/libs/tasks/fixture.test.php b/cake/tests/cases/console/libs/tasks/fixture.test.php
new file mode 100644
index 000000000..359dd4760
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/fixture.test.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ * FixtureTask Test case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'fixture.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestFixtureTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'FixtureTask', 'MockFixtureTask',
+	array('in', 'out', 'err', 'createFile', '_stop')
+);
+
+Mock::generatePartial(
+	'Shell', 'MockFixtureModelTask',
+	array('in', 'out', 'err', 'createFile', '_stop', 'getName', 'getTable', 'listAll')
+);
+/**
+ * FixtureTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class FixtureTaskTest extends CakeTestCase {
+/**
+ * fixtures
+ *
+ * @var array
+ **/
+	var $fixtures = array('core.article', 'core.comment');
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestFixtureTaskMockShellDispatcher();
+		$this->Task =& new MockFixtureTask();
+		$this->Task->Model =& new MockFixtureModelTask();
+		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template->initialize();
+	}
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+/**
+ * test that initialize sets the path
+ *
+ * @return void
+ **/
+	function testConstruct() {
+		$this->Dispatch->params['working'] = '/my/path';
+		$Task =& new FixtureTask($this->Dispatch);
+
+		$expected = '/my/path/tests/fixtures/';
+		$this->assertEqual($Task->path, $expected);
+	}
+/**
+ * test import option array generation
+ *
+ * @return void
+ **/
+	function testImportOptions() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+
+		$result = $this->Task->importOptions('Article');
+		$expected = array('schema' => 'Article', 'records' => true);
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 'n');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+		$this->Task->setReturnValueAt(4, 'in', 'n');
+
+		$result = $this->Task->importOptions('Article');
+		$expected = array();
+		$this->assertEqual($result, $expected);
+		
+		$this->Task->setReturnValueAt(5, 'in', 'n');
+		$this->Task->setReturnValueAt(6, 'in', 'n');
+		$this->Task->setReturnValueAt(7, 'in', 'y');
+		$result = $this->Task->importOptions('Article');
+		$expected = array('fromTable' => true);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test generating a fixture with database conditions.
+ *
+ * @return void
+ **/
+	function testImportRecordsFromDatabaseWithConditions() {
+		$this->Task->setReturnValueAt(0, 'in', 'WHERE 1=1 LIMIT 10');
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$result = $this->Task->bake('Article', false, array('fromTable' => true, 'schema' => 'Article', 'records' => false));
+
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$records/', $result);
+		$this->assertPattern('/var \$import/', $result);
+		$this->assertPattern("/'title' => 'First Article'/", $result, 'Missing import data %s');
+		$this->assertPattern('/Second Article/', $result, 'Missing import data %s');
+		$this->assertPattern('/Third Article/', $result, 'Missing import data %s');
+	}
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ **/
+	function testExecuteWithNamedModel() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('article');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+	}
+/**
+ * test that execute runs all() when args[0] = all
+ *
+ * @return void
+ **/
+	function testExecuteIntoAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->Model->setReturnValue('listAll', array('articles', 'comments'));
+
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+
+		$filename = '/my/path/comment_fixture.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class CommentFixture/')));
+		$this->Task->execute();
+	}
+/**
+ * test interactive mode of execute
+ *
+ * @return void
+ **/
+	function testExecuteInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->Model->setReturnValue('getName', 'Article');
+		$this->Task->Model->setReturnValue('getTable', 'articles', array('Article'));
+
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+	}
+/**
+ * Test that bake works
+ *
+ * @return void
+ **/
+	function testBake() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$result = $this->Task->bake('Article');
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$fields/', $result);
+		$this->assertPattern('/var \$records/', $result);
+		$this->assertNoPattern('/var \$import/', $result);
+
+		$result = $this->Task->bake('Article', 'comments');
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$name \= \'Article\';/', $result);
+		$this->assertPattern('/var \$table \= \'comments\';/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('records' => true));
+		$this->assertPattern("/var \\\$import \= array\('records' \=\> true\);/", $result);
+		$this->assertNoPattern('/var \$records/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('schema' => 'Article'));
+		$this->assertPattern("/var \\\$import \= array\('model' \=\> 'Article'\);/", $result);
+		$this->assertNoPattern('/var \$fields/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('schema' => 'Article', 'records' => true));
+		$this->assertPattern("/var \\\$import \= array\('model' \=\> 'Article'\, 'records' \=\> true\);/", $result);
+		$this->assertNoPattern('/var \$fields/', $result);
+		$this->assertNoPattern('/var \$records/', $result);
+	}
+/**
+ * Test that file generation includes headers and correct path for plugins.
+ *
+ * @return void
+ **/
+	function testGenerateFixtureFile() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$filename = '/my/path/article_fixture.php';
+
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/Article/')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/\<\?php(.*)\?\>/ms')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+	}
+/**
+ * test generating files into plugins.
+ *
+ * @return void
+ **/
+	function testGeneratePluginFixtureFile() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->plugin = 'TestFixture';
+		$filename = APP . 'plugins' . DS . 'test_fixture' . DS . 'tests' . DS . 'fixtures' . DS . 'article_fixture.php';
+
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/Article/')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
new file mode 100644
index 000000000..ec8136079
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -0,0 +1,755 @@
+<?php
+/**
+ * TestTaskTest file
+ *
+ * Test Case for test generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2009, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.3
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'fixture.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestModelTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'ModelTask', 'MockModelTask',
+	array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generate(
+	'Model', 'MockModelTaskModel'
+);
+
+Mock::generate(
+	'FixtureTask', 'MockModelTaskFixtureTask'
+);
+
+/**
+ * ModelTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ModelTaskTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ **/
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag', 'core.category_thread');
+
+/**
+ * starTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestModelTaskMockShellDispatcher();
+		$this->Task =& new MockModelTask($this->Dispatcher);
+		$this->Task->Dispatch =& new $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Fixture =& new MockModelTaskFixtureTask();
+		$this->Task->Test =& new MockModelTaskFixtureTask();
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * Test that listAll scans the database connection and lists all the tables in it.s
+ *
+ * @return void
+ **/
+	function testListAll() {
+		$this->Task->expectAt(1, 'out', array('1. Article'));
+		$this->Task->expectAt(2, 'out', array('2. ArticlesTag'));
+		$this->Task->expectAt(3, 'out', array('3. CategoryThread'));
+		$this->Task->expectAt(4, 'out', array('4. Comment'));
+		$this->Task->expectAt(5, 'out', array('5. Tag'));
+		$result = $this->Task->listAll('test_suite');
+		$expected = array('articles', 'articles_tags', 'category_threads', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->expectAt(7, 'out', array('1. Article'));
+		$this->Task->expectAt(8, 'out', array('2. ArticlesTag'));
+		$this->Task->expectAt(9, 'out', array('3. CategoryThread'));
+		$this->Task->expectAt(10, 'out', array('4. Comment'));
+		$this->Task->expectAt(11, 'out', array('5. Tag'));
+
+		$this->Task->connection = 'test_suite';
+		$result = $this->Task->listAll();
+		$expected = array('articles', 'articles_tags', 'category_threads', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that getName interacts with the user and returns the model name.
+ *
+ * @return void
+ **/
+	function testGetName() {
+		$this->Task->setReturnValue('in', 1);
+
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->expectOnce('_stop');
+		$this->Task->getName('test_suite');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Article';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 4);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Comment';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 10);
+		$result = $this->Task->getName('test_suite');
+		$this->Task->expectOnce('err');
+	}
+
+/**
+ * Test table name interactions
+ *
+ * @return void
+ **/
+	function testGetTableName() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'articles';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'my_table');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'my_table';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that initializing the validations works.
+ *
+ * @return void
+ **/
+	function testInitValidations() {
+		$result = $this->Task->initValidations();
+		$this->assertTrue(in_array('notempty', $result));
+	}
+
+/**
+ * test that individual field validation works, with interactive = false
+ * tests the guessing features of validation
+ *
+ * @return void
+ **/
+	function testFieldValidationGuessing() {
+		$this->Task->interactive = false;
+		$this->Task->initValidations();
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('notempty' => 'notempty');
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false));
+		$expected = array('date' => 'date');
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'time', 'length' => 10, 'null' => false));
+		$expected = array('time' => 'time');
+
+		$result = $this->Task->fieldValidation('email', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('email' => 'email');
+
+		$result = $this->Task->fieldValidation('test', array('type' => 'integer', 'length' => 10, 'null' => false));
+		$expected = array('numeric' => 'numeric');
+
+		$result = $this->Task->fieldValidation('test', array('type' => 'boolean', 'length' => 10, 'null' => false));
+		$expected = array('numeric' => 'numeric');
+	}
+
+/**
+ * test that interactive field validation works and returns multiple validators.
+ *
+ * @return void
+ **/
+	function testInteractiveFieldValidation() {
+		$this->Task->initValidations();
+		$this->Task->interactive = true;
+		$this->Task->setReturnValueAt(0, 'in', '20');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', '16');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('notempty' => 'notempty', 'maxlength' => 'maxlength');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test the validation Generation routine
+ *
+ * @return void
+ **/
+	function testNonInteractiveDoValidation() {
+		$Model =& new MockModelTaskModel();
+		$Model->primaryKey = 'id';
+		$Model->setReturnValue('schema', array(
+			'id' => array(
+				'type' => 'integer',
+				'length' => 11,
+				'null' => false,
+				'key' => 'primary',
+			),
+			'name' => array(
+				'type' => 'string',
+				'length' => 20,
+				'null' => false,
+			),
+			'email' => array(
+				'type' => 'string',
+				'length' => 255,
+				'null' => false,
+			),
+			'some_date' => array(
+				'type' => 'date',
+				'length' => '',
+				'null' => false,
+			),
+			'some_time' => array(
+				'type' => 'time',
+				'length' => '',
+				'null' => false,
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'length' => '',
+				'null' => false,
+			)
+		));
+		$this->Task->interactive = false;
+
+		$result = $this->Task->doValidation($Model);
+		$expected = array(
+			'name' => array(
+				'notempty' => 'notempty'
+			),
+			'email' => array(
+				'email' => 'email',
+			),
+			'some_date' => array(
+				'date' => 'date'
+			),
+			'some_time' => array(
+				'time' => 'time'
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that finding primary key works
+ *
+ * @return void
+ **/
+	function testFindPrimaryKey() {
+		$fields = array(
+			'one' => array(),
+			'two' => array(),
+			'key' => array('key' => 'primary')
+		);
+		$this->Task->expectAt(0, 'in', array('*', null, 'key'));
+		$this->Task->setReturnValue('in', 'my_field');
+		$result = $this->Task->findPrimaryKey($fields);
+		$expected = 'my_field';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test finding Display field
+ *
+ * @return void
+ **/
+	function testFindDisplayField() {
+		$fields = array('id' => array(), 'tagname' => array(), 'body' => array(),
+			'created' => array(), 'modified' => array());
+
+		$this->Task->setReturnValue('in', 'n');
+		$this->Task->setReturnValueAt(0, 'in', 'n');
+		$result = $this->Task->findDisplayField($fields);
+		$this->assertFalse($result);
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', 2);
+		$result = $this->Task->findDisplayField($fields);
+		$this->assertEqual($result, 'tagname');
+	}
+
+/**
+ * test that belongsTo generation works.
+ *
+ * @return void
+ **/
+	function testBelongsToGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Comment'));
+		$result = $this->Task->findBelongsTo($model, array());
+		$expected = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'Article',
+					'className' => 'Article',
+					'foreignKey' => 'article_id',
+				),
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$result = $this->Task->findBelongsTo($model, array());
+		$expected = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'ParentCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that hasOne and/or hasMany relations are generated properly.
+ *
+ * @return void
+ **/
+	function testHasManyHasOneGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$this->Task->connection = 'test_suite';
+		$this->Task->listAll();
+		$result = $this->Task->findHasOneAndMany($model, array());
+		$expected = array(
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+			'hasOne' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$result = $this->Task->findHasOneAndMany($model, array());
+		$expected = array(
+			'hasOne' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that habtm generation works
+ *
+ * @return void
+ **/
+	function testHasAndBelongsToManyGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$this->Task->connection = 'test_suite';
+		$this->Task->listAll();
+		$result = $this->Task->findHasAndBelongsToMany($model, array());
+		$expected = array(
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test non interactive doAssociations
+ *
+ * @return void
+ **/
+	function testDoAssociationsNonInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = false;
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$result = $this->Task->doAssociations($model);
+		$expected = array(
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			),
+		);
+
+	}
+
+/**
+ * Ensure that the fixutre object is correctly called.
+ *
+ * @return void
+ **/
+	function testBakeFixture() {
+		$this->Task->Fixture->expectAt(0, 'bake', array('Article', 'articles'));
+		$this->Task->bakeFixture('Article', 'articles');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Fixture->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Fixture->connection);
+	}
+
+/**
+ * Ensure that the test object is correctly called.
+ *
+ * @return void
+ **/
+	function testBakeTest() {
+		$this->Task->Test->expectAt(0, 'bake', array('Model', 'Article'));
+		$this->Task->bakeTest('Article');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
+	}
+
+/**
+ * test confirming of associations, and that when an association is hasMany
+ * a question for the hasOne is also not asked.
+ *
+ * @return void
+ **/
+	function testConfirmAssociations() {
+		$associations = array(
+			'hasOne' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'belongsTo' => array(
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			)
+		);
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$result = $this->Task->confirmAssociations($model, $associations);
+		$this->assertTrue(empty($result['hasOne']));
+
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->confirmAssociations($model, $associations);
+		$this->assertTrue(empty($result['hasMany']));
+		$this->assertTrue(empty($result['hasOne']));
+	}
+
+/**
+ * test that inOptions generates questions and only accepts a valid answer
+ *
+ * @return void
+ **/
+	function testInOptions() {
+		$options = array('one', 'two', 'three');
+		$this->Task->expectAt(0, 'out', array('1. one'));
+		$this->Task->expectAt(1, 'out', array('2. two'));
+		$this->Task->expectAt(2, 'out', array('3. three'));
+		$this->Task->setReturnValueAt(0, 'in', 10);
+
+		$this->Task->expectAt(3, 'out', array('1. one'));
+		$this->Task->expectAt(4, 'out', array('2. two'));
+		$this->Task->expectAt(5, 'out', array('3. three'));
+		$this->Task->setReturnValueAt(1, 'in', 2);
+		$result = $this->Task->inOptions($options, 'Pick a number');
+		$this->assertEqual($result, 1);
+	}
+
+/**
+ * test baking validation
+ *
+ * @return void
+ **/
+	function testBakeValidation() {
+		$validate = array(
+			'name' => array(
+				'notempty' => 'notempty'
+			),
+			'email' => array(
+				'email' => 'email',
+			),
+			'some_date' => array(
+				'date' => 'date'
+			),
+			'some_time' => array(
+				'time' => 'time'
+			)
+		);
+		$result = $this->Task->bake('Article', compact('validate'));
+		$this->assertPattern('/class Article extends AppModel \{/', $result);
+		$this->assertPattern('/\$name \= \'Article\'/', $result);
+		$this->assertPattern('/\$validate \= array\(/', $result);
+		$pattern = '/' . preg_quote("'notempty' => array('rule' => array('notempty')),", '/') . '/';
+		$this->assertPattern($pattern, $result);
+	}
+
+/**
+ * test baking relations
+ *
+ * @return void
+ **/
+	function testBakeRelations() {
+		$associations = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'SomethingElse',
+					'className' => 'SomethingElse',
+					'foreignKey' => 'something_else_id',
+				),
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			),
+			'hasOne' => array(
+				array(
+					'alias' => 'OtherModel',
+					'className' => 'OtherModel',
+					'foreignKey' => 'other_model_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			)
+		);
+		$result = $this->Task->bake('Article', compact('associations'));
+		$this->assertPattern('/\$hasAndBelongsToMany \= array\(/', $result);
+		$this->assertPattern('/\$hasMany \= array\(/', $result);
+		$this->assertPattern('/\$belongsTo \= array\(/', $result);
+		$this->assertPattern('/\$hasOne \= array\(/', $result);
+		$this->assertPattern('/Tag/', $result);
+		$this->assertPattern('/OtherModel/', $result);
+		$this->assertPattern('/SomethingElse/', $result);
+		$this->assertPattern('/Comment/', $result);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ **/
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'ControllerTest';
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'models' . DS . 'article.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Article', array(), array());
+
+		$this->Task->plugin = 'controllerTest';
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'models' . DS . 'article.php';
+		$this->Task->expectAt(1, 'createFile', array(
+		$path, new PatternExpectation('/Article extends ControllerTestAppModel/')));
+		$this->Task->bake('Article', array(), array());
+	}
+
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ **/
+	function testExecuteWithNamedModel() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('article');
+		$filename = '/my/path/article.php';
+		$this->Task->setReturnValue('_checkUnitTest', 1);
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test that execute runs all() when args[0] = all
+ *
+ * @return void
+ **/
+	function testExecuteIntoAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->setReturnValue('_checkUnitTest', true);
+
+		$this->Task->Fixture->expectCallCount('bake', 5);
+		$this->Task->Test->expectCallCount('bake', 5);
+
+		$filename = '/my/path/article.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article/')));
+
+		$filename = '/my/path/articles_tag.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class ArticlesTag/')));
+
+		$filename = '/my/path/category_thread.php';
+		$this->Task->expectAt(2, 'createFile', array($filename, new PatternExpectation('/class CategoryThread/')));
+
+		$filename = '/my/path/comment.php';
+		$this->Task->expectAt(3, 'createFile', array($filename, new PatternExpectation('/class Comment/')));
+
+		$filename = '/my/path/tag.php';
+		$this->Task->expectAt(4, 'createFile', array($filename, new PatternExpectation('/class Tag/')));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test the interactive side of bake.
+ *
+ * @return void
+ **/
+	function testExecuteIntoInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->interactive = true;
+
+		$this->Task->setReturnValueAt(0, 'in', '1'); //choose article
+		$this->Task->setReturnValueAt(1, 'in', 'n'); //no validation
+		$this->Task->setReturnValueAt(2, 'in', 'y'); //yes to associations
+		$this->Task->setReturnValueAt(3, 'in', 'y'); //yes to comment relation
+		$this->Task->setReturnValueAt(4, 'in', 'y'); //yes to user relation
+		$this->Task->setReturnValueAt(5, 'in', 'y'); //yes to tag relation
+		$this->Task->setReturnValueAt(6, 'in', 'n'); //no to additional assocs
+		$this->Task->setReturnValueAt(7, 'in', 'y'); //yes to looksGood?
+		$this->Task->setReturnValue('_checkUnitTest', true);
+
+		$this->Task->Test->expectOnce('bake');
+		$this->Task->Fixture->expectOnce('bake');
+
+		$filename = '/my/path/article.php';
+		$this->Task->expectOnce('createFile');
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test using bake interactively with a table that does not exist.
+ *
+ * @return void
+ **/
+	function testExecuteWithNonExistantTableName() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$this->Task->expectOnce('_stop');
+		$this->Task->expectOnce('err');
+
+		$this->Task->setReturnValueAt(0, 'in', 'Foobar');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->execute();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/plugin.test.php b/cake/tests/cases/console/libs/tasks/plugin.test.php
new file mode 100644
index 000000000..15159e018
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/plugin.test.php
@@ -0,0 +1,261 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ * PluginTask Test file
+ *
+ * Test Case for plugin generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2009, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.3.0
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'plugin.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestPluginTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'PluginTask', 'MockPluginTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+Mock::generate('ModelTask', 'PluginTestMockModelTask');
+
+/**
+ * PluginTaskPlugin class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class PluginTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestPluginTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockPluginTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->path = TMP . 'tests' . DS;
+	}
+
+/**
+ * startCase methods
+ *
+ * @return void
+ **/
+	function startCase() {
+		$this->_paths = $paths = App::path('plugins');
+		$this->_testPath = array_push($paths, TMP . 'tests' . DS);
+		App::build(array('plugins' => $paths));
+	}
+
+/**
+ * endCase
+ *
+ * @return void
+ **/
+	function endCase() {
+		App::build(array('plugins' => $this->_paths));
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * test bake()
+ *
+ * @return void
+ **/
+	function testBakeFoldersAndFiles() {
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->bake('BakeTestPlugin');
+
+		$path = $this->Task->path . 'bake_test_plugin';
+		$this->assertTrue(is_dir($path), 'No plugin dir %s');
+
+		$this->assertTrue(is_dir($path . DS . 'config'), 'No config dir %s');
+		$this->assertTrue(is_dir($path . DS . 'config' . DS . 'sql'), 'No config dir %s');
+		$this->assertTrue(file_exists($path . DS . 'config' . DS . 'sql' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(file_exists($path . DS . 'controllers' . DS . 'components' . DS . 'empty'), 'No empty file %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(file_exists($path . DS . 'models' . DS . 'behaviors' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(file_exists($path . DS . 'views' . DS . 'helpers' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+
+		$this->assertTrue(
+			is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'components'), 'No components cases dir %s'
+		);
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'components' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors'), 'No behaviors cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'helpers'), 'No helpers cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'models'), 'No models cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(
+			is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'controllers'),
+			'No controllers cases dir %s'
+		);
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'controllers' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(file_exists($path . DS . 'tests' . DS . 'groups' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+		$this->assertTrue(file_exists($path . DS . 'tests' . DS . 'fixtures' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'vendors'), 'No vendors dir %s');
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'css'), 'No vendors css dir %s');
+		$this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'css' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'js'), 'No vendors js dir %s');
+		$this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'js' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'img'), 'No vendors img dir %s');
+		$this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'img' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'shells'), 'No vendors shells dir %s');
+		$this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'shells' . DS . 'empty'), 'No empty file %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder->delete();
+	}
+
+/**
+ * test execute with no args, flowing into interactive,
+ *
+ * @return void
+ **/
+	function testExecuteWithNoArgs() {
+		$this->Task->setReturnValueAt(0, 'in', 'TestPlugin');
+		$this->Task->setReturnValueAt(1, 'in', '2');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+
+		$path = $this->Task->path . 'test_plugin';
+		$file = $path . DS . 'test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$this->Task->args = array();
+		$this->Task->execute();
+	}
+
+/**
+ * Test Execute
+ *
+ * @return void
+ **/
+	function testExecuteWithOneArg() {
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->Dispatch->args = array('BakeTestPlugin');
+		$this->Task->args =& $this->Task->Dispatch->args;
+
+		$path = $this->Task->path . 'bake_test_plugin';
+		$file = $path . DS . 'bake_test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$this->Task->execute();
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder->delete();
+	}
+
+/**
+ * test execute chaining into MVC parts
+ *
+ * @return void
+ **/
+	function testExecuteWithTwoArgs() {
+		$this->Task->Model =& new PluginTestMockModelTask();
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin', true);
+
+		$this->Task->Dispatch->args = array('BakeTestPlugin', 'model');
+		$this->Task->args =& $this->Task->Dispatch->args;
+
+		$this->Task->Model->expectOnce('loadTasks');
+		$this->Task->Model->expectOnce('execute');
+		$this->Task->execute();
+		$Folder->delete();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php
new file mode 100644
index 000000000..6bcd72a5b
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/project.test.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * ProjectTask Test file
+ *
+ * Test Case for project generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2009, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.3.0
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+if (!class_exists('ProjectTask')) {
+	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+}
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestProjectTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ProjectTask', 'MockProjectTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+/**
+ * ProjectTask Test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ProjectTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestProjectTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockProjectTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->path = TMP . 'tests' . DS;
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_app');
+		$Folder->delete();
+	}
+
+/**
+ * creates a test project that is used for testing project task.
+ *
+ * @return void
+ **/
+	function _setupTestProject() {
+		$skel = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS . 'templates' . DS . 'skel';
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
+	}
+
+/**
+ * test bake() method and directory creation.
+ *
+ * @return void
+ **/
+	function testBake() {
+		$this->_setupTestProject();
+
+		$path = $this->Task->path . 'bake_test_app';
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+	}
+
+/**
+ * test generation of Security.salt
+ *
+ * @return void
+ **/
+	function testSecuritySaltGeneration() {
+		$this->_setupTestProject();
+
+		$path = $this->Task->path . 'bake_test_app' . DS;
+		$result = $this->Task->securitySalt($path);
+		$this->assertTrue($result);
+
+		$file =& new File($path . 'config' . DS . 'core.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
+	}
+
+/**
+ * test getAdmin method, and that it returns Routing.admin or writes to config file.
+ *
+ * @return void
+ **/
+	function testGetAdmin() {
+		Configure::write('Routing.admin', 'admin');
+		$result = $this->Task->getAdmin();
+		$this->assertEqual($result, 'admin_');
+
+		Configure::write('Routing.admin', null);
+		$this->_setupTestProject();
+		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'config' . DS;
+		$this->Task->setReturnValue('in', 'super_duper_admin');
+
+		$result = $this->Task->getAdmin();
+		$this->assertEqual($result, 'super_duper_admin_');
+	}
+
+/**
+ * Test execute method with one param to destination folder.
+ *
+ * @return void
+ **/
+	function testExecute() {
+		$this->Task->params['skel'] = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS . 'templates' . DS . 'skel';
+		$this->Task->params['working'] = TMP . 'tests' . DS;
+
+		$path = $this->Task->path . 'bake_test_app';
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', $path);
+
+		$this->Task->execute();
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/template.test.php b/cake/tests/cases/console/libs/tasks/template.test.php
new file mode 100644
index 000000000..f6234f2b7
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/template.test.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * TemplateTask file
+ *
+ * Test Case for TemplateTask generation shell task
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestTemplateTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'TemplateTask', 'MockTemplateTask',
+	array('in', 'out', 'err', 'createFile', '_stop')
+);
+
+/**
+ * TemplateTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class TemplateTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestTemplateTaskMockShellDispatcher();
+		$this->Task =& new MockTemplateTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * test that set sets variables
+ *
+ * @return void
+ **/
+	function testSet() {
+		$this->Task->set('one', 'two');
+		$this->assertTrue(isset($this->Task->templateVars['one']));
+		$this->assertEqual($this->Task->templateVars['one'], 'two');
+
+		$this->Task->set(array('one' => 'three', 'four' => 'five'));
+		$this->assertTrue(isset($this->Task->templateVars['one']));
+		$this->assertEqual($this->Task->templateVars['one'], 'three');
+		$this->assertTrue(isset($this->Task->templateVars['four']));
+		$this->assertEqual($this->Task->templateVars['four'], 'five');
+	}
+
+/**
+ * test finding themes installed in
+ *
+ * @return void
+ **/
+	function testFindingInstalledThemesForBake() {
+		$consoleLibs = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS;
+		$this->Task->Dispatch->shellPaths = array($consoleLibs);
+		$this->Task->initialize();
+		$this->assertEqual($this->Task->templatePaths, array('default' => $consoleLibs . 'templates' . DS . 'default' . DS));
+	}
+
+/**
+ * test getting the correct theme name.  Ensure that with only one theme, or a theme param
+ * that the user is not bugged.  If there are more, find and return the correct theme name
+ *
+ * @return void
+ **/
+	function testGetThemePath() {
+		$defaultTheme = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS . 'templates' . DS . 'default' .DS;
+		$this->Task->templatePaths = array('default' => $defaultTheme);
+		$this->Task->expectCallCount('in', 1);
+
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, $defaultTheme);
+
+		$this->Task->templatePaths = array('default' => $defaultTheme, 'other' => '/some/path');
+		$this->Task->params['theme'] = 'other';
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, '/some/path');
+
+		$this->Task->params = array();
+		$this->Task->setReturnValueAt(0, 'in', '1');
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, $defaultTheme);
+		$this->assertEqual($this->Dispatcher->params['theme'], 'default');
+	}
+
+/**
+ * test generate
+ *
+ * @return void
+ **/
+	function testGenerate() {
+		$this->Task->Dispatch->shellPaths = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS
+		);
+		$this->Task->initialize();
+		$result = $this->Task->generate('classes', 'test_object', array('test' => 'foo'));
+		$expected = "I got rendered\nfoo";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test generate with a missing template in the chosen theme.
+ * ensure fallback to default works.
+ *
+ * @return void
+ **/
+	function testGenerateWithTemplateFallbacks() {
+		$this->Task->Dispatch->shellPaths = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS,
+			CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS
+		);
+		$this->Task->initialize();
+		$this->Task->params['theme'] = 'test';
+		$this->Task->set(array(
+			'model' => 'Article',
+			'table' => 'articles',
+			'import' => false,
+			'records' => false,
+			'schema' => ''
+		));
+		$result = $this->Task->generate('classes', 'fixture');
+		$this->assertPattern('/ArticleFixture extends CakeTestFixture/', $result);
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index c8835cfcb..0283c5f70 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -8,23 +8,22 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2009, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', 'Shell');
+App::import('Shell', 'Shell', false);
+App::import('Controller', 'Controller', false);
+App::import('Model', 'Model', false);
 
 if (!defined('DISABLE_AUTO_DISPATCH')) {
 	define('DISABLE_AUTO_DISPATCH', true);
@@ -39,16 +38,82 @@ if (!class_exists('ShellDispatcher')) {
 
 if (!class_exists('TestTask')) {
 	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'test.php';
+	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
 }
 
 Mock::generatePartial(
-				'ShellDispatcher', 'TestTestTaskMockShellDispatcher',
-				array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
-				);
+	'ShellDispatcher', 'TestTestTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
 Mock::generatePartial(
-				'TestTask', 'MockTestTask',
-				array('in', 'out', 'createFile')
-				);
+	'TestTask', 'MockTestTask',
+	array('in', '_stop', 'err', 'out', 'createFile', 'isLoadableClass')
+);
+
+/**
+ * Test subject models for fixture generation
+ **/
+class TestTaskArticle extends Model {
+	var $name = 'TestTaskArticle';
+	var $useTable = 'articles';
+	var $hasMany = array(
+		'Comment' => array(
+			'className' => 'TestTask.TestTaskComment',
+			'foreignKey' => 'article_id',
+		)
+	);
+	var $hasAndBelongsToMany = array(
+		'Tag' => array(
+			'className' => 'TestTaskTag',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'article_id',
+			'associationForeignKey' => 'tag_id'
+		)
+	);
+	function doSomething() {
+
+	}
+	function doSomethingElse() {
+
+	}
+	function _innerMethod() {
+
+	}
+}
+class TestTaskTag extends Model {
+	var $name = 'TestTaskTag';
+	var $useTable = 'tags';
+	var $hasAndBelongsToMany = array(
+		'Article' => array(
+			'className' => 'TestTaskArticle',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'tag_id',
+			'associationForeignKey' => 'article_id'
+		)
+	);
+}
+/**
+ * Simulated Plugin
+ **/
+class TestTaskAppModel extends Model {
+	
+}
+class TestTaskComment extends TestTaskAppModel {
+	var $name = 'TestTaskComment';
+	var $useTable = 'comments';
+	var $belongsTo = array(
+		'Article' => array(
+			'className' => 'TestTaskArticle',
+			'foreignKey' => 'article_id',
+		)
+	);
+}
+
+class TestTaskCommentsController extends Controller {
+	var $name = 'TestTaskComments';
+	var $uses = array('TestTaskComment', 'TestTaskTag');
+}
+
 /**
  * TestTaskTest class
  *
@@ -56,24 +121,28 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class TestTaskTest extends CakeTestCase {
+
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
 /**
- * setUp method
+ * startTest method
  *
  * @return void
  * @access public
  */
-	function setUp() {
+	function startTest() {
 		$this->Dispatcher =& new TestTestTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
 		$this->Task =& new MockTestTask($this->Dispatcher);
-		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Dispatcher);
 	}
 /**
- * tearDown method
+ * endTest method
  *
  * @return void
  * @access public
  */
-	function tearDown() {
+	function endTest() {
 		ClassRegistry::flush();
 	}
 /**
@@ -88,13 +157,296 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->Dispatch->expectNever('stderr');
 		$this->Task->Dispatch->expectNever('_stop');
 
-		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValue('in', 'y');
 		$this->Task->expectAt(0, 'createFile', array($file, '*'));
 		$this->Task->bake('Model', 'MyClass');
 
-		$this->Task->setReturnValueAt(1, 'in', 'y');
 		$this->Task->expectAt(1, 'createFile', array($file, '*'));
 		$this->Task->bake('Model', 'MyClass');
+
+		$file = TESTS . 'cases' . DS . 'controllers' . DS . 'comments_controller.test.php';
+		$this->Task->expectAt(2, 'createFile', array($file, '*'));
+		$this->Task->bake('Controller', 'Comments');
+	}
+/**
+ * Test that method introspection pulls all relevant non parent class 
+ * methods into the test case.
+ *
+ * @return void
+ **/
+	function testMethodIntrospection() {
+		$result = $this->Task->getTestableMethods('TestTaskArticle');
+		$expected = array('doSomething', 'doSomethingElse');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test that the generation of fixtures works correctly.
+ *
+ * @return void
+ **/
+	function testFixtureArrayGenerationFromModel() {
+		$subject = ClassRegistry::init('TestTaskArticle');
+		$result = $this->Task->generateFixtureList($subject);
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags', 
+			'app.test_task_article', 'app.test_task_tag');
+
+		$this->assertEqual(sort($result), sort($expected));
+	}
+/**
+ * test that the generation of fixtures works correctly.
+ *
+ * @return void
+ **/
+	function testFixtureArrayGenerationFromController() {
+		$subject = new TestTaskCommentsController();
+		$result = $this->Task->generateFixtureList($subject);
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags', 
+			'app.test_task_article', 'app.test_task_tag');
+
+		$this->assertEqual(sort($result), sort($expected));
+	}
+/**
+ * test user interaction to get object type
+ *
+ * @return void
+ **/
+	function testGetObjectType() {
+		$this->Task->expectOnce('_stop');
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->getObjectType();
+
+		$this->Task->setReturnValueAt(1, 'in', 2);
+		$result = $this->Task->getObjectType();
+		$this->assertEqual($result, $this->Task->classTypes[1]);
+	}
+/**
+ * creating test subjects should clear the registry so the registry is always fresh
+ *
+ * @return void
+ **/
+	function testRegistryClearWhenBuildingTestObjects() {
+		ClassRegistry::flush();
+		$model = ClassRegistry::init('TestTaskComment');
+		$model->bindModel(array(
+			'belongsTo' => array(
+				'Random' => array(
+					'className' => 'TestTaskArticle',
+					'foreignKey' => 'article_id',
+				)
+			)
+		));
+		$keys = ClassRegistry::keys();
+		$this->assertTrue(in_array('random', $keys));
+		$object =& $this->Task->buildTestSubject('Model', 'TestTaskComment');
+
+		$keys = ClassRegistry::keys();
+		$this->assertFalse(in_array('random', $keys));
+	}
+/**
+ * test that getClassName returns the user choice as a classname.
+ *
+ * @return void
+ **/
+	function testGetClassName() {
+		$objects = Configure::listObjects('model');
+		$skip = $this->skipIf(empty($objects), 'No models in app, this test will fail. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->setReturnValueAt(0, 'in', 'MyCustomClass');
+		$result = $this->Task->getClassName('Model');
+		$this->assertEqual($result, 'MyCustomClass');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getClassName('Model');
+		$options = Configure::listObjects('model');
+		$this->assertEqual($result, $options[0]);
+	}
+/**
+ * Test the user interaction for defining additional fixtures.
+ *
+ * @return void
+ **/
+	function testGetUserFixtures() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'app.pizza, app.topping, app.side_dish');
+		$result = $this->Task->getUserFixtures();
+		$expected = array('app.pizza', 'app.topping', 'app.side_dish');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test that resolving classnames works
+ *
+ * @return void
+ **/
+	function testGetRealClassname() {
+		$result = $this->Task->getRealClassname('Model', 'Post');
+		$this->assertEqual($result, 'Post');
+
+		$result = $this->Task->getRealClassname('Controller', 'Posts');
+		$this->assertEqual($result, 'PostsController');
+
+		$result = $this->Task->getRealClassname('Helper', 'Form');
+		$this->assertEqual($result, 'FormHelper');
+
+		$result = $this->Task->getRealClassname('Behavior', 'Containable');
+		$this->assertEqual($result, 'ContainableBehavior');
+
+		$result = $this->Task->getRealClassname('Component', 'Auth');
+		$this->assertEqual($result, 'AuthComponent');
+	}
+/**
+ * test baking files.
+ *
+ * @return void
+ **/
+	function testBakeModelTest() {
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('isLoadableClass', true);
+
+		$result = $this->Task->bake('Model', 'TestTaskArticle');
+
+		$this->assertPattern('/App::import\(\'Model\', \'TestTaskArticle\'\)/', $result);
+		$this->assertPattern('/class TestTaskArticleTestCase extends CakeTestCase/', $result);
+
+		$this->assertPattern('/function startTest\(\)/', $result);
+		$this->assertPattern("/\\\$this->TestTaskArticle \=\& ClassRegistry::init\('TestTaskArticle'\)/", $result);
+
+		$this->assertPattern('/function endTest\(\)/', $result);
+		$this->assertPattern('/unset\(\$this->TestTaskArticle\)/', $result);
+
+		$this->assertPattern('/function testDoSomething\(\)/', $result);
+		$this->assertPattern('/function testDoSomethingElse\(\)/', $result);
+
+		$this->assertPattern("/'app\.test_task_article'/", $result);
+		$this->assertPattern("/'plugin\.test_task\.test_task_comment'/", $result);
+		$this->assertPattern("/'app\.test_task_tag'/", $result);
+		$this->assertPattern("/'app\.articles_tag'/", $result);
+	}
+/**
+ * test baking controller test files, ensure that the stub class is generated.
+ *
+ * @return void
+ **/
+	function testBakeControllerTest() {
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('isLoadableClass', true);
+
+		$result = $this->Task->bake('Controller', 'TestTaskComments');
+
+		$this->assertPattern('/App::import\(\'Controller\', \'TestTaskComments\'\)/', $result);
+		$this->assertPattern('/class TestTaskCommentsControllerTestCase extends CakeTestCase/', $result);
+
+		$this->assertPattern('/class TestTestTaskCommentsController extends TestTaskCommentsController/', $result);
+		$this->assertPattern('/var \$autoRender = false/', $result);
+		$this->assertPattern('/function redirect\(\$url, \$status = null, \$exit = true\)/', $result);
+
+		$this->assertPattern('/function startTest\(\)/', $result);
+		$this->assertPattern("/\\\$this->TestTaskComments \=\& new TestTestTaskCommentsController()/", $result);
+
+		$this->assertPattern('/function endTest\(\)/', $result);
+		$this->assertPattern('/unset\(\$this->TestTaskComments\)/', $result);
+
+		$this->assertPattern("/'app\.test_task_article'/", $result);
+		$this->assertPattern("/'plugin\.test_task\.test_task_comment'/", $result);
+		$this->assertPattern("/'app\.test_task_tag'/", $result);
+		$this->assertPattern("/'app\.articles_tag'/", $result);
+	}
+/**
+ * test Constructor generation ensure that constructClasses is called for controllers
+ *
+ * @return void
+ **/
+	function testGenerateContsructor() {
+		$result = $this->Task->generateConstructor('controller', 'PostsController');
+		$expected = "new TestPostsController();\n\t\t\$this->PostsController->constructClasses();\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->generateConstructor('model', 'Post');
+		$expected = "ClassRegistry::init('Post');\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->generateConstructor('helper', 'FormHelper');
+		$expected = "new FormHelper()\n";
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Test that mock class generation works for the appropriate classes
+ *
+ * @return void
+ **/
+	function testMockClassGeneration() {
+		$result = $this->Task->hasMockClass('controller');
+		$this->assertTrue($result);
+	}
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ **/
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'TestTest';
+
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Helper', 'Form');
+	}
+/**
+ * Test filename generation for each type + plugins
+ *
+ * @return void
+ **/
+	function testTestCaseFileName() {
+		$this->Task->path = '/my/path/tests/';
+
+		$result = $this->Task->testCaseFileName('Model', 'Post');
+		$expected = $this->Task->path . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Helper', 'Form');
+		$expected = $this->Task->path . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Controller', 'Posts');
+		$expected = $this->Task->path . 'cases' . DS . 'controllers' . DS . 'posts_controller.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Behavior', 'Containable');
+		$expected = $this->Task->path . 'cases' . DS . 'behaviors' . DS . 'containable.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Component', 'Auth');
+		$expected = $this->Task->path . 'cases' . DS . 'components' . DS . 'auth.test.php';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->plugin = 'TestTest';
+		$result = $this->Task->testCaseFileName('Model', 'Post');
+		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test execute with a type defined
+ *
+ * @return void
+ **/
+	function testExecuteWithOneArg() {
+		$this->Task->args[0] = 'Model';
+		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
+		$this->Task->setReturnValue('isLoadableClass', true);
+		$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
+		$this->Task->execute();
+	}
+/**
+ * test execute with type and class name defined
+ *
+ * @return void
+ **/
+	function testExecuteWithTwoArgs() {
+		$this->Task->args = array('Model', 'TestTaskTag');
+		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
+		$this->Task->setReturnValue('isLoadableClass', true);
+		$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
+		$this->Task->execute();
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/tasks/view.test.php b/cake/tests/cases/console/libs/tasks/view.test.php
new file mode 100644
index 000000000..41ed04a03
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/view.test.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * ViewTask Test file
+ *
+ * Test Case for view generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'view.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestViewTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ViewTask', 'MockViewTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+Mock::generate('ControllerTask', 'ViewTaskMockControllerTask');
+Mock::generate('ProjectTask', 'ViewTaskMockProjectTask');
+
+class ViewTaskComment extends Model {
+	var $name = 'ViewTaskComment';
+	var $useTable = 'comments';
+
+	var $belongsTo = array(
+		'Article' => array(
+			'className' => 'ViewTaskArticle',
+			'foreignKey' => 'article_id'
+		)
+	);
+}
+
+class ViewTaskArticle extends Model {
+	var $name = 'ViewTaskArticle';
+	var $useTable = 'articles';
+}
+
+class ViewTaskCommentsController extends Controller {
+	var $name = 'ViewTaskComments';
+
+	function index() {
+
+	}
+	function add() {
+
+	}
+}
+
+class ViewTaskArticlesController extends Controller {
+	var $name = 'ViewTaskArticles';
+
+	function index() {
+
+	}
+	function add() {
+
+	}
+
+	function admin_index() {
+
+	}
+	function admin_add() {
+
+	}
+	function admin_view() {
+
+	}
+	function admin_edit() {
+
+	}
+	function admin_delete() {
+
+	}
+}
+
+/**
+ * ViewTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskTest extends CakeTestCase {
+
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestViewTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockViewTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Dispatcher);
+		$this->Task->Controller =& new ViewTaskMockControllerTask();
+		$this->Task->Project =& new ViewTaskMockProjectTask();
+		$this->Task->path = TMP;
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * Test getContent and parsing of Templates.
+ *
+ * @return void
+ **/
+	function testGetContent() {
+		$vars = array(
+			'modelClass' => 'TestViewModel',
+			'schema' => array(),
+			'primaryKey' => 'id',
+			'displayField' => 'name',
+			'singularVar' => 'testViewModel',
+			'pluralVar' => 'testViewModels',
+			'singularHumanName' => 'Test View Model',
+			'pluralHumanName' => 'Test View Models',
+			'fields' => array('id', 'name', 'body'),
+			'associations' => array()
+		);
+		$result = $this->Task->getContent('view', $vars);
+
+		$this->assertPattern('/Delete Test View Model/', $result);
+		$this->assertPattern('/Edit Test View Model/', $result);
+		$this->assertPattern('/List Test View Models/', $result);
+		$this->assertPattern('/New Test View Model/', $result);
+
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+	}
+
+/**
+ * test getContent() using an admin_prefixed action.
+ *
+ * @return void
+ **/
+	function testGetContentWithAdminAction() {
+		$_back = Configure::read('Routing.admin');
+		Configure::write('Routing.admin', 'admin');
+		$vars = array(
+			'modelClass' => 'TestViewModel',
+			'schema' => array(),
+			'primaryKey' => 'id',
+			'displayField' => 'name',
+			'singularVar' => 'testViewModel',
+			'pluralVar' => 'testViewModels',
+			'singularHumanName' => 'Test View Model',
+			'pluralHumanName' => 'Test View Models',
+			'fields' => array('id', 'name', 'body'),
+			'associations' => array()
+		);
+		$result = $this->Task->getContent('admin_view', $vars);
+
+		$this->assertPattern('/Delete Test View Model/', $result);
+		$this->assertPattern('/Edit Test View Model/', $result);
+		$this->assertPattern('/List Test View Models/', $result);
+		$this->assertPattern('/New Test View Model/', $result);
+
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+
+		Configure::write('Routing.admin', $_back);
+	}
+
+/**
+ * test Bake method
+ *
+ * @return void
+ **/
+	function testBake() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/View Task Articles/')
+		));
+		$this->Task->bake('view', true);
+
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'edit.ctp', '*'));
+		$this->Task->bake('edit', true);
+
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/\$viewTaskComment\[\'Article\'\]\[\'title\'\]/')
+		));
+		$this->Task->bake('index', true);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ **/
+	function testBakeWithPlugin() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+		$this->Task->plugin = 'TestTest';
+
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'views' . DS . 'view_task_comments' . DS  . 'view.ctp';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('view', true);
+	}
+
+/**
+ * test bake actions baking multiple actions.
+ *
+ * @return void
+ **/
+	function testBakeActions() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/ViewTaskComments/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'edit.ctp',
+			new PatternExpectation('/Edit ViewTaskComment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+
+		$this->Task->bakeActions(array('view', 'edit', 'index'), array());
+	}
+
+/**
+ * test baking a customAction (non crud)
+ *
+ * @return void
+ **/
+	function testCustomAction() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+		$this->Task->params['app'] = APP;
+
+		$this->Task->setReturnValueAt(0, 'in', '');
+		$this->Task->setReturnValueAt(1, 'in', 'my_action');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'my_action.ctp', '*'));
+
+		$this->Task->customAction();
+	}
+
+/**
+ * Test all()
+ *
+ * @return void
+ **/
+	function testExecuteIntoAll() {
+		$this->Task->args[0] = 'all';
+
+		$this->Task->Controller->setReturnValue('listAll', array('view_task_comments'));
+		$this->Task->Controller->expectOnce('listAll');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'view.ctp', '*'));
+		$this->Task->expectAt(2, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+		$this->Task->expectAt(3, 'createFile', array(TMP . 'view_task_comments' . DS . 'edit.ctp', '*'));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller view`
+ *
+ * @return void
+ **/
+	function testExecuteWithActionParam() {
+		$this->Task->args[0] = 'ViewTaskComments';
+		$this->Task->args[1] = 'view';
+
+		$this->Task->expectCallCount('createFile', 1);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'view.ctp', '*'));
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller`
+ * Ensure that views are only baked for actions that exist in the controller.
+ *
+ * @return void
+ **/
+	function testExecuteWithController() {
+		$this->Task->args[0] = 'ViewTaskComments';
+
+		$this->Task->expectCallCount('createFile', 2);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller -admin`
+ * Which only bakes admin methods, not non-admin methods.
+ *
+ * @return void
+ **/
+	function testExecuteWithControllerAndAdminFlag() {
+		$_back = Configure::read('Routing.admin');
+		Configure::write('Routing.admin', 'admin');
+		$this->Task->args[0] = 'ViewTaskArticles';
+		$this->Task->params['admin'] = 1;
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_add.ctp', '*'));
+		$this->Task->expectAt(2, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_view.ctp', '*'));
+		$this->Task->expectAt(3, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_edit.ctp', '*'));
+
+		$this->Task->execute();
+		Configure::write('Routing.admin', $_back);
+	}
+
+/**
+ * test execute into interactive.
+ *
+ * @return void
+ **/
+	function testExecuteInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->args = array();
+		$this->Task->params = array();
+
+		$this->Task->Controller->setReturnValue('getName', 'ViewTaskComments');
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', 'n');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'add.ctp',
+			new PatternExpectation('/Add ViewTaskComment/')
+		));
+		$this->Task->expectAt(3, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'edit.ctp',
+			new PatternExpectation('/Edit ViewTaskComment/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test execute into interactive() with admin methods.
+ *
+ * @return void
+ **/
+	function testExecuteInteractiveWithAdmin() {
+		Configure::write('Routing.admin', 'admin');
+		$this->Task->connection = 'test_suite';
+		$this->Task->args = array();
+
+		$this->Task->Controller->setReturnValue('getName', 'ViewTaskComments');
+		$this->Task->Project->setReturnValue('getAdmin', 'admin_');
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_view.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_add.ctp',
+			new PatternExpectation('/Add ViewTaskComment/')
+		));
+		$this->Task->expectAt(3, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_edit.ctp',
+			new PatternExpectation('/Edit ViewTaskComment/')
+		));
+
+		$this->Task->execute();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 5afb17481..44b915b6e 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DispatcherTest file
  *
@@ -31,6 +32,7 @@ if (!class_exists('AppController')) {
 } elseif (!defined('APP_CONTROLLER_EXISTS')){
 	define('APP_CONTROLLER_EXISTS', true);
 }
+
 /**
  * TestDispatcher class
  *
@@ -38,6 +40,7 @@ if (!class_exists('AppController')) {
  * @subpackage    cake.tests.cases
  */
 class TestDispatcher extends Dispatcher {
+
 /**
  * invoke method
  *
@@ -58,6 +61,7 @@ class TestDispatcher extends Dispatcher {
 
 		return $controller;
 	}
+
 /**
  * cakeError method
  *
@@ -68,6 +72,7 @@ class TestDispatcher extends Dispatcher {
 	function cakeError($filename, $params) {
 		return array($filename, $params);
 	}
+
 /**
  * _stop method
  *
@@ -78,6 +83,7 @@ class TestDispatcher extends Dispatcher {
 		return true;
 	}
 }
+
 /**
  * MyPluginAppController class
  *
@@ -86,6 +92,7 @@ class TestDispatcher extends Dispatcher {
  */
 class MyPluginAppController extends AppController {
 }
+
 /**
  * MyPluginController class
  *
@@ -93,6 +100,7 @@ class MyPluginAppController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class MyPluginController extends MyPluginAppController {
+
 /**
  * name property
  *
@@ -100,6 +108,7 @@ class MyPluginController extends MyPluginAppController {
  * @access public
  */
 	var $name = 'MyPlugin';
+
 /**
  * uses property
  *
@@ -107,6 +116,7 @@ class MyPluginController extends MyPluginAppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * index method
  *
@@ -116,6 +126,7 @@ class MyPluginController extends MyPluginAppController {
 	function index() {
 		return true;
 	}
+
 /**
  * add method
  *
@@ -125,6 +136,7 @@ class MyPluginController extends MyPluginAppController {
 	function add() {
 		return true;
 	}
+
 /**
  * admin_add method
  *
@@ -136,6 +148,7 @@ class MyPluginController extends MyPluginAppController {
 		return $id;
 	}
 }
+
 /**
  * SomePagesController class
  *
@@ -143,6 +156,7 @@ class MyPluginController extends MyPluginAppController {
  * @subpackage    cake.tests.cases
  */
 class SomePagesController extends AppController {
+
 /**
  * name property
  *
@@ -150,6 +164,7 @@ class SomePagesController extends AppController {
  * @access public
  */
 	var $name = 'SomePages';
+
 /**
  * uses property
  *
@@ -157,6 +172,7 @@ class SomePagesController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * display method
  *
@@ -167,6 +183,7 @@ class SomePagesController extends AppController {
 	function display($page = null) {
 		return $page;
 	}
+
 /**
  * index method
  *
@@ -176,6 +193,7 @@ class SomePagesController extends AppController {
 	function index() {
 		return true;
 	}
+
 /**
  * protected method
  *
@@ -185,6 +203,7 @@ class SomePagesController extends AppController {
 	function _protected() {
 		return true;
 	}
+
 /**
  * redirect method overriding
  *
@@ -195,6 +214,7 @@ class SomePagesController extends AppController {
 		echo 'this should not be accessible';
 	}
 }
+
 /**
  * OtherPagesController class
  *
@@ -202,6 +222,7 @@ class SomePagesController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class OtherPagesController extends MyPluginAppController {
+
 /**
  * name property
  *
@@ -209,6 +230,7 @@ class OtherPagesController extends MyPluginAppController {
  * @access public
  */
 	var $name = 'OtherPages';
+
 /**
  * uses property
  *
@@ -216,6 +238,7 @@ class OtherPagesController extends MyPluginAppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * display method
  *
@@ -226,6 +249,7 @@ class OtherPagesController extends MyPluginAppController {
 	function display($page = null) {
 		return $page;
 	}
+
 /**
  * index method
  *
@@ -236,6 +260,7 @@ class OtherPagesController extends MyPluginAppController {
 		return true;
 	}
 }
+
 /**
  * TestDispatchPagesController class
  *
@@ -243,6 +268,7 @@ class OtherPagesController extends MyPluginAppController {
  * @subpackage    cake.tests.cases
  */
 class TestDispatchPagesController extends AppController {
+
 /**
  * name property
  *
@@ -250,6 +276,7 @@ class TestDispatchPagesController extends AppController {
  * @access public
  */
 	var $name = 'TestDispatchPages';
+
 /**
  * uses property
  *
@@ -257,6 +284,7 @@ class TestDispatchPagesController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * admin_index method
  *
@@ -266,6 +294,7 @@ class TestDispatchPagesController extends AppController {
 	function admin_index() {
 		return true;
 	}
+
 /**
  * camelCased method
  *
@@ -276,6 +305,7 @@ class TestDispatchPagesController extends AppController {
 		return true;
 	}
 }
+
 /**
  * ArticlesTestAppController class
  *
@@ -284,6 +314,7 @@ class TestDispatchPagesController extends AppController {
  */
 class ArticlesTestAppController extends AppController {
 }
+
 /**
  * ArticlesTestController class
  *
@@ -291,6 +322,7 @@ class ArticlesTestAppController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class ArticlesTestController extends ArticlesTestAppController {
+
 /**
  * name property
  *
@@ -298,6 +330,7 @@ class ArticlesTestController extends ArticlesTestAppController {
  * @access public
  */
 	var $name = 'ArticlesTest';
+
 /**
  * uses property
  *
@@ -305,6 +338,7 @@ class ArticlesTestController extends ArticlesTestAppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * admin_index method
  *
@@ -315,6 +349,7 @@ class ArticlesTestController extends ArticlesTestAppController {
 		return true;
 	}
 }
+
 /**
  * SomePostsController class
  *
@@ -322,6 +357,7 @@ class ArticlesTestController extends ArticlesTestAppController {
  * @subpackage    cake.tests.cases
  */
 class SomePostsController extends AppController {
+
 /**
  * name property
  *
@@ -329,6 +365,7 @@ class SomePostsController extends AppController {
  * @access public
  */
 	var $name = 'SomePosts';
+
 /**
  * uses property
  *
@@ -336,6 +373,7 @@ class SomePostsController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * autoRender property
  *
@@ -343,6 +381,7 @@ class SomePostsController extends AppController {
  * @access public
  */
 	var $autoRender = false;
+
 /**
  * beforeFilter method
  *
@@ -357,6 +396,7 @@ class SomePostsController extends AppController {
 		}
 		$this->params['pass'] = array('changed');
 	}
+
 /**
  * index method
  *
@@ -366,6 +406,7 @@ class SomePostsController extends AppController {
 	function index() {
 		return true;
 	}
+
 /**
  * change method
  *
@@ -376,6 +417,7 @@ class SomePostsController extends AppController {
 		return true;
 	}
 }
+
 /**
  * TestCachedPagesController class
  *
@@ -383,6 +425,7 @@ class SomePostsController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class TestCachedPagesController extends AppController {
+
 /**
  * name property
  *
@@ -390,6 +433,7 @@ class TestCachedPagesController extends AppController {
  * @access public
  */
 	var $name = 'TestCachedPages';
+
 /**
  * uses property
  *
@@ -397,6 +441,7 @@ class TestCachedPagesController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * helpers property
  *
@@ -404,6 +449,7 @@ class TestCachedPagesController extends AppController {
  * @access public
  */
 	var $helpers = array('Cache');
+
 /**
  * cacheAction property
  *
@@ -414,6 +460,7 @@ class TestCachedPagesController extends AppController {
 		'index'=> '+2 sec', 'test_nocache_tags'=>'+2 sec',
 		'view/' => '+2 sec'
 	);
+
 /**
  * viewPath property
  *
@@ -421,6 +468,7 @@ class TestCachedPagesController extends AppController {
  * @access public
  */
 	var $viewPath = 'posts';
+
 /**
  * index method
  *
@@ -430,6 +478,7 @@ class TestCachedPagesController extends AppController {
 	function index() {
 		$this->render();
 	}
+
 /**
  * test_nocache_tags method
  *
@@ -439,6 +488,7 @@ class TestCachedPagesController extends AppController {
 	function test_nocache_tags() {
 		$this->render();
 	}
+
 /**
  * view method
  *
@@ -449,6 +499,7 @@ class TestCachedPagesController extends AppController {
 		$this->render('index');
 	}
 }
+
 /**
  * TimesheetsController class
  *
@@ -456,6 +507,7 @@ class TestCachedPagesController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class TimesheetsController extends AppController {
+
 /**
  * name property
  *
@@ -463,6 +515,7 @@ class TimesheetsController extends AppController {
  * @access public
  */
 	var $name = 'Timesheets';
+
 /**
  * uses property
  *
@@ -470,6 +523,7 @@ class TimesheetsController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * index method
  *
@@ -480,6 +534,7 @@ class TimesheetsController extends AppController {
 		return true;
 	}
 }
+
 /**
  * DispatcherTest class
  *
@@ -487,6 +542,7 @@ class TimesheetsController extends AppController {
  * @subpackage    cake.tests.cases
  */
 class DispatcherTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -513,6 +569,7 @@ class DispatcherTest extends CakeTestCase {
 
 		App::build(App::core());
 	}
+
 /**
  * tearDown method
  *
@@ -529,6 +586,7 @@ class DispatcherTest extends CakeTestCase {
 		Configure::write('Cache', $this->_cache);
 		Configure::write('debug', $this->_debug);
 	}
+
 /**
  * testParseParamsWithoutZerosAndEmptyPost method
  *
@@ -545,6 +603,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertIdentical($test['pass'][2], 'params3');
 		$this->assertFalse(!empty($test['form']));
 	}
+
 /**
  * testParseParamsReturnsPostedData method
  *
@@ -558,6 +617,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertTrue($test['form'], "Parsed URL not returning post data");
 		$this->assertIdentical($test['form']['testdata'], "My Posted Content");
 	}
+
 /**
  * testParseParamsWithSingleZero method
  *
@@ -573,6 +633,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][1]);
 		$this->assertIdentical($test['pass'][2], '23');
 	}
+
 /**
  * testParseParamsWithManySingleZeros method
  *
@@ -589,6 +650,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][4]);
 		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][5]);
 	}
+
 /**
  * testParseParamsWithManyZerosInEachSectionOfUrl method
  *
@@ -605,6 +667,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertPattern('/\\A(?:000000)\\z/', $test['pass'][4]);
 		$this->assertPattern('/\\A(?:0000000)\\z/', $test['pass'][5]);
 	}
+
 /**
  * testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl method
  *
@@ -621,6 +684,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertPattern('/\\A(?:000030)\\z/', $test['pass'][4]);
 		$this->assertPattern('/\\A(?:0000400)\\z/', $test['pass'][5]);
 	}
+
 /**
  * testQueryStringOnRoot method
  *
@@ -650,6 +714,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertTrue(isset($result['url']['coffee']));
 		$this->assertEqual($result['url']['coffee'], 'life');
 	}
+
 /**
  * testFileUploadArrayStructure method
  *
@@ -876,6 +941,7 @@ class DispatcherTest extends CakeTestCase {
 		);
 		$this->assertEqual($result['data'], $expected);
 	}
+
 /**
  * testGetUrl method
  *
@@ -915,6 +981,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testBaseUrlAndWebrootWithModRewrite method
  *
@@ -990,6 +1057,7 @@ class DispatcherTest extends CakeTestCase {
 		$expectedWebroot = '/clients/PewterReport/code/';
 		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
 	}
+
 /**
  * testBaseUrlwithModRewriteAlias method
  *
@@ -1024,6 +1092,7 @@ class DispatcherTest extends CakeTestCase {
 		$expectedWebroot = '/newaffiliate/';
 		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
 	}
+
 /**
  * testBaseUrlAndWebrootWithBaseUrl method
  *
@@ -1093,6 +1162,7 @@ class DispatcherTest extends CakeTestCase {
 		$expectedWebroot = '/dbhauser/app/webroot/';
 		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
 	}
+
 /**
  * testBaseUrlAndWebrootWithBase method
  *
@@ -1123,6 +1193,7 @@ class DispatcherTest extends CakeTestCase {
 		$expectedWebroot = '/cake/testbed/webroot/';
 		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
 	}
+
 /**
  * testMissingController method
  *
@@ -1142,6 +1213,7 @@ class DispatcherTest extends CakeTestCase {
 		)));
 		$this->assertEqual($expected, $controller);
 	}
+
 /**
  * testPrivate method
  *
@@ -1164,6 +1236,7 @@ class DispatcherTest extends CakeTestCase {
 		)));
 		$this->assertEqual($controller, $expected);
 	}
+
 /**
  * testMissingAction method
  *
@@ -1201,6 +1274,7 @@ class DispatcherTest extends CakeTestCase {
 		)));
 		$this->assertEqual($expected, $controller);
 	}
+
 /**
  * testDispatch method
  *
@@ -1255,6 +1329,7 @@ class DispatcherTest extends CakeTestCase {
 		$controller = $Dispatcher->dispatch($url, array('return' => 1));
 		$this->assertEqual('TestDispatchPages', $controller->name);
 	}
+
 /**
  * testDispatchWithArray method
  *
@@ -1274,6 +1349,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = array('0' => 'home', 'param' => 'value', 'param2' => 'value2');
 		$this->assertIdentical($expected, $controller->passedArgs);
 	}
+
 /**
  * testAdminDispatch method
  *
@@ -1304,6 +1380,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = '/cake/repo/branches/1.2.x.x/index.php';
 		$this->assertIdentical($expected, $controller->base);
 	}
+
 /**
  * testPluginDispatch method
  *
@@ -1352,6 +1429,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = '/cake/repo/branches/1.2.x.x';
 		$this->assertIdentical($expected, $controller->base);
 	}
+
 /**
  * testAutomaticPluginDispatch method
  *
@@ -1389,6 +1467,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = '/cake/repo/branches/1.2.x.x';
 		$this->assertIdentical($expected, $controller->base);
 	}
+
 /**
  * testAutomaticPluginControllerDispatch method
  *
@@ -1489,6 +1568,7 @@ class DispatcherTest extends CakeTestCase {
 		);
 		$this->assertEqual($controller->params, $expected);
 	}
+
 /**
  * test Plugin dispatching without controller name and using
  * plugin short form instead.
@@ -1538,6 +1618,7 @@ class DispatcherTest extends CakeTestCase {
 		$controller = $Dispatcher->dispatch($url, array('return' => 1));
 		$this->assertIdentical('1',$controller->params['pass'][0]);
 	}
+
 /**
  * testAutomaticPluginControllerMissingActionDispatch method
  *
@@ -1580,6 +1661,7 @@ class DispatcherTest extends CakeTestCase {
 		)));
 		$this->assertIdentical($expected, $controller);
 	}
+
 /**
  * testPrefixProtection method
  *
@@ -1608,6 +1690,7 @@ class DispatcherTest extends CakeTestCase {
 		)));
 		$this->assertIdentical($expected, $controller);
 	}
+
 /**
  * undocumented function
  *
@@ -1627,6 +1710,7 @@ class DispatcherTest extends CakeTestCase {
 
 		App::build();
 	}
+
 /**
  * testChangingParamsFromBeforeFilter method
  *
@@ -1660,6 +1744,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = array('changed');
 		$this->assertIdentical($expected, $controller->params['pass']);
 	}
+
 /**
  * testStaticAssets method
  *
@@ -1712,6 +1797,7 @@ class DispatcherTest extends CakeTestCase {
 
 		header('Content-type: text/html');//reset the header content-type without page can render as plain text.
 	}
+
 /**
  * testFullPageCachingDispatch method
  *
@@ -1847,6 +1933,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertTrue(file_exists($filename));
 		unlink($filename);
 	}
+
 /**
  * testHttpMethodOverrides method
  *
@@ -1917,6 +2004,7 @@ class DispatcherTest extends CakeTestCase {
 		$expected = '/index.php/h1 onclick=alert(xss);heya';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testEnvironmentDetection method
  *
@@ -2022,6 +2110,7 @@ class DispatcherTest extends CakeTestCase {
 		}
 		$this->__loadEnvironment(array_merge(array('reload' => true), $backup));
 	}
+
 /**
  * Tests that the Dispatcher does not return an empty action
  *
@@ -2047,6 +2136,7 @@ class DispatcherTest extends CakeTestCase {
 		$result = $Dispatcher->parseParams($url);
 		$this->assertEqual('index', $result['action']);
 	}
+
 /**
  * backupEnvironment method
  *
@@ -2061,6 +2151,7 @@ class DispatcherTest extends CakeTestCase {
 			'SERVER'=> $_SERVER
 		);
 	}
+
 /**
  * reloadEnvironment method
  *
@@ -2079,6 +2170,7 @@ class DispatcherTest extends CakeTestCase {
 		}
 		Configure::write('App', array());
 	}
+
 /**
  * loadEnvironment method
  *
@@ -2113,6 +2205,7 @@ class DispatcherTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * cachePath method
  *
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 37d5ec633..76f15bfb8 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CacheTest file
  *
@@ -27,6 +28,7 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
+
 /**
  * CacheTest class
  *
@@ -34,6 +36,7 @@ if (!class_exists('Cache')) {
  * @subpackage    cake.tests.cases.libs
  */
 class CacheTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -49,6 +52,7 @@ class CacheTest extends CakeTestCase {
 
 		Cache::engine('File', array('path' => TMP . 'tests'));
 	}
+
 /**
  * tearDown method
  *
@@ -60,6 +64,7 @@ class CacheTest extends CakeTestCase {
 		Cache::config('default', $this->_defaultCacheConfig['settings']);
 		Cache::engine('File');
 	}
+
 /**
  * testConfig method
  *
@@ -71,6 +76,7 @@ class CacheTest extends CakeTestCase {
 		$results = Cache::config('new', $settings);
 		$this->assertEqual($results, Cache::config('new'));
 	}
+
 /**
  * testConfigChange method
  *
@@ -90,6 +96,7 @@ class CacheTest extends CakeTestCase {
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 		Cache::config('tests', $_cacheConfigTests['settings']);
 	}
+
 /**
  * testWritingWithConfig method
  *
@@ -115,6 +122,7 @@ class CacheTest extends CakeTestCase {
 
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 	}
+
 /**
  * testInitSettings method
  *
@@ -139,6 +147,7 @@ class CacheTest extends CakeTestCase {
 
 		Cache::engine('File');
 	}
+
 /**
  * testWriteEmptyValues method
  *
@@ -161,6 +170,7 @@ class CacheTest extends CakeTestCase {
 		Cache::write('App.zeroTest2', '0');
 		$this->assertIdentical(Cache::read('App.zeroTest2'), '0');
 	}
+
 /**
  * testCacheDisable method
  *
@@ -204,6 +214,7 @@ class CacheTest extends CakeTestCase {
 		$this->assertFalse(Cache::write('key_6', 'hello'));
 		$this->assertFalse(Cache::read('key_6'));
 	}
+
 /**
  * testSet method
  *
diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
index 5dd30c502..27cecbca9 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/cake/tests/cases/libs/cache/apc.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ApcEngineTest file
  *
@@ -27,6 +28,7 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
+
 /**
  * ApcEngineTest class
  *
@@ -34,6 +36,7 @@ if (!class_exists('Cache')) {
  * @subpackage    cake.tests.cases.libs.cache
  */
 class ApcEngineTest extends UnitTestCase {
+
 /**
  * skip method
  *
@@ -47,6 +50,7 @@ class ApcEngineTest extends UnitTestCase {
 		}
 		$this->skipIf($skip, '%s Apc is not installed or configured properly');
 	}
+
 /**
  * setUp method
  *
@@ -58,6 +62,7 @@ class ApcEngineTest extends UnitTestCase {
 		Configure::write('Cache.disable', false);
 		Cache::config('apc', array('engine' => 'Apc', 'prefix' => 'cake_'));
 	}
+
 /**
  * tearDown method
  *
@@ -68,6 +73,7 @@ class ApcEngineTest extends UnitTestCase {
 		Configure::write('Cache.disable', $this->_cacheDisable);
 		Cache::config('default');
 	}
+
 /**
  * testReadAndWriteCache method
  *
@@ -91,6 +97,7 @@ class ApcEngineTest extends UnitTestCase {
 
 		Cache::delete('test');
 	}
+
 /**
  * testExpiry method
  *
@@ -125,6 +132,7 @@ class ApcEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 	}
+
 /**
  * testDeleteCache method
  *
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 89ee671bc..45f191f95 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * FileEngineTest file
  *
@@ -30,6 +31,7 @@ if (!class_exists('Cache')) {
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
+
 /**
  * FileEngineTest class
  *
@@ -37,6 +39,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
  * @subpackage    cake.tests.cases.libs.cache
  */
 class FileEngineTest extends CakeTestCase {
+
 /**
  * config property
  *
@@ -44,6 +47,7 @@ class FileEngineTest extends CakeTestCase {
  * @access public
  */
 	var $config = array();
+
 /**
  * startCase method
  *
@@ -56,6 +60,7 @@ class FileEngineTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 		Cache::config('default', array('engine' => 'File', 'path' => CACHE));
 	}
+
 /**
  * endCase method
  *
@@ -66,6 +71,7 @@ class FileEngineTest extends CakeTestCase {
 		Configure::write('Cache.disable', $this->_cacheDisable);
 		Cache::config('default', $this->_cacheConfig['settings']);
 	}
+
 /**
  * testCacheDirChange method
  *
@@ -81,6 +87,7 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertEqual($result['settings'], Cache::settings('File'));
 		$this->assertNotEqual($result, Cache::settings('File'));
 	}
+
 /**
  * testReadAndWriteCache method
  *
@@ -109,6 +116,7 @@ class FileEngineTest extends CakeTestCase {
 
 		Cache::delete('test');
 	}
+
 /**
  * testExpiry method
  *
@@ -139,6 +147,7 @@ class FileEngineTest extends CakeTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 	}
+
 /**
  * testDeleteCache method
  *
@@ -158,6 +167,7 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertFalse($result);
 
 	}
+
 /**
  * testSerialize method
  *
@@ -182,6 +192,7 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertIdentical(unserialize($newread), $data);
 
 	}
+
 /**
  * testClear method
  *
@@ -275,6 +286,7 @@ class FileEngineTest extends CakeTestCase {
 
 		Cache::engine('File', array('path' => CACHE));
 	}
+
 /**
  * testKeyPath method
  *
@@ -292,6 +304,7 @@ class FileEngineTest extends CakeTestCase {
 		$result = Cache::clear();
 		$this->assertTrue($result);
 	}
+
 /**
  * testRemoveWindowsSlashesFromCache method
  *
@@ -334,6 +347,7 @@ class FileEngineTest extends CakeTestCase {
 		Cache::delete('test_dir_map');
 		$this->assertEqual($expected, $data);
 	}
+
 /**
  * testWriteQuotedString method
  *
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 8a48df86c..a5c321e50 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MemcacheEngineTest file
  *
@@ -27,12 +28,14 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
+
 /**
  * MemcacheEngineTest class
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
  */
+
 /**
  * MemcacheEngineTest class
  *
@@ -40,6 +43,7 @@ if (!class_exists('Cache')) {
  * @subpackage    cake.tests.cases.libs.cache
  */
 class MemcacheEngineTest extends CakeTestCase {
+
 /**
  * skip method
  *
@@ -53,6 +57,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		}
 		$this->skipIf($skip, '%s Memcache is not installed or configured properly');
 	}
+
 /**
  * setUp method
  *
@@ -64,6 +69,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 		Cache::config('memcache', array('engine' => 'Memcache', 'prefix' => 'cake_'));
 	}
+
 /**
  * tearDown method
  *
@@ -74,6 +80,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		Configure::write('Cache.disable', $this->_cacheDisable);
 		Cache::config('default');
 	}
+
 /**
  * testSettings method
  *
@@ -91,6 +98,7 @@ class MemcacheEngineTest extends CakeTestCase {
 						);
 		$this->assertEqual($settings, $expecting);
 	}
+
 /**
  * testSettings method
  *
@@ -122,6 +130,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		$settings = Cache::settings();
 		$this->assertEqual($servers, $settings['servers']);
 	}
+
 /**
  * testConnect method
  *
@@ -133,6 +142,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		$result = $Cache->_Engine['Memcache']->connect('127.0.0.1');
 		$this->assertTrue($result);
 	}
+
 /**
  * testReadAndWriteCache method
  *
@@ -156,6 +166,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		Cache::delete('test');
 	}
+
 /**
  * testExpiry method
  *
@@ -207,6 +218,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		Cache::engine('Memcache', array('duration' => 3600));
 	}
+
 /**
  * testDeleteCache method
  *
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 842cbfa7b..9ca8cf23a 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XcacheEngineTest file
  *
@@ -27,6 +28,7 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
+
 /**
  * XcacheEngineTest class
  *
@@ -34,6 +36,7 @@ if (!class_exists('Cache')) {
  * @subpackage    cake.tests.cases.libs.cache
  */
 class XcacheEngineTest extends UnitTestCase {
+
 /**
  * skip method
  *
@@ -47,6 +50,7 @@ class XcacheEngineTest extends UnitTestCase {
 		}
 		$this->skipIf($skip, '%s Xcache is not installed or configured properly');
 	}
+
 /**
  * setUp method
  *
@@ -58,6 +62,7 @@ class XcacheEngineTest extends UnitTestCase {
 		Configure::write('Cache.disable', false);
 		Cache::config('xcache', array('engine' => 'Xcache', 'prefix' => 'cake_'));
 	}
+
 /**
  * tearDown method
  *
@@ -68,6 +73,7 @@ class XcacheEngineTest extends UnitTestCase {
 		Configure::write('Cache.disable', $this->_cacheDisable);
 		Cache::config('default');
 	}
+
 /**
  * testSettings method
  *
@@ -85,6 +91,7 @@ class XcacheEngineTest extends UnitTestCase {
 						);
 		$this->assertEqual($settings, $expecting);
 	}
+
 /**
  * testReadAndWriteCache method
  *
@@ -108,6 +115,7 @@ class XcacheEngineTest extends UnitTestCase {
 
 		Cache::delete('test');
 	}
+
 /**
  * testExpiry method
  *
@@ -137,6 +145,7 @@ class XcacheEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 	}
+
 /**
  * testDeleteCache method
  *
@@ -151,6 +160,7 @@ class XcacheEngineTest extends UnitTestCase {
 		$result = Cache::delete('delete_test');
 		$this->assertTrue($result);
 	}
+
 /**
  * testClearCache method
  *
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 05dc39452..d548de6b8 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CakeLogTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Log');
+
 /**
  * CakeLogTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Log');
  * @subpackage    cake.tests.cases.libs
  */
 class CakeLogTest extends CakeTestCase {
+
 /**
  * testLogFileWriting method
  *
diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php
index 9fcd844f4..de5cda82c 100644
--- a/cake/tests/cases/libs/cake_session.test.php
+++ b/cake/tests/cases/libs/cake_session.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SessionTest file
  *
@@ -27,6 +28,7 @@
 if (!class_exists('CakeSession')) {
 	App::import('Core', 'CakeSession');
 }
+
 /**
  * SessionTest class
  *
@@ -34,6 +36,7 @@ if (!class_exists('CakeSession')) {
  * @subpackage    cake.tests.cases.libs
  */
 class SessionTest extends CakeTestCase {
+
 /**
  * Fixtures used in the SessionTest
  *
@@ -41,6 +44,7 @@ class SessionTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.session');
+
 /**
  * startCase method
  *
@@ -52,6 +56,7 @@ class SessionTest extends CakeTestCase {
 		$this->__gc_divisor = ini_get('session.gc_divisor');
 		ini_set('session.gc_divisor', '1');
 	}
+
 /**
  * endCase method
  *
@@ -62,6 +67,7 @@ class SessionTest extends CakeTestCase {
 		// Revert to the default setting
 		ini_set('session.gc_divisor', $this->__gc_divisor);
 	}
+
 /**
  * setUp method
  *
@@ -73,16 +79,18 @@ class SessionTest extends CakeTestCase {
 		$this->Session->start();
 		$this->Session->_checkValid();
 	}
+
 /**
  * tearDown method
  *
  * @access public
  * @return void
- */	
+ */
     function tearDown() {
         unset($_SESSION);
 		session_destroy();
     }
+
 /**
  * testSessionPath
  *
@@ -99,6 +107,7 @@ class SessionTest extends CakeTestCase {
 		$Session = new CakeSession('');
 		$this->assertEqual('/', $Session->path, 'Session path is empty, with "" as $base needs to be / %s');
 	}
+
 /**
  * testCheck method
  *
@@ -111,6 +120,7 @@ class SessionTest extends CakeTestCase {
 
 		$this->assertFalse($this->Session->check('NotExistingSessionTestCase'), false);
 	}
+
 /**
  * testSimpleRead method
  *
@@ -138,6 +148,7 @@ class SessionTest extends CakeTestCase {
 		$result = $this->Session->read('This.is.a.deep.array.my.friend');
 		$this->assertEqual('value', $result);
 	}
+
 /**
  * testId method
  *
@@ -153,6 +164,7 @@ class SessionTest extends CakeTestCase {
 		$result = $this->Session->id();
 		$this->assertEqual($result, 'MySessionId');
 	}
+
 /**
  * testStarted method
  *
@@ -166,6 +178,7 @@ class SessionTest extends CakeTestCase {
 		$this->assertFalse($this->Session->started());
 		$this->assertTrue($this->Session->start());
 	}
+
 /**
  * testError method
  *
@@ -181,6 +194,7 @@ class SessionTest extends CakeTestCase {
 		$result = $this->Session->error();
 		$this->assertEqual($result, "Failing.delete doesn't exist");
 	}
+
 /**
  * testDel method
  *
@@ -198,6 +212,7 @@ class SessionTest extends CakeTestCase {
 		$this->assertFalse($this->Session->check('Clearing.sale'));
 		$this->assertFalse($this->Session->check('Clearing'));
 	}
+
 /**
  * testWatchVar method
  *
@@ -217,6 +232,7 @@ class SessionTest extends CakeTestCase {
 
 		$this->assertFalse($this->Session->watch('Invalid.key'));
 	}
+
 /**
  * testIgnore method
  *
@@ -229,6 +245,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->ignore('Watching');
 		$this->assertTrue($this->Session->write('Watching', 'They found us!'));
 	}
+
 /**
  * testDestroy method
  *
@@ -242,6 +259,7 @@ class SessionTest extends CakeTestCase {
 		$this->assertFalse($this->Session->check('bulletProof'));
 		$this->assertNotEqual($id, $this->Session->id());
 	}
+
 /**
  * testCheckingSavedEmpty method
  *
@@ -261,6 +279,7 @@ class SessionTest extends CakeTestCase {
 		$this->assertTrue($this->Session->write('SessionTestCase', null));
 		$this->assertFalse($this->Session->check('SessionTestCase'));
 	}
+
 /**
  * testCheckKeyWithSpaces method
  *
@@ -275,6 +294,7 @@ class SessionTest extends CakeTestCase {
 		$this->assertTrue($this->Session->write('Session Test.Test Case', "test"));
 		$this->assertTrue($this->Session->check('Session Test.Test Case'));
 	}
+
 /**
  * testReadingSavedEmpty method
  *
@@ -295,6 +315,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->write('SessionTestCase', null);
 		$this->assertEqual($this->Session->read('SessionTestCase'), null);
 	}
+
 /**
  * testCheckUserAgentFalse method
  *
@@ -306,6 +327,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->_userAgent = md5('http://randomdomainname.com' . Configure::read('Security.salt'));
 		$this->assertTrue($this->Session->valid());
 	}
+
 /**
  * testCheckUserAgentTrue method
  *
@@ -317,6 +339,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->_userAgent = md5('http://randomdomainname.com' . Configure::read('Security.salt'));
 		$this->assertFalse($this->Session->valid());
 	}
+
 /**
  * testReadAndWriteWithDatabaseStorage method
  *
@@ -353,6 +376,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->destroy();
 		$this->assertFalse($this->Session->read('SessionTestCase'));
 	}
+
 /**
  * testReadAndWriteWithDatabaseStorage method
  *
@@ -389,6 +413,7 @@ class SessionTest extends CakeTestCase {
 		$this->Session->destroy();
 		$this->assertFalse($this->Session->read('SessionTestCase'));
 	}
+
 /**
  * testReadAndWriteWithDatabaseStorage method
  *
diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php
index f5169bfc8..07cf73109 100644
--- a/cake/tests/cases/libs/cake_socket.test.php
+++ b/cake/tests/cases/libs/cake_socket.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SocketTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'CakeSocket');
+
 /**
  * SocketTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'CakeSocket');
  * @subpackage    cake.tests.cases.libs
  */
 class CakeSocketTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -41,6 +44,7 @@ class CakeSocketTest extends CakeTestCase {
 	function setUp() {
 		$this->Socket = new CakeSocket();
 	}
+
 /**
  * tearDown method
  *
@@ -50,6 +54,7 @@ class CakeSocketTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Socket);
 	}
+
 /**
  * testConstruct method
  *
@@ -82,6 +87,7 @@ class CakeSocketTest extends CakeTestCase {
 
 		$this->assertIdentical($this->Socket->config, $baseConfig);
 	}
+
 /**
  * testSocketConnection method
  *
@@ -103,6 +109,7 @@ class CakeSocketTest extends CakeTestCase {
 		$this->Socket->connect();
 		$this->assertTrue($this->Socket->connected);
 	}
+
 /**
  * testSocketHost method
  *
@@ -124,6 +131,7 @@ class CakeSocketTest extends CakeTestCase {
 		$this->assertEqual($this->Socket->lastError(), null);
 		$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
 	}
+
 /**
  * testSocketWriting method
  *
@@ -134,6 +142,7 @@ class CakeSocketTest extends CakeTestCase {
 		$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
 		$this->assertTrue($this->Socket->write($request));
 	}
+
 /**
  * testSocketReading method
  *
@@ -144,7 +153,20 @@ class CakeSocketTest extends CakeTestCase {
 		$this->Socket = new CakeSocket(array('timeout' => 5));
 		$this->Socket->connect();
 		$this->assertEqual($this->Socket->read(26), null);
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 1);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertFalse($this->Socket->read(1024 * 1024));
+		$this->assertEqual($this->Socket->lastError(), '2: ' . __('Connection timed out', true));
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 30);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertEqual($this->Socket->read(26), null);
+		$this->assertEqual($this->Socket->lastError(), null);
 	}
+
 /**
  * testLastError method
  *
@@ -156,6 +178,7 @@ class CakeSocketTest extends CakeTestCase {
 		$this->Socket->setLastError(4, 'some error here');
 		$this->assertEqual($this->Socket->lastError(), '4: some error here');
 	}
+
 /**
  * testReset method
  *
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index f29f04c48..90f59686e 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CakeTestCaseTest file
  *
@@ -37,6 +38,7 @@ Mock::generate('CakeTestCase', 'CakeDispatcherMockTestCase');
 
 SimpleTest::ignore('SubjectCakeTestCase');
 SimpleTest::ignore('CakeDispatcherMockTestCase');
+
 /**
  * SubjectCakeTestCase
  *
@@ -44,6 +46,7 @@ SimpleTest::ignore('CakeDispatcherMockTestCase');
  * @subpackage    cake.tests.cases.libs
  */
 class SubjectCakeTestCase extends CakeTestCase {
+
 /**
  * Feed a Mocked Reporter to the subject case
  * prevents its pass/fails from affecting the real test
@@ -55,6 +58,7 @@ class SubjectCakeTestCase extends CakeTestCase {
 	function setReporter(&$reporter) {
 		$this->_reporter = &$reporter;
 	}
+
 /**
  * testDummy method
  *
@@ -64,6 +68,7 @@ class SubjectCakeTestCase extends CakeTestCase {
 	function testDummy() {
 	}
 }
+
 /**
  * CakeTestCaseTest
  *
@@ -71,6 +76,7 @@ class SubjectCakeTestCase extends CakeTestCase {
  * @subpackage    cake.tests.cases.libs
  */
 class CakeTestCaseTest extends CakeTestCase {
+
 /**
  * setUp
  *
@@ -83,6 +89,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->Case->setReporter($reporter);
 		$this->Reporter = $reporter;
 	}
+
 /**
  * tearDown
  *
@@ -93,6 +100,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		unset($this->Case);
 		unset($this->Reporter);
 	}
+
 /**
  * endTest
  *
@@ -102,6 +110,7 @@ class CakeTestCaseTest extends CakeTestCase {
 	function endTest() {
 		App::build();
 	}
+
 /**
  * testAssertGoodTags
  *
@@ -157,6 +166,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		);
 		$this->assertTrue($this->Case->assertTags($input, $pattern));
 	}
+
 /**
  * testBadAssertTags
  *
@@ -183,6 +193,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		);
 		$this->assertFalse($this->Case->assertTags($input, $pattern));
 	}
+
 /**
  * testBefore
  *
@@ -200,6 +211,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->assertTrue(is_a($this->Case->_fixtures['core.post'], 'CakeTestFixture'));
 		$this->assertEqual($this->Case->_fixtureClassMap['Post'], 'core.post');
 	}
+
 /**
  * testAfter
  *
@@ -216,6 +228,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->Case->after('testDummy');
 		$this->assertTrue($this->Case->__truncated);
 	}
+
 /**
  * testLoadFixtures
  *
@@ -228,7 +241,9 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->Case->before('start');
 		$this->expectError();
 		$this->Case->loadFixtures('Wrong!');
+		$this->Case->end();
 	}
+
 /**
  * testGetTests Method
  *
@@ -240,6 +255,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->assertEqual(array_slice($result, 0, 2), array('start', 'startCase'));
 		$this->assertEqual(array_slice($result, -2), array('endCase', 'end'));
 	}
+
 /**
  * TestTestAction
  *
@@ -268,6 +284,10 @@ class CakeTestCaseTest extends CakeTestCase {
 		$result = $this->Case->testAction('/tests_apps/set_action', array('return' => 'vars'));
 		$this->assertEqual($result, array('var' => 'string'));
 
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$fixture =& new PostFixture();
+		$fixture->create($db);
+
 		$result = $this->Case->testAction('/tests_apps_posts/add', array('return' => 'vars'));
 		$this->assertTrue(array_key_exists('posts', $result));
 		$this->assertEqual(count($result['posts']), 1);
@@ -309,7 +329,7 @@ class CakeTestCaseTest extends CakeTestCase {
 			)
 		));
 		$this->assertEqual(array_keys($result['data']), array('name', 'pork'));
-
+		$fixture->drop($db);
 
 		$db =& ConnectionManager::getDataSource('test_suite');
 		$_backPrefix = $db->config['prefix'];
@@ -319,11 +339,11 @@ class CakeTestCaseTest extends CakeTestCase {
 		$config['prefix'] = 'cake_testcase_test_';
 
 		ConnectionManager::create('cake_test_case', $config);
-		$db =& ConnectionManager::getDataSource('cake_test_case');
+		$db2 =& ConnectionManager::getDataSource('cake_test_case');
 
-		$fixture =& new PostFixture($db);
-		$fixture->create($db);
-		$fixture->insert($db);
+		$fixture =& new PostFixture($db2);
+		$fixture->create($db2);
+		$fixture->insert($db2);
 
 		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
 			'return' => 'vars',
@@ -332,15 +352,12 @@ class CakeTestCaseTest extends CakeTestCase {
 		));
 		$this->assertTrue(isset($result['posts']));
 		$this->assertEqual(count($result['posts']), 3);
-		$tables = $db->listSources(true);
+		$tables = $db2->listSources();
 		$this->assertFalse(in_array('cake_testaction_test_suite_posts', $tables));
 
-		$fixture->drop($db);
+		$fixture->drop($db2);
 
 		$db =& ConnectionManager::getDataSource('test_suite');
-		$db->config['prefix'] = $_backPrefix;
-		$fixture->drop($db);
-
 
 		//test that drop tables behaves as exepected with testAction
 		$db =& ConnectionManager::getDataSource('test_suite');
@@ -371,6 +388,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$db->config['prefix'] = $_backPrefix;
 		$fixture->drop($db);
 	}
+
 /**
  * testSkipIf
  *
@@ -380,6 +398,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->assertTrue($this->Case->skipIf(true));
 		$this->assertFalse($this->Case->skipIf(false));
 	}
+
 /**
  * testTestDispatcher
  *
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index 03a712a56..1c4d166a3 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CakeTestFixture file
  *
@@ -24,7 +25,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', 'DboSource');
+App::import('Datasource', 'DboSource', false);
+
 /**
  * CakeTestFixtureTestFixture class
  *
@@ -32,18 +34,21 @@ App::import('Core', 'DboSource');
  * @subpackage    cake.cake.tests.cases.libs
  */
 class CakeTestFixtureTestFixture extends CakeTestFixture {
+
 /**
  * name Property
  *
  * @var string
  */
 	var $name = 'FixtureTest';
+
 /**
  * table property
  *
  * @var string
  */
 	var $table = 'fixture_tests';
+
 /**
  * Fields array
  *
@@ -54,6 +59,7 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
 		'name' => array('type' => 'string', 'length' => '255'),
 		'created' => array('type' => 'datetime')
 	);
+
 /**
  * Records property
  *
@@ -65,6 +71,7 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
 		array('name' => 'Chewbacca')
 	);
 }
+
 /**
  * CakeTestFixtureImportFixture class
  *
@@ -72,12 +79,14 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
  * @subpackage    cake.cake.tests.cases.libs
  */
 class CakeTestFixtureImportFixture extends CakeTestFixture {
+
 /**
  * Name property
  *
  * @var string
  */
 	var $name = 'ImportFixture';
+
 /**
  * Import property
  *
@@ -85,6 +94,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture {
  */
 	var $import = array('table' => 'fixture_tests', 'connection' => 'test_suite');
 }
+
 /**
  * CakeTestFixtureDefaultImportFixture class
  *
@@ -92,6 +102,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture {
  * @subpackage    cake.cake.tests.cases.libs
  */
 class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
+
 /**
  * Name property
  *
@@ -99,6 +110,7 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
  */
 	var $name = 'ImportFixture';
 }
+
 /**
  * FixtureImportTestModel class
  *
@@ -111,6 +123,7 @@ class FixtureImportTestModel extends Model {
 	var $useDbConfig = 'test_suite';
 }
 Mock::generate('DboSource', 'FixtureMockDboSource');
+
 /**
  * Test case for CakeTestFixture
  *
@@ -118,6 +131,7 @@ Mock::generate('DboSource', 'FixtureMockDboSource');
  * @subpackage    cake.cake.tests.cases.libs
  */
 class CakeTestFixtureTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -128,6 +142,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$this->criticDb =& new FixtureMockDboSource();
 		$this->criticDb->fullDebug = true;
 	}
+
 /**
  * tearDown
  *
@@ -137,6 +152,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->criticDb);
 	}
+
 /**
  * testInit
  *
@@ -185,6 +201,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 
 		$Source->drop($this->db);
 	}
+
 /**
  * testImport
  *
@@ -220,6 +237,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 
 		$Source->drop($newTestSuiteDb);
 	}
+
 /**
  * test create method
  *
@@ -238,6 +256,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$return = $Fixture->create($this->criticDb);
 		$this->assertFalse($return);
 	}
+
 /**
  * test the insert method
  *
@@ -253,6 +272,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$this->assertTrue($this->criticDb->fullDebug);
 		$this->assertTrue($return);
 	}
+
 /**
  * Test the drop method
  *
@@ -273,6 +293,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$return = $Fixture->drop($this->criticDb);
 		$this->assertFalse($return);
 	}
+
 /**
  * Test the truncate method.
  *
diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php
index d40ed0e83..614101b29 100644
--- a/cake/tests/cases/libs/class_registry.test.php
+++ b/cake/tests/cases/libs/class_registry.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ClassRegistryTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'ClassRegistry');
+
 /**
  * ClassRegisterModel class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'ClassRegistry');
  * @subpackage    cake.tests.cases.libs
  */
 class ClassRegisterModel extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -40,6 +43,7 @@ class ClassRegisterModel extends CakeTestModel {
  */
 	var $useTable = false;
 }
+
 /**
  * RegisterArticle class
  *
@@ -47,6 +51,7 @@ class ClassRegisterModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RegisterArticle extends ClassRegisterModel {
+
 /**
  * name property
  *
@@ -55,6 +60,7 @@ class RegisterArticle extends ClassRegisterModel {
  */
 	var $name = 'RegisterArticle';
 }
+
 /**
  * RegisterArticleFeatured class
  *
@@ -62,6 +68,7 @@ class RegisterArticle extends ClassRegisterModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RegisterArticleFeatured extends ClassRegisterModel {
+
 /**
  * name property
  *
@@ -70,6 +77,7 @@ class RegisterArticleFeatured extends ClassRegisterModel {
  */
 	var $name = 'RegisterArticleFeatured';
 }
+
 /**
  * RegisterArticleTag class
  *
@@ -77,6 +85,7 @@ class RegisterArticleFeatured extends ClassRegisterModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RegisterArticleTag extends ClassRegisterModel {
+
 /**
  * name property
  *
@@ -85,6 +94,7 @@ class RegisterArticleTag extends ClassRegisterModel {
  */
 	var $name = 'RegisterArticleTag';
 }
+
 /**
  * RegistryPluginAppModel class
  *
@@ -92,6 +102,7 @@ class RegisterArticleTag extends ClassRegisterModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RegistryPluginAppModel extends ClassRegisterModel {
+
 /**
  * tablePrefix property
  *
@@ -100,6 +111,7 @@ class RegistryPluginAppModel extends ClassRegisterModel {
  */
 	var $tablePrefix = 'something_';
 }
+
 /**
  * TestRegistryPluginModel class
  *
@@ -107,6 +119,7 @@ class RegistryPluginAppModel extends ClassRegisterModel {
  * @subpackage    cake.tests.cases.libs
  */
 class TestRegistryPluginModel extends RegistryPluginAppModel {
+
 /**
  * name property
  *
@@ -115,6 +128,7 @@ class TestRegistryPluginModel extends RegistryPluginAppModel {
  */
 	var $name = 'TestRegistryPluginModel';
 }
+
 /**
  * RegisterCategory class
  *
@@ -122,6 +136,7 @@ class TestRegistryPluginModel extends RegistryPluginAppModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RegisterCategory extends ClassRegisterModel {
+
 /**
  * name property
  *
@@ -130,6 +145,7 @@ class RegisterCategory extends ClassRegisterModel {
  */
 	var $name = 'RegisterCategory';
 }
+
 /**
  * ClassRegistryTest class
  *
@@ -137,6 +153,7 @@ class RegisterCategory extends ClassRegisterModel {
  * @subpackage    cake.tests.cases.libs
  */
 class ClassRegistryTest extends CakeTestCase {
+
 /**
  * testAddModel method
  *
@@ -224,6 +241,7 @@ class ClassRegistryTest extends CakeTestCase {
 		$this->assertEqual('RegisterCategory', $Category->alias);
 		$this->assertEqual('ParentCategory', $ParentCategory->alias);
 	}
+
 /**
  * testClassRegistryFlush method
  *
@@ -239,6 +257,7 @@ class ClassRegistryTest extends CakeTestCase {
 		$this->assertFalse($NoArticleTag);
 		$this->assertTrue(is_a($ArticleTag, 'RegisterArticleTag'));
 	}
+
 /**
  * testAddMultipleModels method
  *
@@ -280,6 +299,7 @@ class ClassRegistryTest extends CakeTestCase {
 		$Tag = ClassRegistry::getObject('Tag');
 		$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));
 	}
+
 /**
  * testPluginAppModel method
  *
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
index 8ef083aba..bea98da24 100644
--- a/cake/tests/cases/libs/code_coverage_manager.test.php
+++ b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CodeCoverageManagerTest file
  *
@@ -24,9 +25,10 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', 'CodeCoverageManager');
+require_once CAKE . 'tests' . DS . 'lib' . DS . 'code_coverage_manager.php';
 require_once CAKE . 'tests' . DS . 'lib' . DS . 'cli_reporter.php';
 require_once CAKE . 'tests' . DS . 'lib' . DS . 'cake_reporter.php';
+
 /**
  * CodeCoverageManagerTest class
  *
@@ -34,6 +36,7 @@ require_once CAKE . 'tests' . DS . 'lib' . DS . 'cake_reporter.php';
  * @subpackage    cake.tests.cases.libs
  */
 class CodeCoverageManagerTest extends CakeTestCase {
+
 /**
  * Skip if XDebug not installed
  *
@@ -42,6 +45,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 	function skip() {
 		$this->skipIf(!extension_loaded('xdebug'), '%s XDebug not installed');
 	}
+
 /**
  * startTest Method
  * Store reference of $_GET to restore later.
@@ -51,6 +55,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 	function startCase() {
 		$this->_get = $_GET;
 	}
+
 /**
  * End Case - restore GET vars.
  *
@@ -59,6 +64,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 	function endCase() {
 		$_GET = $this->_get;
 	}
+
 /**
  * testNoTestCaseSupplied method
  *
@@ -84,6 +90,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 			$folder = new Folder();
 			$folder->cd($path);
 			$contents = $folder->ls();
+
 /**
  * remove method
  *
@@ -103,6 +110,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * testGetTestObjectFileNameFromTestCaseFile method
  *
@@ -143,6 +151,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 		$expected = $manager->__testObjectFileFromCaseFile('libs/set.test.php', false);
 		$this->assertIdentical(ROOT.DS.'cake'.DS.'libs'.DS.'set.php', $expected);
 	}
+
 /**
  * testOfHtmlReport method
  *
@@ -159,6 +168,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
  * @subpackage    cake.tests.cases.libs
  */
 		class Set extends Object {
+
 /**
 		 * Value of the Set object.
 		 *
@@ -166,6 +176,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 		 * @access public
 		 */
 			var \$value = array();
+
 /**
 		 * Constructor. Defaults to an empty array.
 		 *
@@ -178,6 +189,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 					\$this->value = func_get_args();
 				}
 			}
+
 /**
 		 * Returns the contents of the Set object
 		 *
@@ -187,6 +199,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
 			function &get() {
 				return \$this->value;
 			}
+
 /**
 		 * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
 		 * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
@@ -300,6 +313,7 @@ PHP;
 			}
 		}
 	}
+
 /**
  * testOfHtmlDiffReport method
  *
@@ -316,6 +330,7 @@ PHP;
  * @subpackage    cake.tests.cases.libs
  */
 		class Set extends Object {
+
 /**
 		 * Value of the Set object.
 		 *
@@ -323,6 +338,7 @@ PHP;
 		 * @access public
 		 */
 			var \$value = array();
+
 /**
 		 * Constructor. Defaults to an empty array.
 		 *
@@ -335,6 +351,7 @@ PHP;
 					\$this->value = func_get_args();
 				}
 			}
+
 /**
 		 * Returns the contents of the Set object
 		 *
@@ -344,6 +361,7 @@ PHP;
 			function &get() {
 				return \$this->value;
 			}
+
 /**
 		 * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
 		 * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
@@ -560,6 +578,7 @@ PHP;
 			$this->assertPattern($pattern, $line, $num.': '.$line." fails");
 		}
 	}
+
 /**
  * testArrayStrrpos method
  *
@@ -592,6 +611,7 @@ PHP;
 		$this->assertEqual(1, $manager->__array_strpos($a, 'orange'));
 		$this->assertEqual(2, $manager->__array_strpos($a, 'orange', true));
 	}
+
 /**
  * testGetExecutableLines method
  *
@@ -629,6 +649,7 @@ HTML;
 			$this->assertIdentical(trim($line), '');
 		}
 	}
+
 /**
  * testCalculateCodeCoverage method
  *
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 534992e26..c4e88e2e7 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ConfigureTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Configure');
+
 /**
  * ConfigureTest
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Configure');
  * @subpackage    cake.tests.cases.libs
  */
 class ConfigureTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -41,9 +44,10 @@ class ConfigureTest extends CakeTestCase {
 	function setUp() {
 		$this->_cacheDisable = Configure::read('Cache.disable');
 		$this->_debug = Configure::read('debug');
-		
+
 		Configure::write('Cache.disable', true);
 	}
+
 /**
  * endTest
  *
@@ -52,7 +56,8 @@ class ConfigureTest extends CakeTestCase {
  */
 	function endTest() {
 		App::build();
-	}	
+	}
+
 /**
  * tearDown method
  *
@@ -81,6 +86,7 @@ class ConfigureTest extends CakeTestCase {
 		Configure::write('debug', $this->_debug);
 		Configure::write('Cache.disable', $this->_cacheDisable);
 	}
+
 /**
  * testRead method
  *
@@ -100,6 +106,7 @@ class ConfigureTest extends CakeTestCase {
 		$result = Configure::read('debug');
 		$this->assertTrue($result >= 0);
 	}
+
 /**
  * testWrite method
  *
@@ -114,7 +121,23 @@ class ConfigureTest extends CakeTestCase {
 		Configure::write('SomeName.someKey', null);
 		$result = Configure::read('SomeName.someKey');
 		$this->assertEqual($result, null);
+
+		$expected = array('One' => array('Two' => array('Three' => array('Four' => array('Five' => 'cool')))));
+		Configure::write('Key', $expected);
+
+		$result = Configure::read('Key');
+		$this->assertEqual($expected, $result);
+
+		$result = Configure::read('Key.One');
+		$this->assertEqual($expected['One'], $result);
+
+		$result = Configure::read('Key.One.Two');
+		$this->assertEqual($expected['One']['Two'], $result);
+
+		$result = Configure::read('Key.One.Two.Three.Four.Five');
+		$this->assertEqual('cool', $result);
 	}
+
 /**
  * testSetErrorReporting Level
  *
@@ -136,6 +159,7 @@ class ConfigureTest extends CakeTestCase {
 		$result = ini_get('error_reporting');
 		$this->assertEqual($result, 0);
 	}
+
 /**
  * testDelete method
  *
@@ -167,6 +191,7 @@ class ConfigureTest extends CakeTestCase {
 		$result = Configure::read('SomeName.otherKey');
 		$this->assertTrue($result === null);
 	}
+
 /**
  * testLoad method
  *
@@ -180,6 +205,7 @@ class ConfigureTest extends CakeTestCase {
 		$result = Configure::load('config');
 		$this->assertTrue($result === null);
 	}
+
 /**
  * testStore method
  *
@@ -203,6 +229,7 @@ class ConfigureTest extends CakeTestCase {
 		$config = Configure::read('AnotherExample');
 		$this->assertEqual($config, $expected);
 	}
+
 /**
  * testVersion method
  *
@@ -214,6 +241,7 @@ class ConfigureTest extends CakeTestCase {
 		$this->assertTrue(version_compare($result, '1.2', '>='));
 	}
 }
+
 /**
  * AppImportTest class
  *
@@ -221,6 +249,7 @@ class ConfigureTest extends CakeTestCase {
  * @subpackage    cake.tests.cases.libs
  */
 class AppImportTest extends UnitTestCase {
+
 /**
  * testBuild method
  *
@@ -252,6 +281,7 @@ class AppImportTest extends UnitTestCase {
 		$defaults = App::path('models');
 		$this->assertEqual($old, $defaults);
 	}
+
 /**
  * testBuildWithReset method
  *
@@ -280,6 +310,7 @@ class AppImportTest extends UnitTestCase {
 		$defaults = App::path('models');
 		$this->assertEqual($old, $defaults);
 	}
+
 /**
  * testCore method
  *
@@ -297,6 +328,7 @@ class AppImportTest extends UnitTestCase {
 		$this->assertEqual(array(ROOT . DS . LIBS . 'controller' . DS), $controller);
 
 	}
+
 /**
  * testListObjects method
  *
@@ -340,6 +372,7 @@ class AppImportTest extends UnitTestCase {
 		$result = App::objects('NonExistingType');
 		$this->assertFalse($result);
 	}
+
 /**
  * testClassLoading method
  *
@@ -350,7 +383,16 @@ class AppImportTest extends UnitTestCase {
 		$file = App::import();
 		$this->assertTrue($file);
 
-		$file = App::import('Core', 'Model', false);
+		$file = App::import('Model', 'Model', false);
+		$this->assertTrue($file);
+
+		$file = App::import('Controller', 'Controller', false);
+		$this->assertTrue($file);
+
+		$file = App::import('Component', 'Component', false);
+		$this->assertTrue($file);
+
+		$file = App::import('Shell', 'Shell', false);
 		$this->assertTrue($file);
 
 		$file = App::import('Model', 'SomeRandomModelThatDoesNotExist', false);
@@ -429,6 +471,7 @@ class AppImportTest extends UnitTestCase {
 
 		App::build();
 	}
+
 /**
  * testFileLoading method
  *
@@ -443,6 +486,7 @@ class AppImportTest extends UnitTestCase {
 		$this->assertFalse($file);
 	}
 	// import($type = null, $name = null, $parent = true, $file = null, $search = array(), $return = false) {
+
 /**
  * testFileLoadingWithArray method
  *
@@ -460,6 +504,7 @@ class AppImportTest extends UnitTestCase {
 		$file = App::import($type);
 		$this->assertFalse($file);
 	}
+
 /**
  * testFileLoadingReturnValue method
  *
@@ -479,6 +524,7 @@ class AppImportTest extends UnitTestCase {
 
 		$this->assertTrue(isset($file['Cake.version']));
 	}
+
 /**
  * testLoadingWithSearch method
  *
@@ -492,6 +538,7 @@ class AppImportTest extends UnitTestCase {
 		$file = App::import('File', 'AnotherNewName', false, array(LIBS), 'config.php');
 		$this->assertFalse($file);
 	}
+
 /**
  * testLoadingWithSearchArray method
  *
@@ -507,6 +554,7 @@ class AppImportTest extends UnitTestCase {
 		$file = App::import($type);
 		$this->assertFalse($file);
 	}
+
 /**
  * testMultipleLoading method
  *
@@ -537,10 +585,12 @@ class AppImportTest extends UnitTestCase {
 		$load = App::import($toLoad);
 		$this->assertTrue($load);
 	}
+
 /**
  * This test only works if you have plugins/my_plugin set up.
  * plugins/my_plugin/models/my_plugin.php and other_model.php
  */
+
 /*
 	function testMultipleLoadingByType() {
 		$classes = array_flip(get_declared_classes());
@@ -561,7 +611,7 @@ class AppImportTest extends UnitTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 			'vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
 		), true);
-		
+
 		ob_start();
 		$result = App::import('Vendor', 'TestPlugin.TestPluginAsset', array('ext' => 'css'));
 		$text = ob_get_clean();
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index 446e7866a..459ead972 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ComponentTest file
  *
@@ -24,9 +25,11 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', array('Component', 'Controller'));
+App::import('Controller', 'Controller', false);
+App::import('Controller', 'Component', false);
 
 if (!class_exists('AppController')) {
+
 /**
  * AppController class
  *
@@ -34,6 +37,7 @@ if (!class_exists('AppController')) {
  * @subpackage    cake.tests.cases.libs.controller
  */
 	class AppController extends Controller {
+
 /**
  * name property
  *
@@ -41,6 +45,7 @@ if (!class_exists('AppController')) {
  * @access public
  */
 		var $name = 'App';
+
 /**
  * uses property
  *
@@ -48,6 +53,7 @@ if (!class_exists('AppController')) {
  * @access public
  */
 		var $uses = array();
+
 /**
  * helpers property
  *
@@ -55,6 +61,7 @@ if (!class_exists('AppController')) {
  * @access public
  */
 		var $helpers = array();
+
 /**
  * components property
  *
@@ -66,6 +73,7 @@ if (!class_exists('AppController')) {
 } elseif (!defined('APP_CONTROLLER_EXISTS')){
 	define('APP_CONTROLLER_EXISTS', true);
 }
+
 /**
  * ParamTestComponent
  *
@@ -73,6 +81,7 @@ if (!class_exists('AppController')) {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ParamTestComponent extends Object {
+
 /**
  * name property
  *
@@ -80,6 +89,7 @@ class ParamTestComponent extends Object {
  * @access public
  */
 	var $name = 'ParamTest';
+
 /**
  * components property
  *
@@ -87,6 +97,7 @@ class ParamTestComponent extends Object {
  * @access public
  */
 	var $components = array('Banana' => array('config' => 'value'));
+
 /**
  * initialize method
  *
@@ -105,6 +116,7 @@ class ParamTestComponent extends Object {
 		}
 	}
 }
+
 /**
  * ComponentTestController class
  *
@@ -112,6 +124,7 @@ class ParamTestComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ComponentTestController extends AppController {
+
 /**
  * name property
  *
@@ -119,6 +132,7 @@ class ComponentTestController extends AppController {
  * @access public
  */
 	var $name = 'ComponentTest';
+
 /**
  * uses property
  *
@@ -127,6 +141,7 @@ class ComponentTestController extends AppController {
  */
 	var $uses = array();
 }
+
 /**
  * AppleComponent class
  *
@@ -134,6 +149,7 @@ class ComponentTestController extends AppController {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class AppleComponent extends Object {
+
 /**
  * components property
  *
@@ -141,6 +157,7 @@ class AppleComponent extends Object {
  * @access public
  */
 	var $components = array('Orange');
+
 /**
  * testName property
  *
@@ -148,6 +165,7 @@ class AppleComponent extends Object {
  * @access public
  */
 	var $testName = null;
+
 /**
  * startup method
  *
@@ -159,6 +177,7 @@ class AppleComponent extends Object {
 		$this->testName = $controller->name;
 	}
 }
+
 /**
  * OrangeComponent class
  *
@@ -166,6 +185,7 @@ class AppleComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class OrangeComponent extends Object {
+
 /**
  * components property
  *
@@ -173,6 +193,7 @@ class OrangeComponent extends Object {
  * @access public
  */
 	var $components = array('Banana');
+
 /**
  * initialize method
  *
@@ -185,6 +206,7 @@ class OrangeComponent extends Object {
 		$this->Banana->testField = 'OrangeField';
 		$this->settings = $settings;
 	}
+
 /**
  * startup method
  *
@@ -196,6 +218,7 @@ class OrangeComponent extends Object {
 		$controller->foo = 'pass';
 	}
 }
+
 /**
  * BananaComponent class
  *
@@ -203,6 +226,7 @@ class OrangeComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class BananaComponent extends Object {
+
 /**
  * testField property
  *
@@ -210,6 +234,7 @@ class BananaComponent extends Object {
  * @access public
  */
 	var $testField = 'BananaField';
+
 /**
  * startup method
  *
@@ -221,6 +246,7 @@ class BananaComponent extends Object {
 		$controller->bar = 'fail';
 	}
 }
+
 /**
  * MutuallyReferencingOneComponent class
  *
@@ -228,6 +254,7 @@ class BananaComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class MutuallyReferencingOneComponent extends Object {
+
 /**
  * components property
  *
@@ -236,6 +263,7 @@ class MutuallyReferencingOneComponent extends Object {
  */
 	var $components = array('MutuallyReferencingTwo');
 }
+
 /**
  * MutuallyReferencingTwoComponent class
  *
@@ -243,6 +271,7 @@ class MutuallyReferencingOneComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class MutuallyReferencingTwoComponent extends Object {
+
 /**
  * components property
  *
@@ -251,6 +280,7 @@ class MutuallyReferencingTwoComponent extends Object {
  */
 	var $components = array('MutuallyReferencingOne');
 }
+
 /**
  * SomethingWithEmailComponent class
  *
@@ -258,6 +288,7 @@ class MutuallyReferencingTwoComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class SomethingWithEmailComponent extends Object {
+
 /**
  * components property
  *
@@ -266,6 +297,7 @@ class SomethingWithEmailComponent extends Object {
  */
 	var $components = array('Email');
 }
+
 /**
  * ComponentTest class
  *
@@ -273,6 +305,7 @@ class SomethingWithEmailComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ComponentTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -285,6 +318,7 @@ class ComponentTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 	}
+
 /**
  * tearDown method
  *
@@ -295,6 +329,7 @@ class ComponentTest extends CakeTestCase {
 		App::build();
 		ClassRegistry::flush();
 	}
+
 /**
  * testLoadComponents method
  *
@@ -345,6 +380,7 @@ class ComponentTest extends CakeTestCase {
 		$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
 		$this->assertTrue(is_a($Controller->Cookie, 'CookieComponent'));
 	}
+
 /**
  * test component loading
  *
@@ -363,6 +399,7 @@ class ComponentTest extends CakeTestCase {
 		$this->assertTrue(empty($Controller->Apple->Session));
 		$this->assertTrue(empty($Controller->Apple->Orange->Session));
 	}
+
 /**
  * Tests Component::startup() and only running callbacks for components directly attached to
  * the controller.
@@ -384,6 +421,7 @@ class ComponentTest extends CakeTestCase {
 		$this->assertEqual(isset($Controller->foo), $expected);
 		$this->assertFalse(isset($Controller->bar));
 	}
+
 /**
  * test a component being used more than once.
  *
@@ -398,6 +436,7 @@ class ComponentTest extends CakeTestCase {
 		$this->assertEqual($Controller->Banana->testField, 'OrangeField');
 		$this->assertEqual($Controller->Orange->Banana->testField, 'OrangeField');
 	}
+
 /**
  * Test Component declarations with Parameters
  * tests merging of component parameters and merging / construction of components.
@@ -451,6 +490,7 @@ class ComponentTest extends CakeTestCase {
 		$expected = array('setting' => array('itemx'), 'colour' => 'blood orange');
 		$this->assertEqual($Controller->Orange->settings, $expected, 'Params duplication has occured %s');
 	}
+
 /**
  * Test mutually referencing components.
  *
@@ -475,6 +515,7 @@ class ComponentTest extends CakeTestCase {
 			'MutuallyReferencingOneComponent'
 		));
 	}
+
 /**
  * Test mutually referencing components.
  *
@@ -501,6 +542,7 @@ class ComponentTest extends CakeTestCase {
 			'ComponentTestController'
 		));
 	}
+
 /**
  * Test that SessionComponent doesn't get added if its already in the components array.
  *
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 755d7ae19..fdf981959 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AclComponentTest file
  *
@@ -28,6 +29,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 App::import(array('controller' .DS . 'components' . DS . 'acl', 'model' . DS . 'db_acl'));
+
 /**
  * AclNodeTwoTestBase class
  *
@@ -35,6 +37,7 @@ App::import(array('controller' .DS . 'components' . DS . 'acl', 'model' . DS . '
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AclNodeTwoTestBase extends AclNode {
+
 /**
  * useDbConfig property
  *
@@ -42,6 +45,7 @@ class AclNodeTwoTestBase extends AclNode {
  * @access public
  */
 	var $useDbConfig = 'test_suite';
+
 /**
  * cacheSources property
  *
@@ -50,6 +54,7 @@ class AclNodeTwoTestBase extends AclNode {
  */
 	var $cacheSources = false;
 }
+
 /**
  * AroTwoTest class
  *
@@ -57,6 +62,7 @@ class AclNodeTwoTestBase extends AclNode {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AroTwoTest extends AclNodeTwoTestBase {
+
 /**
  * name property
  *
@@ -64,6 +70,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
  * @access public
  */
 	var $name = 'AroTwoTest';
+
 /**
  * useTable property
  *
@@ -71,6 +78,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
  * @access public
  */
 	var $useTable = 'aro_twos';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -79,6 +87,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
  */
 	var $hasAndBelongsToMany = array('AcoTwoTest' => array('with' => 'PermissionTwoTest'));
 }
+
 /**
  * AcoTwoTest class
  *
@@ -86,6 +95,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AcoTwoTest extends AclNodeTwoTestBase {
+
 /**
  * name property
  *
@@ -93,6 +103,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
  * @access public
  */
 	var $name = 'AcoTwoTest';
+
 /**
  * useTable property
  *
@@ -100,6 +111,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
  * @access public
  */
 	var $useTable = 'aco_twos';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -108,6 +120,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
  */
 	var $hasAndBelongsToMany = array('AroTwoTest' => array('with' => 'PermissionTwoTest'));
 }
+
 /**
  * PermissionTwoTest class
  *
@@ -115,6 +128,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class PermissionTwoTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -122,6 +136,7 @@ class PermissionTwoTest extends CakeTestModel {
  * @access public
  */
 	var $name = 'PermissionTwoTest';
+
 /**
  * useTable property
  *
@@ -129,6 +144,7 @@ class PermissionTwoTest extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'aros_aco_twos';
+
 /**
  * cacheQueries property
  *
@@ -136,6 +152,7 @@ class PermissionTwoTest extends CakeTestModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * belongsTo property
  *
@@ -143,6 +160,7 @@ class PermissionTwoTest extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('AroTwoTest' => array('foreignKey' => 'aro_id'), 'AcoTwoTest' => array('foreignKey' => 'aco_id'));
+
 /**
  * actsAs property
  *
@@ -151,6 +169,7 @@ class PermissionTwoTest extends CakeTestModel {
  */
 	var $actsAs = null;
 }
+
 /**
  * DbAclTwoTest class
  *
@@ -158,6 +177,7 @@ class PermissionTwoTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAclTwoTest extends DbAcl {
+
 /**
  * construct method
  *
@@ -171,6 +191,7 @@ class DbAclTwoTest extends DbAcl {
 		$this->Aro->Permission =& new PermissionTwoTest();
 	}
 }
+
 /**
  * IniAclTest class
  *
@@ -179,6 +200,7 @@ class DbAclTwoTest extends DbAcl {
  */
 class IniAclTest extends IniAcl {
 }
+
 /**
  * Short description for class.
  *
@@ -186,6 +208,7 @@ class IniAclTest extends IniAcl {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AclComponentTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -193,6 +216,7 @@ class AclComponentTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.aro_two', 'core.aco_two', 'core.aros_aco_two');
+
 /**
  * startTest method
  *
@@ -202,6 +226,7 @@ class AclComponentTest extends CakeTestCase {
 	function startTest() {
 		$this->Acl =& new AclComponent();
 	}
+
 /**
  * before method
  *
@@ -214,6 +239,7 @@ class AclComponentTest extends CakeTestCase {
 		Configure::write('Acl.database', 'test_suite');
 		parent::before($method);
 	}
+
 /**
  * tearDown method
  *
@@ -223,6 +249,7 @@ class AclComponentTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Acl);
 	}
+
 /**
  * testAclCreate method
  *
@@ -250,6 +277,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'PiecesOfFlair'));
 		$this->assertTrue($this->Acl->Aco->save());
 	}
+
 /**
  * testAclCreateWithParent method
  *
@@ -269,6 +297,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->assertEqual($result['AroTwoTest']['lft'], 16);
 		$this->assertEqual($result['AroTwoTest']['rght'], 17);
 	}
+
 /**
  * testDbAclAllow method
  *
@@ -309,6 +338,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->expectError('DbAcl::allow() - Invalid node');
 		$this->assertFalse($this->Acl->allow('Homer', 'tpsReports', 'create'));
 	}
+
 /**
  * testDbAclCheck method
  *
@@ -338,6 +368,7 @@ class AclComponentTest extends CakeTestCase {
 
 		$this->assertFalse($this->Acl->check('root/users/Milton', 'smash', 'delete'));
 	}
+
 /**
  * testDbAclCascadingDeny function
  *
@@ -355,6 +386,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->assertFalse($this->Acl->check('admin', 'tpsReports', 'delete'));
 		$this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'delete'));
 	}
+
 /**
  * testDbAclDeny method
  *
@@ -384,6 +416,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->expectError('DbAcl::allow() - Invalid node');
 		$this->assertFalse($this->Acl->deny('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create'));
 	}
+
 /**
  * testAclNodeLookup method
  *
@@ -408,6 +441,7 @@ class AclComponentTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDbInherit method
  *
@@ -425,6 +459,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->Acl->inherit('Milton', 'smash', 'read');
 		$this->assertTrue($this->Acl->check('Milton', 'smash', 'read'));
 	}
+
 /**
  * testDbGrant method
  *
@@ -446,6 +481,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->expectError('DbAcl::allow() - Invalid node');
 		$this->assertFalse($this->Acl->grant('Peter', 'ROOT/tpsReports/DoesNotExist', 'create'));
 	}
+
 /**
  * testDbRevoke method
  *
@@ -466,6 +502,7 @@ class AclComponentTest extends CakeTestCase {
 		$this->expectError('DbAcl::allow() - Invalid node');
 		$this->assertFalse($this->Acl->deny('Bobs', 'ROOT/printers/DoesNotExist', 'create'));
 	}
+
 /**
  * testStartup method
  *
@@ -476,6 +513,7 @@ class AclComponentTest extends CakeTestCase {
 		$controller = new Controller();
 		$this->assertTrue($this->Acl->startup($controller));
 	}
+
 /**
  * testIniReadConfigFile
  *
@@ -524,6 +562,7 @@ class AclComponentTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testIniCheck method
  *
@@ -549,6 +588,7 @@ class AclComponentTest extends CakeTestCase {
 
 		$this->assertFalse($this->Acl->check('nobody', 'comments'));
 	}
+
 /**
  * debug function - to help editing/creating test cases for the ACL component
  *
@@ -598,6 +638,7 @@ class AclComponentTest extends CakeTestCase {
 		}
 		debug (implode("\r\n", $permissions));
 	}
+
 /**
  * pad function
  * Used by debug to format strings used in the data dump
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 9b17a6988..cc6ba4b3a 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AutComponentTest file
  *
@@ -27,6 +28,7 @@
 App::import(array('controller' . DS . 'components' . DS .'auth', 'controller' . DS . 'components' . DS .'acl'));
 App::import(array('controller' . DS . 'components' . DS . 'acl', 'model' . DS . 'db_acl'));
 App::import('Core', 'Xml');
+
 /**
 * TestAuthComponent class
 *
@@ -34,6 +36,7 @@ App::import('Core', 'Xml');
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class TestAuthComponent extends AuthComponent {
+
 /**
  * testStop property
  *
@@ -41,6 +44,7 @@ class TestAuthComponent extends AuthComponent {
  * @access public
  */
 	var $testStop = false;
+
 /**
  * Sets default login state
  *
@@ -48,6 +52,7 @@ class TestAuthComponent extends AuthComponent {
  * @access protected
  */
 	var $_loggedIn = true;
+
 /**
  * stop method
  *
@@ -58,6 +63,7 @@ class TestAuthComponent extends AuthComponent {
 		$this->testStop = true;
 	}
 }
+
 /**
 * AuthUser class
 *
@@ -65,6 +71,7 @@ class TestAuthComponent extends AuthComponent {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class AuthUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -72,6 +79,7 @@ class AuthUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'AuthUser';
+
 /**
  * useDbConfig property
  *
@@ -79,6 +87,7 @@ class AuthUser extends CakeTestModel {
  * @access public
  */
 	var $useDbConfig = 'test_suite';
+
 /**
  * parentNode method
  *
@@ -88,6 +97,7 @@ class AuthUser extends CakeTestModel {
 	function parentNode() {
 		return true;
 	}
+
 /**
  * bindNode method
  *
@@ -98,6 +108,7 @@ class AuthUser extends CakeTestModel {
 	function bindNode($object) {
 		return 'Roles/Admin';
 	}
+
 /**
  * isAuthorized method
  *
@@ -114,6 +125,7 @@ class AuthUser extends CakeTestModel {
 		return false;
 	}
 }
+
 /**
  * AuthUserCustomField class
  *
@@ -121,6 +133,7 @@ class AuthUser extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AuthUserCustomField extends AuthUser {
+
 /**
  * name property
  *
@@ -129,6 +142,7 @@ class AuthUserCustomField extends AuthUser {
  */
 	var $name = 'AuthUserCustomField';
 }
+
 /**
 * UuidUser class
 *
@@ -136,6 +150,7 @@ class AuthUserCustomField extends AuthUser {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class UuidUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -143,6 +158,7 @@ class UuidUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'UuidUser';
+
 /**
  * useDbConfig property
  *
@@ -150,6 +166,7 @@ class UuidUser extends CakeTestModel {
  * @access public
  */
 	var $useDbConfig = 'test_suite';
+
 /**
  * useTable property
  *
@@ -157,6 +174,7 @@ class UuidUser extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'uuids';
+
 /**
  * parentNode method
  *
@@ -166,6 +184,7 @@ class UuidUser extends CakeTestModel {
 	function parentNode() {
 		return true;
 	}
+
 /**
  * bindNode method
  *
@@ -176,6 +195,7 @@ class UuidUser extends CakeTestModel {
 	function bindNode($object) {
 		return 'Roles/Admin';
 	}
+
 /**
  * isAuthorized method
  *
@@ -192,6 +212,7 @@ class UuidUser extends CakeTestModel {
 		return false;
 	}
 }
+
 /**
 * AuthTestController class
 *
@@ -199,6 +220,7 @@ class UuidUser extends CakeTestModel {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class AuthTestController extends Controller {
+
 /**
  * name property
  *
@@ -206,6 +228,7 @@ class AuthTestController extends Controller {
  * @access public
  */
 	var $name = 'AuthTest';
+
 /**
  * uses property
  *
@@ -213,6 +236,7 @@ class AuthTestController extends Controller {
  * @access public
  */
 	var $uses = array('AuthUser');
+
 /**
  * components property
  *
@@ -220,6 +244,7 @@ class AuthTestController extends Controller {
  * @access public
  */
 	var $components = array('Auth', 'Acl');
+
 /**
  * testUrl property
  *
@@ -227,6 +252,7 @@ class AuthTestController extends Controller {
  * @access public
  */
 	var $testUrl = null;
+
 /**
  * construct method
  *
@@ -238,6 +264,7 @@ class AuthTestController extends Controller {
 		Router::setRequestInfo(array($this->params, array('base' => null, 'here' => '/auth_test', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())));
 		parent::__construct();
 	}
+
 /**
  * beforeFilter method
  *
@@ -246,6 +273,7 @@ class AuthTestController extends Controller {
  */
 	function beforeFilter() {
 	}
+
 /**
  * login method
  *
@@ -254,6 +282,7 @@ class AuthTestController extends Controller {
  */
 	function login() {
 	}
+
 /**
  * admin_login method
  *
@@ -262,6 +291,7 @@ class AuthTestController extends Controller {
  */
 	function admin_login() {
 	}
+
 /**
  * logout method
  *
@@ -271,6 +301,7 @@ class AuthTestController extends Controller {
 	function logout() {
 		// $this->redirect($this->Auth->logout());
 	}
+
 /**
  * add method
  *
@@ -280,6 +311,7 @@ class AuthTestController extends Controller {
 	function add() {
 		echo "add";
 	}
+
 /**
  * add method
  *
@@ -289,6 +321,7 @@ class AuthTestController extends Controller {
 	function camelCase() {
 		echo "camelCase";
 	}
+
 /**
  * redirect method
  *
@@ -302,6 +335,7 @@ class AuthTestController extends Controller {
 		$this->testUrl = Router::url($url);
 		return false;
 	}
+
 /**
  * isAuthorized method
  *
@@ -314,6 +348,7 @@ class AuthTestController extends Controller {
 		}
 		return true;
 	}
+
 /**
  * Mock delete method
  *
@@ -329,6 +364,7 @@ class AuthTestController extends Controller {
 		}
 	}
 }
+
 /**
  * AjaxAuthController class
  *
@@ -336,6 +372,7 @@ class AuthTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class AjaxAuthController extends Controller {
+
 /**
  * name property
  *
@@ -343,6 +380,7 @@ class AjaxAuthController extends Controller {
  * @access public
  */
 	var $name = 'AjaxAuth';
+
 /**
  * components property
  *
@@ -350,6 +388,7 @@ class AjaxAuthController extends Controller {
  * @access public
  */
 	var $components = array('TestAuth');
+
 /**
  * uses property
  *
@@ -357,6 +396,7 @@ class AjaxAuthController extends Controller {
  * @access public
  */
 	var $uses = array();
+
 /**
  * testUrl property
  *
@@ -364,6 +404,7 @@ class AjaxAuthController extends Controller {
  * @access public
  */
 	var $testUrl = null;
+
 /**
  * beforeFilter method
  *
@@ -375,6 +416,7 @@ class AjaxAuthController extends Controller {
 		$this->TestAuth->userModel = 'AuthUser';
 		$this->TestAuth->RequestHandler->ajaxLayout = 'ajax2';
 	}
+
 /**
  * add method
  *
@@ -386,6 +428,7 @@ class AjaxAuthController extends Controller {
 			echo 'Added Record';
 		}
 	}
+
 /**
  * redirect method
  *
@@ -400,6 +443,7 @@ class AjaxAuthController extends Controller {
 		return false;
 	}
 }
+
 /**
 * AuthTest class
 *
@@ -407,6 +451,7 @@ class AjaxAuthController extends Controller {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class AuthTest extends CakeTestCase {
+
 /**
  * name property
  *
@@ -414,6 +459,7 @@ class AuthTest extends CakeTestCase {
  * @access public
  */
 	var $name = 'Auth';
+
 /**
  * fixtures property
  *
@@ -421,6 +467,7 @@ class AuthTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.uuid', 'core.auth_user', 'core.auth_user_custom_field', 'core.aro', 'core.aco', 'core.aros_aco', 'core.aco_action');
+
 /**
  * initialized property
  *
@@ -428,6 +475,7 @@ class AuthTest extends CakeTestCase {
  * @access public
  */
 	var $initialized = false;
+
 /**
  * startTest method
  *
@@ -457,6 +505,7 @@ class AuthTest extends CakeTestCase {
 
 		$this->initialized = true;
 	}
+
 /**
  * endTest method
  *
@@ -473,6 +522,7 @@ class AuthTest extends CakeTestCase {
 		ClassRegistry::flush();
 		unset($this->Controller, $this->AuthUser);
 	}
+
 /**
  * testNoAuth method
  *
@@ -482,6 +532,7 @@ class AuthTest extends CakeTestCase {
 	function testNoAuth() {
 		$this->assertFalse($this->Controller->Auth->isAuthorized());
 	}
+
 /**
  * testIsErrorOrTests
  *
@@ -502,6 +553,7 @@ class AuthTest extends CakeTestCase {
 		$this->Controller->params['action'] = 'index';
 		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
 	}
+
 /**
  * testLogin method
  *
@@ -573,6 +625,7 @@ class AuthTest extends CakeTestCase {
 		$this->assertEqual($user, $expected);
 		$this->Controller->Session->del('Auth');
 	}
+
 /**
  * testAuthorizeFalse method
  *
@@ -598,6 +651,7 @@ class AuthTest extends CakeTestCase {
 		$result = $this->Controller->Auth->startup($this->Controller);
 		$this->assertFalse($result);
 	}
+
 /**
  * testAuthorizeController method
  *
@@ -621,6 +675,7 @@ class AuthTest extends CakeTestCase {
 
 		$this->Controller->Session->del('Auth');
 	}
+
 /**
  * testAuthorizeModel method
  *
@@ -646,6 +701,7 @@ class AuthTest extends CakeTestCase {
 		$result = $this->Controller->Auth->isAuthorized();
 		$this->assertFalse($result);
 	}
+
 /**
  * testAuthorizeCrud method
  *
@@ -707,6 +763,7 @@ class AuthTest extends CakeTestCase {
 		$this->Controller->Auth->startup($this->Controller);
 		$this->assertTrue($this->Controller->Session->check('Message.auth'));
 	}
+
 /**
  * Tests that deny always takes precedence over allow
  *
@@ -728,6 +785,7 @@ class AuthTest extends CakeTestCase {
 		$this->Controller->params['action'] = 'Add';
 		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
 	}
+
 /**
  * test that allow() and allowedActions work with camelCase method names.
  *
@@ -758,6 +816,7 @@ class AuthTest extends CakeTestCase {
 		$result = $this->Controller->Auth->startup($this->Controller);
 		$this->assertFalse($result, 'startup() should return false, as action is not allowed. %s');
 	}
+
 /**
  * testLoginRedirect method
  *
@@ -931,6 +990,7 @@ class AuthTest extends CakeTestCase {
 		$_SERVER['HTTP_REFERER'] = $backup;
 		$this->Controller->Session->del('Auth');
 	}
+
 /**
  * Ensure that no redirect is performed when a 404 is reached
  * And the user doesn't have a session.
@@ -944,6 +1004,7 @@ class AuthTest extends CakeTestCase {
 		$result = $this->Controller->Auth->startup($this->Controller);
 		$this->assertTrue($result, 'Auth redirected a missing action %s');
 	}
+
 /**
  * testEmptyUsernameOrPassword method
  *
@@ -974,6 +1035,7 @@ class AuthTest extends CakeTestCase {
 		$this->assertEqual($user, false);
 		$this->Controller->Session->del('Auth');
 	}
+
 /**
  * testInjection method
  *
@@ -1031,6 +1093,7 @@ class AuthTest extends CakeTestCase {
 		$this->Controller->Auth->startup($this->Controller);
 		$this->assertTrue(is_null($this->Controller->Auth->user()));
 	}
+
 /**
  * test Hashing of passwords
  *
@@ -1065,6 +1128,7 @@ class AuthTest extends CakeTestCase {
 		$expected = $data;
 		$this->assertEqual($return, $expected);
 	}
+
 /**
  * testCustomRoute method
  *
@@ -1122,6 +1186,7 @@ class AuthTest extends CakeTestCase {
 		$user = $this->Controller->Auth->user();
 		$this->assertTrue(!!$user);
 	}
+
 /**
  * testCustomField method
  *
@@ -1156,6 +1221,7 @@ class AuthTest extends CakeTestCase {
 		$user = $this->Controller->Auth->user();
 		$this->assertTrue(!!$user);
     }
+
 /**
  * testAdminRoute method
  *
@@ -1193,6 +1259,7 @@ class AuthTest extends CakeTestCase {
 
 		Configure::write('Routing.admin', $admin);
 	}
+
 /**
  * testAjaxLogin method
  *
@@ -1214,6 +1281,7 @@ class AuthTest extends CakeTestCase {
 		$this->assertEqual("Ajax!\nthis is the test element", $result);
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
+
 /**
  * testLoginActionRedirect method
  *
@@ -1250,6 +1318,7 @@ class AuthTest extends CakeTestCase {
 
 		Configure::write('Routing.admin', $admin);
 	}
+
 /**
  * Tests that shutdown destroys the redirect session var
  *
@@ -1263,4 +1332,4 @@ class AuthTest extends CakeTestCase {
 		$this->assertFalse($this->Controller->Session->read('Auth.redirect'));
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
index 5d8d87aa0..778444e92 100644
--- a/cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CookieComponentTest file
  *
@@ -24,7 +25,8 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', array('Component', 'Controller', 'Cookie'));
+App::import('Controller', array('Component', 'Controller'), false);
+App::import('Component', 'Cookie');
 /**
  * CookieComponentTestController class
  *
@@ -32,6 +34,7 @@ App::import('Core', array('Component', 'Controller', 'Cookie'));
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class CookieComponentTestController extends Controller {
+
 /**
  * components property
  *
@@ -39,6 +42,7 @@ class CookieComponentTestController extends Controller {
  * @access public
  */
 	var $components = array('Cookie');
+
 /**
  * beforeFilter method
  *
@@ -54,6 +58,7 @@ class CookieComponentTestController extends Controller {
 		$this->Cookie->key = 'somerandomhaskey';
 	}
 }
+
 /**
  * CookieComponentTest class
  *
@@ -61,6 +66,7 @@ class CookieComponentTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class CookieComponentTest extends CakeTestCase {
+
 /**
  * Controller property
  *
@@ -68,6 +74,7 @@ class CookieComponentTest extends CakeTestCase {
  * @access public
  */
 	var $Controller;
+
 /**
  * start
  *
@@ -82,6 +89,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Component->startup($this->Controller);
 		$this->Controller->Cookie->destroy();
 	}
+
 /**
  * end
  *
@@ -91,6 +99,7 @@ class CookieComponentTest extends CakeTestCase {
 	function end() {
 		$this->Controller->Cookie->destroy();
 	}
+
 /**
  * testCookieName
  *
@@ -100,6 +109,7 @@ class CookieComponentTest extends CakeTestCase {
 	function testCookieName() {
 		$this->assertEqual($this->Controller->Cookie->name, 'CakeTestCookie');
 	}
+
 /**
  * testSettingEncryptedCookieData
  *
@@ -112,6 +122,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->write('Encrytped_multi_cookies.version', '1.2.0.x');
 		$this->Controller->Cookie->write('Encrytped_multi_cookies.tag', 'CakePHP Rocks!');
 	}
+
 /**
  * testReadEncryptedCookieData
  *
@@ -127,6 +138,7 @@ class CookieComponentTest extends CakeTestCase {
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testSettingPlainCookieData
  *
@@ -139,6 +151,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->write('Plain_multi_cookies.version', '1.2.0.x', false);
 		$this->Controller->Cookie->write('Plain_multi_cookies.tag', 'CakePHP Rocks!', false);
 	}
+
 /**
  * testReadPlainCookieData
  *
@@ -154,6 +167,7 @@ class CookieComponentTest extends CakeTestCase {
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testWritePlainCookieArray
  *
@@ -171,6 +185,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->del('version');
 		$this->Controller->Cookie->del('tag');
 	}
+
 /**
  * testReadingCookieValue
  *
@@ -198,6 +213,7 @@ class CookieComponentTest extends CakeTestCase {
 				'tag' => 'CakePHP Rocks!'));
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testDeleteCookieValue
  *
@@ -225,6 +241,7 @@ class CookieComponentTest extends CakeTestCase {
 		$expected = array();
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testSettingCookiesWithArray
  *
@@ -244,6 +261,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->write(array('Plain_multi_cookies.version' => '1.2.0.x'), null, false);
 		$this->Controller->Cookie->write(array('Plain_multi_cookies.tag' => 'CakePHP Rocks!'), null, false);
 	}
+
 /**
  * testReadingCookieArray
  *
@@ -299,6 +317,7 @@ class CookieComponentTest extends CakeTestCase {
 		$expected = 'CakePHP Rocks!';
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testReadingCookieDataOnStartup
  *
@@ -355,6 +374,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->destroy();
 		unset($_COOKIE['CakeTestCookie']);
 	}
+
 /**
  * testReadingCookieDataWithoutStartup
  *
@@ -408,6 +428,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Controller->Cookie->destroy();
 		unset($_COOKIE['CakeTestCookie']);
 	}
+
 /**
  * encrypt method
  *
@@ -421,6 +442,7 @@ class CookieComponentTest extends CakeTestCase {
 		}
 		return "Q2FrZQ==." . base64_encode(Security::cipher($value, $this->Controller->Cookie->key));
 	}
+
 /**
  * implode method
  *
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 56a46d8a0..b591905b8 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * EmailComponentTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Component', 'Email');
+
 /**
  * EmailTestComponent class
  *
@@ -32,6 +34,7 @@ App::import('Component', 'Email');
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class EmailTestComponent extends EmailComponent {
+
 /**
  * smtpSend method override for testing
  *
@@ -41,6 +44,7 @@ class EmailTestComponent extends EmailComponent {
 	function smtpSend($data, $code = '250') {
 		return parent::__smtpSend($data, $code);
 	}
+
 /**
  * Convenience setter method for testing.
  *
@@ -50,6 +54,7 @@ class EmailTestComponent extends EmailComponent {
 	function setConnectionSocket(&$socket) {
 		$this->__smtpConnection = $socket;
 	}
+
 /**
  * Convenience getter method for testing.
  *
@@ -59,6 +64,7 @@ class EmailTestComponent extends EmailComponent {
 	function getConnectionSocket() {
 		return $this->__smtpConnection;
 	}
+
 /**
  * Convenience setter for testing.
  *
@@ -68,6 +74,7 @@ class EmailTestComponent extends EmailComponent {
 	function setHeaders($headers) {
 		$this->__header += $headers;
 	}
+
 /**
  * Convenience getter for testing.
  *
@@ -77,6 +84,7 @@ class EmailTestComponent extends EmailComponent {
 	function getHeaders() {
 		return $this->__header;
 	}
+
 /**
  * Convenience setter for testing.
  *
@@ -86,6 +94,7 @@ class EmailTestComponent extends EmailComponent {
 	function setBoundary() {
 		$this->__createBoundary();
 	}
+
 /**
  * Convenience getter for testing.
  *
@@ -95,6 +104,7 @@ class EmailTestComponent extends EmailComponent {
 	function getBoundary() {
 		return $this->__boundary;
 	}
+
 /**
  * Convenience getter for testing.
  *
@@ -104,6 +114,7 @@ class EmailTestComponent extends EmailComponent {
 	function getMessage() {
 		return $this->__message;
 	}
+
 /**
  * Convenience method for testing.
  *
@@ -114,6 +125,7 @@ class EmailTestComponent extends EmailComponent {
 		return parent::__strip($content, $message);
 	}
 }
+
 /**
  * EmailTestController class
  *
@@ -121,6 +133,7 @@ class EmailTestComponent extends EmailComponent {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class EmailTestController extends Controller {
+
 /**
  * name property
  *
@@ -128,6 +141,7 @@ class EmailTestController extends Controller {
  * @access public
  */
 	var $name = 'EmailTest';
+
 /**
  * uses property
  *
@@ -135,6 +149,7 @@ class EmailTestController extends Controller {
  * @access public
  */
 	var $uses = null;
+
 /**
  * components property
  *
@@ -142,6 +157,7 @@ class EmailTestController extends Controller {
  * @access public
  */
 	var $components = array('EmailTest');
+
 /**
  * pageTitle property
  *
@@ -150,6 +166,7 @@ class EmailTestController extends Controller {
  */
 	var $pageTitle = 'EmailTest';
 }
+
 /**
  * EmailTest class
  *
@@ -157,6 +174,7 @@ class EmailTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class EmailComponentTest extends CakeTestCase {
+
 /**
  * Controller property
  *
@@ -164,6 +182,7 @@ class EmailComponentTest extends CakeTestCase {
  * @access public
  */
 	var $Controller;
+
 /**
  * name property
  *
@@ -171,6 +190,7 @@ class EmailComponentTest extends CakeTestCase {
  * @access public
  */
 	var $name = 'Email';
+
 /**
  * setUp method
  *
@@ -194,6 +214,7 @@ class EmailComponentTest extends CakeTestCase {
 			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 	}
+
 /**
  * tearDown method
  *
@@ -207,6 +228,7 @@ class EmailComponentTest extends CakeTestCase {
 		restore_error_handler();
 		ClassRegistry::flush();
 	}
+
 /**
  * testBadSmtpSend method
  *
@@ -218,6 +240,7 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->EmailTest->delivery = 'smtp';
 		$this->assertFalse($this->Controller->EmailTest->send('Should not work'));
 	}
+
 /**
  * testSmtpSend method
  *
@@ -266,6 +289,7 @@ TEMPDOC;
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 	}
+
 /**
  * testAuthenticatedSmtpSend method
  *
@@ -292,6 +316,7 @@ TEMPDOC;
 		$this->assertFalse($result);
 		$this->assertEqual($code, '535');
 	}
+
 /**
  * testSendFormats method
  *
@@ -337,10 +362,12 @@ MSGBLOC;
 
 		// TODO: better test for format of message sent?
 		$this->Controller->EmailTest->sendAs = 'both';
-		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"' . "\n", $message);
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $message);
+
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 	}
+
 /**
  * testTemplates method
  *
@@ -412,10 +439,11 @@ HTMLBLOC;
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 
 		$this->Controller->EmailTest->sendAs = 'both';
-		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"' . "\n", $header);
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $header);
 		$expect .= '--alt-' . "\n" . 'Content-Type: text/plain; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $text . "\n\n";
 		$expect .= '--alt-' . "\n" . 'Content-Type: text/html; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $html . "\n\n";
 		$expect = '<pre>' . $expect . '--alt---' . "\n\n" . '</pre>';
+
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 
@@ -458,6 +486,7 @@ TEXTBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message', 'wide', 'default'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 	}
+
 /**
  * testSmtpSendSocket method
  *
@@ -481,6 +510,7 @@ TEXTBLOC;
 		$this->assertNoPattern('/501 Syntax: HELO hostname/', $this->Controller->EmailTest->smtpError);
 
 	}
+
 /**
  * testSendDebug method
  *
@@ -498,6 +528,7 @@ TEXTBLOC;
 		$this->Controller->EmailTest->delivery = 'debug';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 	}
+
 /**
  * testContentStripping method
  *
@@ -524,6 +555,7 @@ TEXTBLOC;
 		$this->assertEqual($result, $expected);
 
 	}
+
 /**
  * testMultibyte method
  *
@@ -556,6 +588,69 @@ TEXTBLOC;
 		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
 		$this->assertEqual(trim($matches[1]), $subject);
 	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testSendAsIsNotIgnoredIfAttachmentsPresent() {
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->attachments = array(__FILE__);
+		$body = '<p>This is the body of the message</p>';
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+		$this->assertPattern('/multipart\/alternative/', $msg);
+	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testNoDoubleNewlinesInHeaders() {
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$body = '<p>This is the body of the message</p>';
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/\n\nContent-Transfer-Encoding/', $msg);
+		$this->assertPattern('/\nContent-Transfer-Encoding/', $msg);
+	}
+
 /**
  * testReset method
  *
@@ -574,6 +669,7 @@ TEXTBLOC;
 		$this->Controller->EmailTest->additionalParams = 'X-additional-header';
 		$this->Controller->EmailTest->delivery = 'smtp';
 		$this->Controller->EmailTest->smtpOptions['host'] = 'blah';
+		$this->Controller->EmailTest->attachments = array('attachment1', 'attachment2');
 
 		$this->assertFalse($this->Controller->EmailTest->send('Should not work'));
 
@@ -592,7 +688,9 @@ TEXTBLOC;
 		$this->assertNull($this->Controller->EmailTest->getBoundary());
 		$this->assertIdentical($this->Controller->EmailTest->getMessage(), array());
 		$this->assertNull($this->Controller->EmailTest->smtpError);
+		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
 	}
+
 /**
  * osFix method
  *
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index f81f63a8f..6c532042d 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * RequestHandlerComponentTest file
  *
@@ -24,10 +25,11 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', array('Controller'));
+App::import('Controller', 'Controller', false);
 App::import('Component', array('RequestHandler'));
 
 Mock::generatePartial('RequestHandlerComponent', 'NoStopRequestHandler', array('_stop'));
+
 /**
  * RequestHandlerTestController class
  *
@@ -35,6 +37,15 @@ Mock::generatePartial('RequestHandlerComponent', 'NoStopRequestHandler', array('
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class RequestHandlerTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ **/
+	var $name = 'RequestHandlerTest';
+
 /**
  * uses property
  *
@@ -42,6 +53,7 @@ class RequestHandlerTestController extends Controller {
  * @access public
  */
 	var $uses = null;
+
 /**
  * construct method
  *
@@ -55,6 +67,7 @@ class RequestHandlerTestController extends Controller {
 		}
 		parent::__construct();
 	}
+
 /**
  * test method for ajax redirection
  *
@@ -65,6 +78,7 @@ class RequestHandlerTestController extends Controller {
 		$this->render('index');
 	}
 }
+
 /**
  * RequestHandlerTestDisabledController class
  *
@@ -72,6 +86,7 @@ class RequestHandlerTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class RequestHandlerTestDisabledController extends Controller {
+
 /**
  * uses property
  *
@@ -79,6 +94,7 @@ class RequestHandlerTestDisabledController extends Controller {
  * @access public
  */
 	var $uses = null;
+
 /**
  * construct method
  *
@@ -92,6 +108,7 @@ class RequestHandlerTestDisabledController extends Controller {
 		}
 		parent::__construct();
 	}
+
 /**
  * beforeFilter method
  *
@@ -102,6 +119,7 @@ class RequestHandlerTestDisabledController extends Controller {
 		$this->RequestHandler->enabled = false;
 	}
 }
+
 /**
  * RequestHandlerComponentTest class
  *
@@ -109,6 +127,7 @@ class RequestHandlerTestDisabledController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class RequestHandlerComponentTest extends CakeTestCase {
+
 /**
  * Controller property
  *
@@ -116,6 +135,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * @access public
  */
 	var $Controller;
+
 /**
  * RequestHandler property
  *
@@ -123,22 +143,36 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * @access public
  */
 	var $RequestHandler;
+
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->_init();
 	}
+
 /**
- * tearDown method
+ * init method
+ *
+ * @access protected
+ * @return void
+ */
+	function _init() {
+		$this->Controller = new RequestHandlerTestController(array('components' => array('RequestHandler')));
+		$this->Controller->constructClasses();
+		$this->RequestHandler =& $this->Controller->RequestHandler;
+	}
+
+/**
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->RequestHandler);
 		unset($this->Controller);
 		if (!headers_sent()) {
@@ -146,6 +180,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		}
 		App::build();
 	}
+
 /**
  * testInitializeCallback method
  *
@@ -160,6 +195,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->initialize($this->Controller);
 		$this->assertEqual($this->RequestHandler->ext, 'rss');
 	}
+
 /**
  * testDisabling method
  *
@@ -182,6 +218,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertEqual($this->Controller->params, array());
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
+
 /**
  * testAutoResponseType method
  *
@@ -195,6 +232,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->startup($this->Controller);
 		$this->assertEqual($this->Controller->ext, '.ctp');
 	}
+
 /**
  * testStartupCallback method
  *
@@ -208,6 +246,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertTrue(is_object($this->Controller->data));
 		$this->assertEqual(strtolower(get_class($this->Controller->data)), 'xml');
 	}
+
 /**
  * testStartupCallback with charset.
  *
@@ -220,6 +259,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertTrue(is_object($this->Controller->data));
 		$this->assertEqual(strtolower(get_class($this->Controller->data)), 'xml');
 	}
+
 /**
  * testNonAjaxRedirect method
  *
@@ -231,6 +271,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->startup($this->Controller);
 		$this->assertNull($this->RequestHandler->beforeRedirect($this->Controller, '/'));
 	}
+
 /**
  * testRenderAs method
  *
@@ -242,6 +283,26 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
 		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
 	}
+
+/**
+ * test that calling renderAs() more than once continues to work.
+ *
+ * @link #6466
+ * @return void
+ **/
+	function testRenderAsCalledTwice() {
+		$this->RequestHandler->renderAs($this->Controller, 'xml');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/xml');
+		$this->assertEqual($this->Controller->layoutPath, 'xml');
+
+		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
+
+		$this->RequestHandler->renderAs($this->Controller, 'js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/js');
+		$this->assertEqual($this->Controller->layoutPath, 'js');
+		$this->assertTrue(in_array('Js', $this->Controller->helpers));
+	}
+
 /**
  * testRequestClientTypes method
  *
@@ -264,6 +325,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertFalse($this->RequestHandler->isAjax());
 		$this->assertFalse($this->RequestHandler->getAjaxVersion());
 	}
+
 /**
  * Tests the detection of various Flash versions
  *
@@ -289,6 +351,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 		$_SERVER['HTTP_USER_AGENT'] = $_agent;
 	}
+
 /**
  * testRequestContentTypes method
  *
@@ -332,6 +395,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 		$_SERVER['HTTP_ACCEPT'] = 'application/rss+xml,text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
 	}
+
 /**
  * testResponseContentType method
  *
@@ -343,6 +407,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertTrue($this->RequestHandler->respondAs('atom'));
 		$this->assertEqual($this->RequestHandler->responseType(), 'atom');
 	}
+
 /**
  * testMobileDeviceDetection method
  *
@@ -354,6 +419,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3';
 		$this->assertTrue($this->RequestHandler->isMobile());
 	}
+
 /**
  * testRequestProperties method
  *
@@ -373,6 +439,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertTrue($this->RequestHandler->isSSL());
 		$_SERVER = $s;
 	}
+
 /**
  * testRequestMethod method
  *
@@ -404,6 +471,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertFalse($this->RequestHandler->isPut());
 		$this->assertTrue($this->RequestHandler->isDelete());
 	}
+
 /**
  * testClientContentPreference method
  *
@@ -432,6 +500,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertFalse($this->RequestHandler->prefers('rss'));
 		$this->assertFalse($this->RequestHandler->accepts('rss'));
 	}
+
 /**
  * testCustomContent method
  *
@@ -450,6 +519,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->startup($this->Controller);
 		$this->assertEqual($this->RequestHandler->prefers(), 'mobile');
 	}
+
 /**
  * testClientProperties method
  *
@@ -478,6 +548,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$_SERVER['HTTP_CLIENTADDRESS'] = '10.0.1.2, 10.0.1.1';
 		$this->assertEqual($this->RequestHandler->getClientIP(), '10.0.1.2');
 	}
+
 /**
  * test that ajax requests involving redirects trigger requestAction instead.
  *
@@ -500,16 +571,5 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
-/**
- * init method
- *
- * @access protected
- * @return void
- */
-	function _init() {
-		$this->Controller = new RequestHandlerTestController(array('components' => array('RequestHandler')));
-		$this->Controller->constructClasses();
-		$this->RequestHandler =& $this->Controller->RequestHandler;
-	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 0ef3dc24c..688c0a4f9 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SecurityComponentTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Component', 'Security');
+
 /**
 * TestSecurityComponent
 *
@@ -32,6 +34,7 @@ App::import('Component', 'Security');
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class TestSecurityComponent extends SecurityComponent {
+
 /**
  * validatePost method
  *
@@ -42,6 +45,7 @@ class TestSecurityComponent extends SecurityComponent {
 		return $this->_validatePost($controller);
 	}
 }
+
 /**
 * SecurityTestController
 *
@@ -49,6 +53,7 @@ class TestSecurityComponent extends SecurityComponent {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class SecurityTestController extends Controller {
+
 /**
  * name property
  *
@@ -56,6 +61,7 @@ class SecurityTestController extends Controller {
  * @access public
  */
 	var $name = 'SecurityTest';
+
 /**
  * components property
  *
@@ -63,6 +69,7 @@ class SecurityTestController extends Controller {
  * @access public
  */
 	var $components = array('TestSecurity');
+
 /**
  * failed property
  *
@@ -70,6 +77,7 @@ class SecurityTestController extends Controller {
  * @access public
  */
 	var $failed = false;
+
 /**
  * Used for keeping track of headers in test
  *
@@ -77,6 +85,7 @@ class SecurityTestController extends Controller {
  * @access public
  */
 	var $testHeaders = array();
+
 /**
  * fail method
  *
@@ -86,6 +95,7 @@ class SecurityTestController extends Controller {
 	function fail() {
 		$this->failed = true;
 	}
+
 /**
  * redirect method
  *
@@ -98,6 +108,7 @@ class SecurityTestController extends Controller {
 	function redirect($option, $code, $exit) {
 		return $code;
 	}
+
 /**
  * Conveinence method for header()
  *
@@ -109,6 +120,7 @@ class SecurityTestController extends Controller {
 		$this->testHeaders[] = $status;
 	}
 }
+
 /**
  * SecurityComponentTest class
  *
@@ -116,6 +128,7 @@ class SecurityTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class SecurityComponentTest extends CakeTestCase {
+
 /**
  * Controller property
  *
@@ -123,6 +136,7 @@ class SecurityComponentTest extends CakeTestCase {
  * @access public
  */
 	var $Controller;
+
 /**
  * oldSalt property
  *
@@ -130,6 +144,7 @@ class SecurityComponentTest extends CakeTestCase {
  * @access public
  */
 	var $oldSalt;
+
 /**
  * setUp method
  *
@@ -144,6 +159,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->oldSalt = Configure::read('Security.salt');
 		Configure::write('Security.salt', 'foo!');
 	}
+
 /**
  * Tear-down method. Resets environment state.
  *
@@ -157,6 +173,7 @@ class SecurityComponentTest extends CakeTestCase {
 		unset($this->Controller->Component);
 		unset($this->Controller);
 	}
+
 /**
  * testStartup method
  *
@@ -169,6 +186,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->assertNotNull($result);
 		$this->assertTrue($this->Controller->Session->check('_Token'));
 	}
+
 /**
  * testRequirePostFail method
  *
@@ -182,6 +200,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequirePostSucceed method
  *
@@ -195,6 +214,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireSecureFail method
  *
@@ -208,6 +228,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequireSecureSucceed method
  *
@@ -222,6 +243,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireAuthFail method
  *
@@ -252,6 +274,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequireAuthSucceed method
  *
@@ -279,6 +302,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequirePostSucceedWrongMethod method
  *
@@ -292,6 +316,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireGetFail method
  *
@@ -305,6 +330,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequireGetSucceed method
  *
@@ -318,6 +344,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireLogin method
  *
@@ -356,6 +383,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testDigestAuth method
  *
@@ -382,6 +410,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireGetSucceedWrongMethod method
  *
@@ -395,6 +424,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequirePutFail method
  *
@@ -408,6 +438,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequirePutSucceed method
  *
@@ -421,6 +452,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequirePutSucceedWrongMethod method
  *
@@ -434,6 +466,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireDeleteFail method
  *
@@ -447,6 +480,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 	}
+
 /**
  * testRequireDeleteSucceed method
  *
@@ -460,6 +494,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireDeleteSucceedWrongMethod method
  *
@@ -473,6 +508,7 @@ DIGEST;
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 	}
+
 /**
  * testRequireLoginSettings method
  *
@@ -487,6 +523,7 @@ DIGEST;
 		$this->assertEqual($this->Controller->Security->requireLogin, array('add', 'edit'));
 		$this->assertEqual($this->Controller->Security->loginUsers, array('admin' => 'password'));
 	}
+
 /**
  * testRequireLoginAllActions method
  *
@@ -500,6 +537,7 @@ DIGEST;
 		$this->assertEqual($this->Controller->Security->requireLogin, array('*'));
 		$this->assertEqual($this->Controller->Security->loginUsers, array('admin' => 'password'));
 	}
+
 /**
  * Simple hash validation test
  *
@@ -518,6 +556,7 @@ DIGEST;
 		);
 		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
 	}
+
 /**
  * Tests validation of checkbox arrays
  *
@@ -535,6 +574,7 @@ DIGEST;
 		);
 		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
 	}
+
 /**
  * testValidatePostNoModel method
  *
@@ -554,6 +594,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidatePostSimple method
  *
@@ -573,6 +614,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * Tests hash validation for multiple records, including locked fields
  *
@@ -601,6 +643,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * test ValidatePost with multiple select elements.
  *
@@ -640,6 +683,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidatePostCheckbox method
  *
@@ -686,6 +730,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidatePostHidden method
  *
@@ -708,6 +753,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidatePostWithDisabledFields method
  *
@@ -731,6 +777,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidateHiddenMultipleModel method
  *
@@ -753,6 +800,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testLoginValidation method
  *
@@ -762,6 +810,7 @@ DIGEST;
 	function testLoginValidation() {
 
 	}
+
 /**
  * testValidateHasManyModel method
  *
@@ -792,6 +841,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidateHasManyRecordsPass method
  *
@@ -834,6 +884,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidateHasManyRecords method
  *
@@ -878,6 +929,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertFalse($result);
 	}
+
 /**
  * testLoginRequest method
  *
@@ -898,6 +950,7 @@ DIGEST;
 		$this->assertPattern('/realm="'.$realm.'"/', $result);
 		$this->assertPattern('/qop="auth"/', $result);
 	}
+
 /**
  * testGenerateDigestResponseHash method
  *
@@ -930,6 +983,7 @@ DIGEST;
 		);
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testLoginCredentials method
  *
@@ -971,6 +1025,7 @@ DIGEST;
 			$this->assertIdentical($result, $expected);
 		}
 	}
+
 /**
  * testParseDigestAuthData method
  *
@@ -1006,6 +1061,7 @@ DIGEST;
 		$result = $this->Controller->Security->parseDigestAuthData('');
 		$this->assertNull($result);
 	}
+
 /**
  * testFormDisabledFields method
  *
@@ -1036,6 +1092,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testRadio method
  *
@@ -1074,6 +1131,7 @@ DIGEST;
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 	}
+
 /**
  * testInvalidAuthHeaders method
  *
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index b79f043c9..1e29f9f50 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SessionComponentTest file
  *
@@ -24,8 +25,9 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', array('Controller', 'Object'));
+App::import('Controller', 'Controller', false);
 App::import('Component', 'Session');
+
 /**
  * SessionTestController class
  *
@@ -33,6 +35,7 @@ App::import('Component', 'Session');
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class SessionTestController extends Controller {
+
 /**
  * uses property
  *
@@ -40,6 +43,7 @@ class SessionTestController extends Controller {
  * @access public
  */
 	var $uses = array();
+
 /**
  * session_id method
  *
@@ -50,6 +54,7 @@ class SessionTestController extends Controller {
 		return $this->Session->id();
 	}
 }
+
 /**
  * OrangeSessionTestController class
  *
@@ -57,6 +62,7 @@ class SessionTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class OrangeSessionTestController extends Controller {
+
 /**
  * uses property
  *
@@ -64,6 +70,7 @@ class OrangeSessionTestController extends Controller {
  * @access public
  */
 	var $uses = array();
+
 /**
  * session_id method
  *
@@ -74,6 +81,7 @@ class OrangeSessionTestController extends Controller {
 		return $this->Session->id();
 	}
 }
+
 /**
  * SessionComponentTest class
  *
@@ -81,6 +89,7 @@ class OrangeSessionTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class SessionComponentTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -90,6 +99,7 @@ class SessionComponentTest extends CakeTestCase {
 	function setUp() {
 		$this->_session = Configure::read('Session');
 	}
+
 /**
  * tearDown method
  *
@@ -99,6 +109,7 @@ class SessionComponentTest extends CakeTestCase {
 	function tearDown() {
 		Configure::write('Session', $this->_session);
 	}
+
 /**
  * testSessionAutoStart method
  *
@@ -130,6 +141,7 @@ class SessionComponentTest extends CakeTestCase {
 		$result = $Object->requestAction('/orange_session_test/session_id');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSessionInitialize method
  *
@@ -149,6 +161,7 @@ class SessionComponentTest extends CakeTestCase {
 		$Session->initialize($sessionController);
 		$this->assertEqual($Session->__bare, 1);
 	}
+
 /**
  * testSessionActivate method
  *
@@ -170,6 +183,7 @@ class SessionComponentTest extends CakeTestCase {
 		Configure::write('Session.start', true);
 		$Session->destroy();
 	}
+
 /**
  * testSessionValid method
  *
@@ -200,6 +214,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->valid());
 		Configure::write('Session.checkAgent', true);
 	}
+
 /**
  * testSessionError method
  *
@@ -217,6 +232,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->error());
 		Configure::write('Session.start', true);
 	}
+
 /**
  * testSessionReadWrite method
  *
@@ -257,6 +273,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->read('Test'));
 		Configure::write('Session.start', true);
 	}
+
 /**
  * testSessionDel method
  *
@@ -277,6 +294,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->del('Test'));
 		Configure::write('Session.start', true);
 	}
+
 /**
  * testSessionDelete method
  *
@@ -297,6 +315,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->delete('Test'));
 		Configure::write('Session.start', true);
 	}
+
 /**
  * testSessionCheck method
  *
@@ -318,6 +337,7 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertFalse($Session->check('Test'));
 		Configure::write('Session.start', true);
 	}
+
 /**
  * testSessionFlash method
  *
@@ -343,6 +363,7 @@ class SessionComponentTest extends CakeTestCase {
 
 		$Session->del('Message');
 	}
+
 /**
  * testSessionId method
  *
@@ -354,6 +375,7 @@ class SessionComponentTest extends CakeTestCase {
 		$Session =& new SessionComponent();
 		$this->assertNull($Session->id());
 	}
+
 /**
  * testSessionDestroy method
  *
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index dce75b632..33dbe3e7f 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -19,9 +19,10 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Controller');
+App::import('Controller', 'Controller', false);
 App::import('Component', 'Security');
 App::import('Component', 'Cookie');
+
 /**
  * AppController class
  *
@@ -61,6 +62,7 @@ if (!class_exists('AppController')) {
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }
+
 /**
  * ControllerPost class
  *
@@ -68,6 +70,7 @@ if (!class_exists('AppController')) {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerPost extends CakeTestModel {
+
 /**
  * name property
  *
@@ -75,6 +78,7 @@ class ControllerPost extends CakeTestModel {
  * @access public
  */
 	var $name = 'ControllerPost';
+
 /**
  * useTable property
  *
@@ -82,6 +86,7 @@ class ControllerPost extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'posts';
+
 /**
  * invalidFields property
  *
@@ -89,6 +94,7 @@ class ControllerPost extends CakeTestModel {
  * @access public
  */
 	var $invalidFields = array('name' => 'error_msg');
+
 /**
  * lastQuery property
  *
@@ -96,6 +102,7 @@ class ControllerPost extends CakeTestModel {
  * @access public
  */
 	var $lastQuery = null;
+
 /**
  * beforeFind method
  *
@@ -106,6 +113,7 @@ class ControllerPost extends CakeTestModel {
 	function beforeFind($query) {
 		$this->lastQuery = $query;
 	}
+
 /**
  * find method
  *
@@ -123,6 +131,7 @@ class ControllerPost extends CakeTestModel {
 		return parent::find($type, $options);
 	}
 }
+
 /**
  * ControllerPostsController class
  *
@@ -130,6 +139,7 @@ class ControllerPost extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerCommentsController extends AppController {
+
 /**
  * name property
  *
@@ -138,6 +148,7 @@ class ControllerCommentsController extends AppController {
  */
 	var $name = 'ControllerComments';
 }
+
 /**
  * ControllerComment class
  *
@@ -145,6 +156,7 @@ class ControllerCommentsController extends AppController {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerComment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -152,6 +164,7 @@ class ControllerComment extends CakeTestModel {
  * @access public
  */
 	var $name = 'Comment';
+
 /**
  * useTable property
  *
@@ -159,6 +172,7 @@ class ControllerComment extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * data property
  *
@@ -166,6 +180,7 @@ class ControllerComment extends CakeTestModel {
  * @access public
  */
 	var $data = array('name' => 'Some Name');
+
 /**
  * alias property
  *
@@ -174,6 +189,7 @@ class ControllerComment extends CakeTestModel {
  */
 	var $alias = 'ControllerComment';
 }
+
 /**
  * ControllerAlias class
  *
@@ -181,6 +197,7 @@ class ControllerComment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerAlias extends CakeTestModel {
+
 /**
  * name property
  *
@@ -188,6 +205,7 @@ class ControllerAlias extends CakeTestModel {
  * @access public
  */
 	var $name = 'ControllerAlias';
+
 /**
  * alias property
  *
@@ -195,6 +213,7 @@ class ControllerAlias extends CakeTestModel {
  * @access public
  */
 	var $alias = 'ControllerSomeAlias';
+
 /**
  * useTable property
  *
@@ -203,6 +222,7 @@ class ControllerAlias extends CakeTestModel {
  */
 	var $useTable = 'posts';
 }
+
 /**
  * ControllerPaginateModel class
  *
@@ -210,6 +230,7 @@ class ControllerAlias extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerPaginateModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -217,6 +238,7 @@ class ControllerPaginateModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'ControllerPaginateModel';
+
 /**
  * useTable property
  *
@@ -224,6 +246,7 @@ class ControllerPaginateModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * paginate method
  *
@@ -233,6 +256,7 @@ class ControllerPaginateModel extends CakeTestModel {
 	function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
 		$this->extra = $extra;
 	}
+
 /**
  * paginateCount
  *
@@ -243,6 +267,7 @@ class ControllerPaginateModel extends CakeTestModel {
 		$this->extraCount = $extra;
 	}
 }
+
 /**
  * NameTest class
  *
@@ -250,18 +275,21 @@ class ControllerPaginateModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class NameTest extends CakeTestModel {
+
 /**
  * name property
  * @var string 'Name'
  * @access public
  */
 	var $name = 'Name';
+
 /**
  * useTable property
  * @var string 'names'
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * alias property
  *
@@ -270,6 +298,7 @@ class NameTest extends CakeTestModel {
  */
 	var $alias = 'Name';
 }
+
 /**
  * TestController class
  *
@@ -277,12 +306,14 @@ class NameTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class TestController extends AppController {
+
 /**
  * name property
  * @var string 'Name'
  * @access public
  */
 	var $name = 'TestController';
+
 /**
  * helpers property
  *
@@ -290,6 +321,7 @@ class TestController extends AppController {
  * @access public
  */
 	var $helpers = array('Xml');
+
 /**
  * components property
  *
@@ -297,6 +329,7 @@ class TestController extends AppController {
  * @access public
  */
 	var $components = array('Security');
+
 /**
  * uses property
  *
@@ -304,6 +337,7 @@ class TestController extends AppController {
  * @access public
  */
 	var $uses = array('ControllerComment', 'ControllerAlias');
+
 /**
  * index method
  *
@@ -317,6 +351,7 @@ class TestController extends AppController {
 		$this->data['test2Id'] = $test2Id;
 	}
 }
+
 /**
  * TestComponent class
  *
@@ -324,6 +359,7 @@ class TestController extends AppController {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class TestComponent extends Object {
+
 /**
  * beforeRedirect method
  *
@@ -333,6 +369,7 @@ class TestComponent extends Object {
 	function beforeRedirect() {
 	}
 }
+
 /**
  * AnotherTestController class
  *
@@ -340,12 +377,14 @@ class TestComponent extends Object {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class AnotherTestController extends AppController {
+
 /**
  * name property
  * @var string 'Name'
  * @access public
  */
 	var $name = 'AnotherTest';
+
 /**
  * uses property
  *
@@ -354,6 +393,7 @@ class AnotherTestController extends AppController {
  */
 	var $uses = null;
 }
+
 /**
  * ControllerTest class
  *
@@ -361,6 +401,7 @@ class AnotherTestController extends AppController {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ControllerTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -368,6 +409,7 @@ class ControllerTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.post', 'core.comment', 'core.name');
+
 /**
  * endTest
  *
@@ -376,7 +418,8 @@ class ControllerTest extends CakeTestCase {
  */
 	function endTest() {
 		App::build();
-	}	
+	}
+
 /**
  * testConstructClasses method
  *
@@ -415,6 +458,7 @@ class ControllerTest extends CakeTestCase {
 
 		unset($Controller);
 	}
+
 /**
  * testAliasName method
  *
@@ -431,6 +475,7 @@ class ControllerTest extends CakeTestCase {
 
 		unset($Controller);
 	}
+
 /**
  * testPersistent method
  *
@@ -451,6 +496,7 @@ class ControllerTest extends CakeTestCase {
 		unset($Controller);
 		Configure::write('Cache.disable', true);
 	}
+
 /**
  * testPaginate method
  *
@@ -512,6 +558,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
 	}
+
 /**
  * testPaginateExtraParams method
  *
@@ -571,6 +618,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
 	}
+
 /**
  * testPaginatePassedArgs method
  *
@@ -604,6 +652,7 @@ class ControllerTest extends CakeTestCase {
 		);
 		$this->assertEqual($Controller->params['paging']['ControllerPost']['options'],$expected);
 	}
+
 /**
  * Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
  *
@@ -624,6 +673,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['defaults'][0]));
 		$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['options'][0]));
 	}
+
 /**
  * testDefaultPaginateParams method
  *
@@ -641,6 +691,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['order'], 'ControllerPost.id DESC');
 		$this->assertEqual($results, array(3, 2, 1));
 	}
+
 /**
  * testFlash method
  *
@@ -671,6 +722,7 @@ class ControllerTest extends CakeTestCase {
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $expected);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testControllerSet method
  *
@@ -704,6 +756,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->set(array('ModelName', 'ModelName2'), array('name', 'name2'));
 		$this->assertIdentical($Controller->viewVars, $expected);
 	}
+
 /**
  * testRender method
  *
@@ -737,6 +790,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->ControllerComment->validationErrors = array();
 		ClassRegistry::flush();
 	}
+
 /**
  * testToBeInheritedGuardmethods method
  *
@@ -750,6 +804,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertTrue($Controller->_afterScaffoldSaveError(''));
 		$this->assertFalse($Controller->_scaffoldError(''));
 	}
+
 /**
  * testRedirect method
  *
@@ -880,6 +935,7 @@ class ControllerTest extends CakeTestCase {
 		$MockController->expectCallCount('header', 2);
 		$MockController->redirect('http://cakephp.org', 301, false);
 	}
+
 /**
  * testMergeVars method
  *
@@ -940,6 +996,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertTrue(isset($TestController->ControllerPost));
 		$this->assertTrue(isset($TestController->ControllerComment));
 	}
+
 /**
  * test that options from child classes replace those in the parent classes.
  *
@@ -956,6 +1013,7 @@ class ControllerTest extends CakeTestCase {
 		$TestController->constructClasses();
 		$this->assertEqual($TestController->components['Cookie'], $expected);
 	}
+
 /**
  * Ensure that __mergeVars is not being greedy and merging with
  * AppController when you make an instance of Controller
@@ -970,6 +1028,7 @@ class ControllerTest extends CakeTestCase {
 
 		$this->assertTrue(isset($Controller->Session));
 	}
+
 /**
  * testReferer method
  *
@@ -1026,6 +1085,7 @@ class ControllerTest extends CakeTestCase {
 		$expected = '/recipes/add';
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testSetAction method
  *
@@ -1038,6 +1098,7 @@ class ControllerTest extends CakeTestCase {
 		$expected = array('testId' => 1, 'test2Id' => 2);
 		$this->assertidentical($TestController->data, $expected);
 	}
+
 /**
  * testUnimplementedIsAuthorized method
  *
@@ -1049,6 +1110,7 @@ class ControllerTest extends CakeTestCase {
 		$TestController->isAuthorized();
 		$this->assertError();
 	}
+
 /**
  * testValidateErrors method
  *
@@ -1070,6 +1132,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertIdentical($result, $expected);
 		$this->assertEqual($TestController->validate($comment), 2);
 	}
+
 /**
  * testPostConditions method
  *
@@ -1134,6 +1197,7 @@ class ControllerTest extends CakeTestCase {
 		$result = $Controller->postConditions($data, $ops);
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testRequestHandlerPrefers method
  *
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index b405d3eca..aec73d884 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Controller Merge vars Test file
  *
@@ -63,12 +64,14 @@ class MergeVarComponent extends Object {
  * @package cake.tests.cases.libs.controller
  **/
 class MergeVariablesController extends AppController {
+
 /**
  * name
  *
  * @var string
  **/
 	var $name = 'MergeVariables';
+
 /**
  * uses
  *
@@ -83,12 +86,14 @@ class MergeVariablesController extends AppController {
  * @package cake.tests.cases.libs.controller
  **/
 class MergeVarPluginAppController extends AppController {
+
 /**
  * components
  *
  * @var array
  **/
 	var $components = array('Auth' => array('setting' => 'val', 'otherVal'));
+
 /**
  * helpers
  *
@@ -103,12 +108,14 @@ class MergeVarPluginAppController extends AppController {
  * @package cake.tests.cases.libs.controller
  **/
 class MergePostsController extends MergeVarPluginAppController {
+
 /**
  * name
  *
  * @var string
  **/
 	var $name = 'MergePosts';
+
 /**
  * uses
  *
@@ -133,6 +140,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 	function endTest() {
 		ClassRegistry::flush();
 	}
+
 /**
  * test that component settings are not duplicated when merging component settings
  *
@@ -145,6 +153,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
 		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occured. %s');
 	}
+
 /**
  * test component merges with redeclared components
  *
@@ -158,6 +167,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => true, 'remote'));
 		$this->assertEqual($Controller->components, $expected, 'Merging of settings is wrong. %s');
 	}
+
 /**
  * test merging of helpers array, ensure no duplication occurs
  *
@@ -170,6 +180,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
 		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occured. %s');
 	}
+
 /**
  * test merging of vars with plugin
  *
@@ -187,7 +198,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 			'Email' => array('ports' => 'open')
 		);
 		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
-		
+
 		$expected = array(
 			'Javascript',
 			'MergeVar' => array('format' => 'html', 'terse')
@@ -205,6 +216,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		);
 		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
 	}
+
 /**
  * Ensure that __mergeVars is not being greedy and merging with
  * AppController when you make an instance of Controller
diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php
index 805199b7a..6f193fe68 100644
--- a/cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/cake/tests/cases/libs/controller/pages_controller.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * PagesControllerTest file
  *
@@ -29,7 +30,8 @@ if (!class_exists('AppController')) {
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }
-App::import('Core', array('Controller', 'PagesController'));
+App::import('Controller', 'Pages');
+
 /**
  * PagesControllerTest class
  *
@@ -37,6 +39,7 @@ App::import('Core', array('Controller', 'PagesController'));
  * @subpackage    cake.tests.cases.libs.controller
  */
 class PagesControllerTest extends CakeTestCase {
+
 /**
  * endTest method
  *
@@ -46,6 +49,7 @@ class PagesControllerTest extends CakeTestCase {
 	function endTest() {
 		App::build();
 	}
+
 /**
  * testDisplay method
  *
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index d0813a419..5b84927e8 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ScaffoldTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Scaffold');
+
 /**
  * ScaffoldMockController class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Scaffold');
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldMockController extends Controller {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class ScaffoldMockController extends Controller {
  * @access public
  */
 	var $name = 'ScaffoldMock';
+
 /**
  * scaffold property
  *
@@ -47,6 +51,7 @@ class ScaffoldMockController extends Controller {
  */
 	var $scaffold;
 }
+
 /**
  * ScaffoldMockControllerWithFields class
  *
@@ -54,6 +59,7 @@ class ScaffoldMockController extends Controller {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldMockControllerWithFields extends Controller {
+
 /**
  * name property
  *
@@ -61,6 +67,7 @@ class ScaffoldMockControllerWithFields extends Controller {
  * @access public
  */
 	var $name = 'ScaffoldMock';
+
 /**
  * scaffold property
  *
@@ -68,6 +75,7 @@ class ScaffoldMockControllerWithFields extends Controller {
  * @access public
  */
 	var $scaffold;
+
 /**
  * function _beforeScaffold
  *
@@ -78,6 +86,7 @@ class ScaffoldMockControllerWithFields extends Controller {
 		return true;
 	}
 }
+
 /**
  * TestScaffoldMock class
  *
@@ -85,6 +94,7 @@ class ScaffoldMockControllerWithFields extends Controller {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class TestScaffoldMock extends Scaffold {
+
 /**
  * Overload __scaffold
  *
@@ -93,6 +103,7 @@ class TestScaffoldMock extends Scaffold {
     function __scaffold($params) {
         $this->_params = $params;
     }
+
 /**
  * Get Params from the Controller.
  *
@@ -102,6 +113,7 @@ class TestScaffoldMock extends Scaffold {
         return $this->_params;
     }
 }
+
 /**
  * ScaffoldMock class
  *
@@ -109,6 +121,7 @@ class TestScaffoldMock extends Scaffold {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldMock extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -116,6 +129,7 @@ class ScaffoldMock extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'articles';
+
 /**
  * belongsTo property
  *
@@ -128,6 +142,7 @@ class ScaffoldMock extends CakeTestModel {
 			'foreignKey' => 'user_id',
 		)
 	);
+
 /**
  * hasMany property
  *
@@ -141,6 +156,7 @@ class ScaffoldMock extends CakeTestModel {
 		)
 	);
 }
+
 /**
  * ScaffoldUser class
  *
@@ -148,6 +164,7 @@ class ScaffoldMock extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldUser extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -155,6 +172,7 @@ class ScaffoldUser extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'users';
+
 /**
  * hasMany property
  *
@@ -168,6 +186,7 @@ class ScaffoldUser extends CakeTestModel {
 		)
 	);
 }
+
 /**
  * ScaffoldComment class
  *
@@ -175,6 +194,7 @@ class ScaffoldUser extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldComment extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -182,6 +202,7 @@ class ScaffoldComment extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * belongsTo property
  *
@@ -195,6 +216,7 @@ class ScaffoldComment extends CakeTestModel {
 		)
 	);
 }
+
 /**
  * TestScaffoldView class
  *
@@ -202,6 +224,7 @@ class ScaffoldComment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class TestScaffoldView extends ScaffoldView {
+
 /**
  * testGetFilename method
  *
@@ -213,6 +236,7 @@ class TestScaffoldView extends ScaffoldView {
 		return $this->_getViewFileName($action);
 	}
 }
+
 /**
  * ScaffoldViewTest class
  *
@@ -220,6 +244,7 @@ class TestScaffoldView extends ScaffoldView {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldViewTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -227,6 +252,7 @@ class ScaffoldViewTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
+
 /**
  * setUp method
  *
@@ -235,7 +261,13 @@ class ScaffoldViewTest extends CakeTestCase {
  */
 	function setUp() {
 		$this->Controller =& new ScaffoldMockController();
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
 	}
+
 /**
  * tearDown method
  *
@@ -244,7 +276,10 @@ class ScaffoldViewTest extends CakeTestCase {
  */
 	function tearDown() {
 		unset($this->Controller);
+
+		App::build();
 	}
+
 /**
  * testGetViewFilename method
  *
@@ -293,13 +328,6 @@ class ScaffoldViewTest extends CakeTestCase {
 		$expected = 'cake' . DS . 'libs' . DS . 'view' . DS . 'errors' . DS . 'scaffold_error.ctp';
 		$this->assertEqual($result, $expected);
 
-		$_back = array(
-			'viewPaths' => Configure::read('viewPaths'),
-			'pluginPaths' => Configure::read('pluginPaths'),
-		);
-		Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS));
-		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
-
 		$Controller =& new ScaffoldMockController();
 		$Controller->scaffold = 'admin';
 		$Controller->viewPath = 'posts';
@@ -329,10 +357,9 @@ class ScaffoldViewTest extends CakeTestCase {
 			. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
 		$this->assertEqual($result, $expected);
 
-		Configure::write('viewPaths', $_back['viewPaths']);
-		Configure::write('pluginPaths', $_back['pluginPaths']);
 		Configure::write('Routing.admin', $_admin);
 	}
+
 /**
  * test default index scaffold generation
  *
@@ -371,6 +398,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->assertPattern('#<li><a href="/scaffold_users/">List Scaffold Users</a></li>#', $result);
 		$this->assertPattern('#<li><a href="/scaffold_comments/add/">New Comment</a></li>#', $result);
 	}
+
 /**
  * test default view scaffold generation
  *
@@ -412,6 +440,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->assertPattern('/<div class="related">\s*<h3>Related Scaffold Comments<\/h3>\s*<table cellpadding="0" cellspacing="0">/', $result);
 		$this->assertPattern('/<li><a href="\/scaffold_comments\/add\/">New Comment<\/a><\/li>/', $result);
 	}
+
 /**
  * test default view scaffold generation
  *
@@ -497,6 +526,7 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		Configure::write('Routing.admin', $_backAdmin);
 	}
+
 /**
  * Test Admin Index Scaffolding.
  *
@@ -540,6 +570,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		Configure::write('Routing.admin', $_backAdmin);
 	}
 }
+
 /**
  * Scaffold Test class
  *
@@ -547,6 +578,7 @@ class ScaffoldViewTest extends CakeTestCase {
  * @subpackage    cake.tests.cases.libs.controller
  */
 class ScaffoldTest extends CakeTestCase {
+
 /**
  * Controller property
  *
@@ -554,6 +586,7 @@ class ScaffoldTest extends CakeTestCase {
  * @access public
  */
 	var $Controller;
+
 /**
  * fixtures property
  *
@@ -561,6 +594,7 @@ class ScaffoldTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
+
 /**
  * setUp method
  *
@@ -570,6 +604,7 @@ class ScaffoldTest extends CakeTestCase {
 	function setUp() {
 		$this->Controller =& new ScaffoldMockController();
 	}
+
 /**
  * tearDown method
  *
@@ -579,6 +614,7 @@ class ScaffoldTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Controller);
 	}
+
 /**
  * Test the correct Generation of Scaffold Params.
  * This ensures that the correct action and view will be generated
@@ -650,6 +686,7 @@ class ScaffoldTest extends CakeTestCase {
 		$this->assertEqual($result['pluralVar'], 'scaffoldMock');
 		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
 	}
+
 /**
  * test that the proper names and variable values are set by Scaffold
  *
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index 555ec2b34..00a12bf51 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DebuggerTest file
  *
@@ -21,6 +22,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Core', 'Debugger');
+
 /**
  * DebugggerTestCaseDebuggger class
  *
@@ -29,6 +31,7 @@ App::import('Core', 'Debugger');
  */
 class DebuggerTestCaseDebugger extends Debugger {
 }
+
 /**
  * DebuggerTest class
  *
@@ -56,6 +59,7 @@ class DebuggerTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * tearDown method
  *
@@ -65,6 +69,7 @@ class DebuggerTest extends CakeTestCase {
 	function tearDown() {
 		Configure::write('log', true);
 	}
+
 /**
  * testDocRef method
  *
@@ -77,6 +82,7 @@ class DebuggerTest extends CakeTestCase {
 		$debugger = new Debugger();
 		$this->assertEqual(ini_get('docref_root'), 'http://php.net/');
 	}
+
 /**
  * test Excerpt writing
  *
@@ -93,13 +99,14 @@ class DebuggerTest extends CakeTestCase {
 		$this->assertTrue(is_array($result));
 		$this->assertEqual(count($result), 4);
 
-		$expected = '<code><span style="color: #000000"><span style="color: #0000BB">&lt;?php';
-		$expected .= '</span></span></code>';
+		$expected = '<code><span style="color: #000000">&lt;?php';
+		$expected .= '</span></code>';
 		$this->assertEqual($result[0], $expected);
 
 		$return = Debugger::excerpt('[internal]', 2, 2);
 		$this->assertTrue(empty($return));
 	}
+
 /**
  * testOutput method
  *
@@ -141,15 +148,16 @@ class DebuggerTest extends CakeTestCase {
 		$buzz .= '';
 		$result = explode('</a>', ob_get_clean());
 		$this->assertTags($result[0], array(
+			'pre' => array('class' => 'cake-debug'),
 			'a' => array(
 				'href' => "javascript:void(0);",
 				'onclick' => "document.getElementById('cakeErr4-trace').style.display = " .
 				             "(document.getElementById('cakeErr4-trace').style.display == 'none'" .
 				             " ? '' : 'none');"
 			),
-			'b' => array(), 'Notice', '/b', ' (8)'
+			'b' => array(), 'Notice', '/b', ' (8)',
 		));
-		
+
 		$this->assertPattern('/Undefined variable: buzz/', $result[1]);
 		$this->assertPattern('/<a[^>]+>Code/', $result[1]);
 		$this->assertPattern('/<a[^>]+>Context/', $result[2]);
@@ -193,6 +201,7 @@ class DebuggerTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $data, true);
 	}
+
 /**
  * testTrimPath method
  *
@@ -203,6 +212,7 @@ class DebuggerTest extends CakeTestCase {
 		$this->assertEqual(Debugger::trimPath(APP), 'APP' . DS);
 		$this->assertEqual(Debugger::trimPath(CAKE_CORE_INCLUDE_PATH), 'CORE');
 	}
+
 /**
  * testExportVar method
  *
@@ -255,6 +265,7 @@ class DebuggerTest extends CakeTestCase {
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $expected);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLog method
  *
@@ -280,6 +291,7 @@ class DebuggerTest extends CakeTestCase {
 		$this->assertPattern('/"whatever",/', $result);
 		$this->assertPattern('/"here"/', $result);
 	}
+
 /**
  * testDump method
  *
@@ -306,6 +318,7 @@ class DebuggerTest extends CakeTestCase {
 		$expected = "<pre>array(\n\t\"People\" => array()\n)</pre>";
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * test getInstance.
  *
diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php
index e3d233e1e..80faf0510 100644
--- a/cake/tests/cases/libs/error.test.php
+++ b/cake/tests/cases/libs/error.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ErrorHandlerTest file
  *
@@ -30,6 +31,7 @@ if (class_exists('TestErrorHandler')) {
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
+
 /**
  * BlueberryComponent class
  *
@@ -37,6 +39,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
  * @subpackage    cake.tests.cases.libs
  */
 class BlueberryComponent extends Object {
+
 /**
  * testName property
  *
@@ -44,6 +47,7 @@ class BlueberryComponent extends Object {
  * @return void
  */
 	var $testName = null;
+
 /**
  * initialize method
  *
@@ -54,6 +58,7 @@ class BlueberryComponent extends Object {
 		$this->testName = 'BlueberryComponent';
 	}
 }
+
 /**
  * BlueberryDispatcher class
  *
@@ -61,6 +66,7 @@ class BlueberryComponent extends Object {
  * @subpackage    cake.tests.cases.libs
  */
 class BlueberryDispatcher extends Dispatcher {
+
 /**
  * cakeError method
  *
@@ -72,6 +78,7 @@ class BlueberryDispatcher extends Dispatcher {
 		return $error;
 	}
 }
+
 /**
  * Short description for class.
  *
@@ -79,6 +86,7 @@ class BlueberryDispatcher extends Dispatcher {
  * @subpackage    cake.tests.cases.libs
  */
 class AuthBlueberryUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -86,6 +94,7 @@ class AuthBlueberryUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'AuthBlueberryUser';
+
 /**
  * useTable property
  *
@@ -141,6 +150,7 @@ if (!class_exists('AppController')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }
 App::import('Core', array('Error', 'Controller'));
+
 /**
  * TestErrorController class
  *
@@ -148,6 +158,7 @@ App::import('Core', array('Error', 'Controller'));
  * @subpackage    cake.tests.cases.libs
  */
 class TestErrorController extends AppController {
+
 /**
  * uses property
  *
@@ -155,6 +166,7 @@ class TestErrorController extends AppController {
  * @access public
  */
 	var $uses = array();
+
 /**
  * index method
  *
@@ -166,6 +178,7 @@ class TestErrorController extends AppController {
 		return 'what up';
 	}
 }
+
 /**
  * BlueberryController class
  *
@@ -173,6 +186,7 @@ class TestErrorController extends AppController {
  * @subpackage    cake.tests.cases.libs
  */
 class BlueberryController extends AppController {
+
 /**
  * name property
  *
@@ -180,6 +194,7 @@ class BlueberryController extends AppController {
  * @return void
  */
 	var $name = 'BlueberryController';
+
 /**
  * uses property
  *
@@ -187,6 +202,7 @@ class BlueberryController extends AppController {
  * @return void
  */
 	var $uses = array('AuthBlueberryUser');
+
 /**
  * components property
  *
@@ -195,6 +211,7 @@ class BlueberryController extends AppController {
  */
 	var $components = array('Auth');
 }
+
 /**
  * TestErrorHandler class
  *
@@ -202,6 +219,7 @@ class BlueberryController extends AppController {
  * @subpackage    cake.tests.cases.libs
  */
 class TestErrorHandler extends ErrorHandler {
+
 /**
  * stop method
  *
@@ -212,6 +230,7 @@ class TestErrorHandler extends ErrorHandler {
 		return;
 	}
 }
+
 /**
  * ErrorHandlerTest class
  *
@@ -219,6 +238,7 @@ class TestErrorHandler extends ErrorHandler {
  * @subpackage    cake.tests.cases.libs
  */
 class ErrorHandlerTest extends CakeTestCase {
+
 /**
  * skip method
  *
@@ -228,6 +248,7 @@ class ErrorHandlerTest extends CakeTestCase {
 	function skip() {
 		$this->skipIf(PHP_SAPI === 'cli', '%s Cannot be run from console');
 	}
+
 /**
  * testError method
  *
@@ -247,6 +268,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern("/<h2>Couldn't find what you were looking for<\/h2>/", $result);
 		$this->assertPattern('/Page not Found/', $result);
 	}
+
 /**
  * testError404 method
  *
@@ -272,6 +294,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertNoPattern('#<script>#', $result);
 		$this->assertNoPattern('#</script>#', $result);
 	}
+
 /**
  * testMissingController method
  *
@@ -288,6 +311,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/<em>PostsController<\/em>/', $result);
 		$this->assertPattern('/BlueberryComponent/', $result);
 	}
+
 /**
  * testMissingAction method
  *
@@ -309,6 +333,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertNoPattern('/Location: (.*)\/users\/login/', $result);
 		$this->assertNoPattern('/Stopped with status: 0/', $result);
 	}
+
 /**
  * testPrivateAction method
  *
@@ -322,6 +347,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/<h2>Private Method in PostsController<\/h2>/', $result);
 		$this->assertPattern('/<em>PostsController::<\/em><em>_secretSauce\(\)<\/em>/', $result);
 	}
+
 /**
  * testMissingTable method
  *
@@ -335,6 +361,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/<h2>Missing Database Table<\/h2>/', $result);
 		$this->assertPattern('/table <em>articles<\/em> for model <em>Article<\/em>/', $result);
 	}
+
 /**
  * testMissingDatabase method
  *
@@ -348,6 +375,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/<h2>Missing Database Connection<\/h2>/', $result);
 		$this->assertPattern('/Confirm you have created the file/', $result);
 	}
+
 /**
  * testMissingView method
  *
@@ -363,6 +391,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern("/PagesController::/", $expected);
 		$this->assertPattern("/pages\/about.ctp/", $expected);
 	}
+
 /**
  * testMissingLayout method
  *
@@ -378,6 +407,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern("/Missing Layout/", $expected);
 		$this->assertPattern("/layouts\/my_layout.ctp/", $expected);
 	}
+
 /**
  * testMissingConnection method
  *
@@ -391,6 +421,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/<h2>Missing Database Connection<\/h2>/', $result);
 		$this->assertPattern('/Article requires a database connection/', $result);
 	}
+
 /**
  * testMissingHelperFile method
  *
@@ -405,6 +436,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/Create the class below in file:/', $result);
 		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
 	}
+
 /**
  * testMissingHelperClass method
  *
@@ -419,6 +451,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/The helper class <em>MyCustomHelper<\/em> can not be found or does not exist./', $result);
 		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
 	}
+
 /**
  * testMissingComponentFile method
  *
@@ -433,6 +466,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
 		$this->assertPattern('/(\/|\\\)sidebox.php/', $result);
 	}
+
 /**
  * testMissingComponentClass method
  *
@@ -447,6 +481,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
 		$this->assertPattern('/(\/|\\\)sidebox.php/', $result);
 	}
+
 /**
  * testMissingModel method
  *
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
index f0d64a7bf..3b1825449 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/cake/tests/cases/libs/file.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * FileTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'File');
+
 /**
  * FileTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'File');
  * @subpackage    cake.tests.cases.libs
  */
 class FileTest extends CakeTestCase {
+
 /**
  * File property
  *
@@ -39,6 +42,7 @@ class FileTest extends CakeTestCase {
  * @access public
  */
 	var $File = null;
+
 /**
  * testBasic method
  *
@@ -100,6 +104,7 @@ class FileTest extends CakeTestCase {
 		$expecting = '0644';
 		$this->assertEqual($result, $expecting);
 	}
+
 /**
  * testRead method
  *
@@ -128,6 +133,7 @@ class FileTest extends CakeTestCase {
 		$result = $this->File->read(3);
 		$this->assertEqual($result, $expecting);
 	}
+
 /**
  * testOffset method
  *
@@ -160,6 +166,7 @@ class FileTest extends CakeTestCase {
 		$expecting = 5+3;
 		$this->assertIdentical($result, $expecting);
 	}
+
 /**
  * testOpen method
  *
@@ -184,6 +191,7 @@ class FileTest extends CakeTestCase {
 		$this->assertFalse($handle === $this->File->handle);
 		$this->assertTrue(is_resource($this->File->handle));
 	}
+
 /**
  * testClose method
  *
@@ -201,6 +209,7 @@ class FileTest extends CakeTestCase {
 		$this->assertTrue($this->File->close());
 		$this->assertFalse(is_resource($this->File->handle));
 	}
+
 /**
  * testCreate method
  *
@@ -212,6 +221,7 @@ class FileTest extends CakeTestCase {
 		$File =& new File($tmpFile, true, 0777);
 		$this->assertTrue($File->exists());
 	}
+
 /**
  * testOpeningNonExistantFileCreatesIt method
  *
@@ -225,6 +235,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testPrepare method
  *
@@ -245,6 +256,7 @@ class FileTest extends CakeTestCase {
 		$expected .= "for\r\n\r\n\r\n\r\n\r\nhere";
 		$this->assertIdentical(File::prepare($string, true), $expected);
 	}
+
 /**
  * testReadable method
  *
@@ -258,6 +270,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testWritable method
  *
@@ -271,6 +284,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testExecutable method
  *
@@ -284,6 +298,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testLastAccess method
  *
@@ -298,6 +313,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testLastChange method
  *
@@ -314,6 +330,7 @@ class FileTest extends CakeTestCase {
 		$someFile->close();
 		$someFile->delete();
 	}
+
 /**
  * testWrite method
  *
@@ -344,6 +361,7 @@ class FileTest extends CakeTestCase {
 		}
 		unlink($tmpFile);
 	}
+
 /**
  * testAppend method
  *
@@ -372,6 +390,7 @@ class FileTest extends CakeTestCase {
 			$TmpFile->close();
 		}
 	}
+
 /**
  * testDelete method
  *
@@ -396,6 +415,7 @@ class FileTest extends CakeTestCase {
 		$result = $TmpFile->delete();
 		$this->assertFalse($result);
 	}
+
 /**
  * getTmpFile method
  *
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index 6fad570de..baaca4eda 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * FolderTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'File');
+
 /**
  * FolderTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'File');
  * @subpackage    cake.tests.cases.libs
  */
 class FolderTest extends CakeTestCase {
+
 /**
  * testBasic method
  *
@@ -56,6 +59,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->cd(ROOT . DS . 'non-existent');
 		$this->assertFalse($result);
 	}
+
 /**
  * testInPath method
  *
@@ -83,6 +87,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->inPath(DS . 'non-existing' . $inside);
 		$this->assertFalse($result);
 	}
+
 /**
  * testOperations method
  *
@@ -154,6 +159,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->pwd();
 		$this->assertNull($result);
 	}
+
 /**
  * testChmod method
  *
@@ -183,6 +189,7 @@ class FolderTest extends CakeTestCase {
 
 		$Folder->delete($new);
 	}
+
 /**
  * testRealPathForWebroot method
  *
@@ -193,6 +200,7 @@ class FolderTest extends CakeTestCase {
 		$Folder = new Folder('files/');
 		$this->assertEqual(realpath('files/'), $Folder->path);
 	}
+
 /**
  * testZeroAsDirectory method
  *
@@ -215,6 +223,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->delete($new);
 		$this->assertTrue($result);
 	}
+
 /**
  * testFolderRead method
  *
@@ -233,6 +242,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->read(true, true);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFolderTree method
  *
@@ -282,6 +292,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertIdentical(array_diff($expected[1], $result), array());
 		$this->assertIdentical(array_diff($result, $expected[1]), array());
 	}
+
 /**
  * testWindowsPath method
  *
@@ -293,6 +304,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue(Folder::isWindowsPath('C:\\cake\\is\\awesome'));
 		$this->assertTrue(Folder::isWindowsPath('d:\\cake\\is\\awesome'));
 	}
+
 /**
  * testIsAbsolute method
  *
@@ -313,6 +325,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue(Folder::isAbsolute('C:\\path\\to\\file'));
 		$this->assertTrue(Folder::isAbsolute('d:\\path\\to\\file'));
 	}
+
 /**
  * testIsSlashTerm method
  *
@@ -325,6 +338,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue(Folder::isSlashTerm('C:\\cake\\'));
 		$this->assertTrue(Folder::isSlashTerm('/usr/local/'));
 	}
+
 /**
  * testStatic method
  *
@@ -335,6 +349,7 @@ class FolderTest extends CakeTestCase {
 		$result = Folder::slashTerm('/path/to/file');
 		$this->assertEqual($result, '/path/to/file/');
 	}
+
 /**
  * testNormalizePath method
  *
@@ -354,6 +369,7 @@ class FolderTest extends CakeTestCase {
 		$result = Folder::normalizePath($path);
 		$this->assertEqual($result, '\\');
 	}
+
 /**
  * correctSlashFor method
  *
@@ -373,6 +389,7 @@ class FolderTest extends CakeTestCase {
 		$result = Folder::correctSlashFor($path);
 		$this->assertEqual($result, '\\');
 	}
+
 /**
  * testInCakePath method
  *
@@ -397,6 +414,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->inCakePath($path);
 		$this->assertTrue($result);
 	}
+
 /**
  * testFind method
  *
@@ -449,6 +467,7 @@ class FolderTest extends CakeTestCase {
 		$Folder->delete($Folder->pwd() . DS . 'testme');
 		$file->delete();
 	}
+
 /**
  * testFindRecursive method
  *
@@ -508,6 +527,7 @@ class FolderTest extends CakeTestCase {
 		$Folder->delete($Folder->pwd() . DS . 'testme');
 		$File->delete();
 	}
+
 /**
  * testConstructWithNonExistantPath method
  *
@@ -520,6 +540,7 @@ class FolderTest extends CakeTestCase {
 		$Folder->cd(TMP);
 		$Folder->delete($Folder->pwd() . 'config_non_existant');
 	}
+
 /**
  * testDirSize method
  *
@@ -539,6 +560,7 @@ class FolderTest extends CakeTestCase {
 		$Folder->cd(TMP);
 		$Folder->delete($Folder->pwd() . 'config_non_existant');
 	}
+
 /**
  * testDelete method
  *
@@ -566,6 +588,7 @@ class FolderTest extends CakeTestCase {
 		);
 		$this->assertEqual($expected, $messages);
 	}
+
 /**
  * testCopy method
  *
@@ -624,6 +647,7 @@ class FolderTest extends CakeTestCase {
 		$Folder =& new Folder($path);
 		$Folder->delete();
 	}
+
 /**
  * testMove method
  *
@@ -703,4 +727,4 @@ class FolderTest extends CakeTestCase {
 		$Folder->delete();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index d70b55de4..6389823d4 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * HttpSocketTest file
  *
@@ -27,6 +28,7 @@
 App::import('Core', 'HttpSocket');
 
 class TestHttpSocket extends HttpSocket {
+
 /**
  * Convenience method for testing protected method
  *
@@ -36,6 +38,7 @@ class TestHttpSocket extends HttpSocket {
 	function configUri($uri = null) {
 		return parent::_configUri($uri);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -46,6 +49,7 @@ class TestHttpSocket extends HttpSocket {
 	function parseUri($uri = null, $base = array()) {
 		return parent::_parseUri($uri, $base);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -56,6 +60,7 @@ class TestHttpSocket extends HttpSocket {
 	function buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%port/%path?%query#%fragment') {
 		return parent::_buildUri($uri, $uriTemplate);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -75,6 +80,7 @@ class TestHttpSocket extends HttpSocket {
 	function parseResponse($message) {
 		return parent::_parseResponse($message);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -84,6 +90,7 @@ class TestHttpSocket extends HttpSocket {
 	function parseHeader($header) {
 		return parent::_parseHeader($header);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -93,6 +100,7 @@ class TestHttpSocket extends HttpSocket {
 	function parseQuery($query) {
 		return parent::_parseQuery($query);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -103,6 +111,7 @@ class TestHttpSocket extends HttpSocket {
 	function decodeBody($body, $encoding = 'chunked') {
 		return parent::_decodeBody($body, $encoding);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -112,6 +121,7 @@ class TestHttpSocket extends HttpSocket {
 	function decodeChunkedBody($body) {
 		return parent::_decodeChunkedBody($body);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -122,6 +132,7 @@ class TestHttpSocket extends HttpSocket {
 	function buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
 		return parent::_buildRequestLine($request, $versionToken);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -131,6 +142,7 @@ class TestHttpSocket extends HttpSocket {
 	function tokenEscapeChars($hex = true, $chars = null) {
 		return parent::_tokenEscapeChars($hex, $chars);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -140,6 +152,7 @@ class TestHttpSocket extends HttpSocket {
 	function EscapeToken($token, $chars = null) {
 		return parent::_escapeToken($token, $chars);
 	}
+
 /**
  * Convenience method for testing protected method
  *
@@ -158,6 +171,7 @@ class TestHttpSocket extends HttpSocket {
  * @subpackage    cake.tests.cases.libs
  */
 class HttpSocketTest extends CakeTestCase {
+
 /**
  * Socket property
  *
@@ -165,6 +179,7 @@ class HttpSocketTest extends CakeTestCase {
  * @access public
  */
 	var $Socket = null;
+
 /**
  * RequestSocket property
  *
@@ -172,6 +187,7 @@ class HttpSocketTest extends CakeTestCase {
  * @access public
  */
 	var $RequestSocket = null;
+
 /**
  * This function sets up a TestHttpSocket instance we are going to use for testing
  *
@@ -187,6 +203,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket =& new MockHttpSocket();
 		$this->RequestSocket =& new MockHttpSocketRequests();
 	}
+
 /**
  * We use this function to clean up after the test case was executed
  *
@@ -196,6 +213,7 @@ class HttpSocketTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Socket, $this->RequestSocket);
 	}
+
 /**
  * Test that HttpSocket::__construct does what one would expect it to do
  *
@@ -224,6 +242,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->__construct(array('request' => array('uri' => 'http://www.cakephp.org:23/')));
 		$this->assertIdentical($this->Socket->config, $baseConfig);
 	}
+
 /**
  * Test that HttpSocket::configUri works properly with different types of arguments
  *
@@ -291,6 +310,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->assertIdentical($this->Socket->config, $expected);
 		$this->assertIdentical($r, false);
 	}
+
 /**
  * Tests that HttpSocket::request (the heart of the HttpSocket) is working properly.
  *
@@ -519,12 +539,12 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->setReturnValue('read', false);
 		$this->Socket->_mock->_call_counts['read'] = 0;
 		$number = mt_rand(0, 9999999);
-		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is ".$number."</h1>";
+		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is " . $number . "</h1>";
 		$this->Socket->setReturnValueAt(0, 'read', $serverResponse);
 		$this->Socket->expect('write', array("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n"));
 		$this->Socket->expectCallCount('read', 2);
 		$response = $this->Socket->request($request);
-		$this->assertIdentical($response, "<h1>Hello, your lucky number is ".$number."</h1>");
+		$this->assertIdentical($response, "<h1>Hello, your lucky number is " . $number . "</h1>");
 
 		$this->Socket->reset();
 		$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a cookie test!</h1>";
@@ -545,6 +565,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->assertEqual($this->Socket->config['request']['cookies'], $expect);
 		$this->assertFalse($this->Socket->connected);
 	}
+
 /**
  * testUrl method
  *
@@ -599,6 +620,7 @@ class HttpSocketTest extends CakeTestCase {
 		$url = $this->Socket->url('/search?q=socket');
 		$this->assertIdentical($url, 'http://www.google.com:8080/search?q=socket');
 	}
+
 /**
  * testGet method
  *
@@ -623,6 +645,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/', 'auth' => array('user' => 'foo', 'pass' => 'bar'))));
 		$this->RequestSocket->get('http://www.google.com/', null, array('auth' => array('user' => 'foo', 'pass' => 'bar')));
 	}
+
 /**
  * testPostPutDelete method
  *
@@ -643,6 +666,7 @@ class HttpSocketTest extends CakeTestCase {
 			$this->RequestSocket->{low($method)}('http://www.google.com/', null, array('line' => 'Hey Server'));
 		}
 	}
+
 /**
  * testParseResponse method
  *
@@ -734,6 +758,7 @@ class HttpSocketTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * testDecodeBody method
  *
@@ -777,6 +802,7 @@ class HttpSocketTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * testDecodeChunkedBody method
  *
@@ -830,6 +856,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->assertIdentical($r['body'], $decoded);
 		$this->assertIdentical($r['header'], array('Foo-Header' => 'bar', 'Cake' => 'PHP'));
 	}
+
 /**
  * testBuildRequestLine method
  *
@@ -894,6 +921,7 @@ class HttpSocketTest extends CakeTestCase {
 		$r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n");
 		$this->assertIdentical($r, "GET * HTTP/1.1\r\n");
 	}
+
 /**
  * Asserts that HttpSocket::parseUri is working properly
  *
@@ -999,6 +1027,7 @@ class HttpSocketTest extends CakeTestCase {
 			'port' => 8080,
 		));
 	}
+
 /**
  * Tests that HttpSocket::buildUri can turn all kinds of uri arrays (and strings) into fully or partially qualified URI's
  *
@@ -1062,6 +1091,7 @@ class HttpSocketTest extends CakeTestCase {
 		$r = $this->Socket->buildUri(array('scheme' => 'foo', 'host' => 'www.cakephp.org'));
 		$this->assertIdentical($r, 'foo://www.cakephp.org:80/');
 	}
+
 /**
  * Asserts that HttpSocket::parseQuery is working properly
  *
@@ -1167,6 +1197,7 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$this->assertIdentical($query, $expectedQuery);
 	}
+
 /**
  * Tests that HttpSocket::buildHeader can turn a given $header array into a proper header string according to
  * HTTP 1.1 specs.
@@ -1205,6 +1236,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->assertIdentical($r, "Test\"@\"Field: My value\r\n");
 
 	}
+
 /**
  * Test that HttpSocket::parseHeader can take apart a given (and valid) $header string and turn it into an array.
  *
@@ -1266,6 +1298,7 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$this->assertIdentical($r, $expected);
 	}
+
 /**
  * testParseCookies method
  *
@@ -1307,6 +1340,7 @@ class HttpSocketTest extends CakeTestCase {
 		$cookies = $this->Socket->parseCookies($header);
 		$this->assertEqual($cookies, $expected);
 	}
+
 /**
  * testBuildCookies method
  *
@@ -1328,6 +1362,7 @@ class HttpSocketTest extends CakeTestCase {
 		$result = $this->Socket->buildCookies($cookies);
 		$this->assertEqual($result, $expect);
 	}
+
 /**
  * Tests that HttpSocket::_tokenEscapeChars() returns the right characters.
  *
@@ -1353,6 +1388,7 @@ class HttpSocketTest extends CakeTestCase {
 		$r = $this->Socket->tokenEscapeChars(false);
 		$this->assertEqual($r, $expected);
 	}
+
 /**
  * Test that HttpSocket::escapeToken is escaping all characters as descriped in RFC 2616 (HTTP 1.1 specs)
  *
@@ -1378,6 +1414,7 @@ class HttpSocketTest extends CakeTestCase {
 		$expectedToken = 'Extreme-":"Token-"	"-""""@"-test';
 		$this->assertIdentical($expectedToken, $escapedToken);
 	}
+
 /**
  * Test that escaped token strings are properly unescaped by HttpSocket::unescapeToken
  *
@@ -1403,6 +1440,7 @@ class HttpSocketTest extends CakeTestCase {
 		$expectedToken = 'Extreme-:Token-	-"@-test';
 		$this->assertIdentical($expectedToken, $escapedToken);
 	}
+
 /**
  * This tests asserts HttpSocket::reset() resets a HttpSocket instance to it's initial state (before Object::__construct
  * got executed)
@@ -1426,6 +1464,7 @@ class HttpSocketTest extends CakeTestCase {
 
 		$this->assertIdentical($return, true);
 	}
+
 /**
  * This tests asserts HttpSocket::reset(false) resets certain HttpSocket properties to their initial state (before
  * Object::__construct got executed).
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index dc475c8a4..09105224d 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * I18nTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'i18n');
+
 /**
  * I18nTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'i18n');
  * @subpackage    cake.tests.cases.libs
  */
 class I18nTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -39,11 +42,14 @@ class I18nTest extends CakeTestCase {
  * @return void
  */
 	function setUp() {
-		$this->_localePaths = App::path('locales');
+		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')
-		));
+			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins')
+		), true);
+		App::objects('plugin', null, false);
 	}
+
 /**
  * tearDown method
  *
@@ -51,8 +57,11 @@ class I18nTest extends CakeTestCase {
  * @return void
  */
 	function tearDown() {
+		Cache::delete('object_map', '_cake_core_');
 		App::build();
+		App::objects('plugin', null, false);
 	}
+
 /**
  * testDefaultStrings method
  *
@@ -122,6 +131,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 = 0 or > 1 (from core)', $corePlurals));
 		$this->assertTrue(in_array('25 = 0 or > 1 (from core)', $corePlurals));
 	}
+
 /**
  * testPoRulesZero method
  *
@@ -193,6 +203,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends with any # (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 ends with any # (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesZero method
  *
@@ -264,6 +275,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends with any # (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 ends with any # (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesOne method
  *
@@ -335,6 +347,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 = 0 or > 1 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 = 0 or > 1 (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesOne method
  *
@@ -406,6 +419,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 = 0 or > 1 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 = 0 or > 1 (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesTwo method
  *
@@ -477,6 +491,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 > 1 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 > 1 (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesTwo method
  *
@@ -548,6 +563,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 > 1 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 > 1 (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesThree method
  *
@@ -619,6 +635,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesThree method
  *
@@ -690,6 +707,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesFour method
  *
@@ -761,6 +779,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesFour method
  *
@@ -832,6 +851,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesFive method
  *
@@ -905,6 +925,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesFive method
  *
@@ -978,6 +999,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesSix method
  *
@@ -1049,6 +1071,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesSix method
  *
@@ -1120,6 +1143,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesSeven method
  *
@@ -1191,6 +1215,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesSeven method
  *
@@ -1262,6 +1287,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesEight method
  *
@@ -1333,6 +1359,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesEight method
  *
@@ -1404,6 +1431,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesNine method
  *
@@ -1478,6 +1506,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesNine method
  *
@@ -1552,6 +1581,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesTen method
  *
@@ -1625,6 +1655,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesTen method
  *
@@ -1698,6 +1729,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesEleven method
  *
@@ -1769,6 +1801,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesEleven method
  *
@@ -1840,6 +1873,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesTwelve method
  *
@@ -1911,6 +1945,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesTwelve method
  *
@@ -1982,6 +2017,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesThirteen method
  *
@@ -2053,6 +2089,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesThirteen method
  *
@@ -2124,6 +2161,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPoRulesFourteen method
  *
@@ -2195,6 +2233,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testMoRulesFourteen method
  *
@@ -2266,6 +2305,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testSetLanguageWithSession method
  *
@@ -2306,6 +2346,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (po translated)', $plurals));
 		unset($_SESSION['Config']['language']);
 	}
+
 /**
  * testNoCoreTranslation method
  *
@@ -2348,6 +2389,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertFalse(in_array('24 everything else (from core translated)', $corePlurals));
 		$this->assertFalse(in_array('25 everything else (from core translated)', $corePlurals));
 	}
+
 /**
  * testPluginTranslation method
  *
@@ -2390,9 +2432,8 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('23 = 0 or > 1 (from plugin)', $plurals));
 		$this->assertTrue(in_array('24 = 0 or > 1 (from plugin)', $plurals));
 		$this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals));
-
-		App::build();
 	}
+
 /**
  * testPoMultipleLineTranslation method
  *
@@ -2466,6 +2507,7 @@ class I18nTest extends CakeTestCase {
 		$expected = "%d is 2-4\n" . str_replace("\r\n", "\n", $string);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testPoNoTranslationNeeded method
  *
@@ -2477,6 +2519,7 @@ class I18nTest extends CakeTestCase {
 		$result = __('No Translation needed', true);
 		$this->assertEqual($result, 'No Translation needed');
 	}
+
 /**
  * testPoQuotedString method
  *
@@ -2487,6 +2530,13 @@ class I18nTest extends CakeTestCase {
 		$expected = 'this is a "quoted string" (translated)';
 		$this->assertEqual(__('this is a "quoted string"', true), $expected);
 	}
+
+/**
+ * testFloatValue method
+ *
+ * @access public
+ * @return void
+ */
 	function testFloatValue() {
 		Configure::write('Config.language', 'rule_9_po');
 
@@ -2502,6 +2552,76 @@ class I18nTest extends CakeTestCase {
 		$expected = "%d everything else (translated)";
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * testCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategory() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+	}
+
+/**
+ * testPluginCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginCategory() {
+		Configure::write('Config.language', 'po');
+
+		$singular = $this->__domainCategorySingular();
+		$this->assertEqual('Monetary Plural Rule 1 (from plugin)', $singular);
+
+		$plurals = $this->__domainCategoryPlural();
+		$this->assertTrue(in_array('Monetary 0 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('Monetary 1 = 1 (from plugin)', $plurals));
+	}
+
+/**
+ * testCategoryThenSingular method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategoryThenSingular() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+
+		$singular = $this->__singular();
+		$this->assertEqual('Po (translated)', $singular);
+	}
+
+/**
+ * Singular method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategorySingular($domain = 'test_plugin', $category = LC_MONETARY) {
+		$singular = __dc($domain, 'Plural Rule 1', $category, true);
+		return $singular;
+	}
+
+/**
+ * Plural method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategoryPlural($domain = 'test_plugin', $category = LC_MONETARY) {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, $category, true), (float)$number);
+		}
+		return $plurals;
+	}
+
 /**
  * Singular method
  *
@@ -2512,6 +2632,7 @@ class I18nTest extends CakeTestCase {
 		$singular = __d($domain, 'Plural Rule 1', true);
 		return $singular;
 	}
+
 /**
  * Plural method
  *
@@ -2525,6 +2646,18 @@ class I18nTest extends CakeTestCase {
 		}
 		return $plurals;
 	}
+
+/**
+ * category method
+ *
+ * @access private
+ * @return void
+ */
+	function __category($category = LC_MONETARY) {
+		$singular = __c('Plural Rule 1', $category, true);
+		return $singular;
+	}
+
 /**
  * Singular method
  *
@@ -2535,6 +2668,7 @@ class I18nTest extends CakeTestCase {
 		$singular = __('Plural Rule 1', true);
 		return $singular;
 	}
+
 /**
  * Plural method
  *
@@ -2548,6 +2682,7 @@ class I18nTest extends CakeTestCase {
 		}
 		return $plurals;
 	}
+
 /**
  * singularFromCore method
  *
@@ -2558,6 +2693,7 @@ class I18nTest extends CakeTestCase {
 		$singular = __('Plural Rule 1 (from core)', true);
 		return $singular;
 	}
+
 /**
  * pluralFromCore method
  *
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index 0cfc171c9..d0a4ef062 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -19,11 +19,13 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php)
  */
+
 /**
  * Included libraries.
  *
  */
 App::import('Core', 'Inflector');
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@ App::import('Core', 'Inflector');
  * @subpackage    cake.tests.cases.libs
  */
 class InflectorTest extends CakeTestCase {
+
 /**
  * Inflector property
  *
@@ -38,6 +41,7 @@ class InflectorTest extends CakeTestCase {
  * @access public
  */
 	var $Inflector = null;
+
 /**
  * setUp method
  *
@@ -47,6 +51,7 @@ class InflectorTest extends CakeTestCase {
 	function setUp() {
 		$this->Inflector = Inflector::getInstance();
 	}
+
 /**
  * testInstantiation method
  *
@@ -56,6 +61,7 @@ class InflectorTest extends CakeTestCase {
 	function testInstantiation() {
 		$this->assertEqual(new Inflector(), $this->Inflector);
 	}
+
 /**
  * testInflectingSingulars method
  *
@@ -107,6 +113,7 @@ class InflectorTest extends CakeTestCase {
         $this->assertEqual(Inflector::singularize('niches'), 'niche');
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
+
 /**
  * testInflectingPlurals method
  *
@@ -150,6 +157,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::pluralize('crisis'), 'crises');
 		$this->assertEqual(Inflector::pluralize(''), '');
 	}
+
 /**
  * testInflectorSlug method
  *
@@ -200,7 +208,20 @@ class InflectorTest extends CakeTestCase {
 		$result = Inflector::slug('#this melts your face1#2#3', '-');
 		$expected = 'this-melts-your-face1-2-3';
 		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('controller/action/りんご/1');
+		$expected = 'controller_action_りんご_1';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('の話が出たので大丈夫かなあと');
+		$expected = 'の話が出たので大丈夫かなあと';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('posts/view/한국어/page:1/sort:asc');
+		$expected = 'posts_view_한국어_page_1_sort_asc';
+		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testInflectorSlugWithMap method
  *
@@ -216,6 +237,7 @@ class InflectorTest extends CakeTestCase {
 		$expected = '_eplace_eve_y__';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testVariableNaming method
  *
@@ -228,6 +250,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::variable('test field'), 'testField');
 		$this->assertEqual(Inflector::variable('Test_field'), 'testField');
 	}
+
 /**
  * testClassNaming method
  *
@@ -239,6 +262,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::classify('file_systems'), 'FileSystem');
 		$this->assertEqual(Inflector::classify('news'), 'News');
 	}
+
 /**
  * testTableNaming method
  *
@@ -250,6 +274,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::tableize('FileSystem'), 'file_systems');
 		$this->assertEqual(Inflector::tableize('News'), 'news');
 	}
+
 /**
  * testHumanization method
  *
@@ -261,6 +286,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::humanize('posts_tags'), 'Posts Tags');
 		$this->assertEqual(Inflector::humanize('file_systems'), 'File Systems');
 	}
+
 /**
  * testCustomPluralRule method
  *
@@ -285,6 +311,7 @@ class InflectorTest extends CakeTestCase {
         $this->assertEqual(Inflector::pluralize('amaze'), 'amazable');
         $this->assertEqual(Inflector::pluralize('phone'), 'phonezes');
 	}
+
 /**
  * testCustomSingularRule method
  *
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index f3aaea211..25c4f8a72 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * L10nTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'l10n');
+
 /**
  * L10nTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'l10n');
  * @subpackage    cake.tests.cases.libs
  */
 class L10nTest extends CakeTestCase {
+
 /**
  * testGet method
  *
@@ -114,6 +117,7 @@ class L10nTest extends CakeTestCase {
 		$expected = 'en_us';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testGetAutoLanguage method
  *
@@ -168,6 +172,7 @@ class L10nTest extends CakeTestCase {
 
 		$_SERVER = $__SERVER;
 	}
+
 /**
  * testMap method
  *
@@ -489,6 +494,7 @@ class L10nTest extends CakeTestCase {
 		$expected = array('zul' => 'zu', 'zu' => 'zul');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testCatalog method
  *
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 3eba7eb46..e975671ab 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MagicDbTest file
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 uses('magic_db', 'object');
+
 /**
  * The test class for the MagicDb class
  *
@@ -30,6 +32,7 @@ uses('magic_db', 'object');
  * @subpackage    cake.tests.cases.libs
  */
 class MagicDbTest extends UnitTestCase {
+
 /**
  * The MagicDb instance to be tested
  *
@@ -37,6 +40,7 @@ class MagicDbTest extends UnitTestCase {
  * @access public
  */
 	var $Db = null;
+
 /**
  * Sets up a MagicDb class instance for testing
  *
@@ -45,6 +49,7 @@ class MagicDbTest extends UnitTestCase {
 	function setUp() {
 		$this->Db =& new MagicDb();
 	}
+
 /**
  * MagicDb::analyze should properly detect the file type and output additional info as requested.
  *
@@ -60,6 +65,7 @@ class MagicDbTest extends UnitTestCase {
 		$r = $this->Db->analyze(WWW_ROOT.'img'.DS.'cake.icon.gif');
 		// TODO: Check several serialized file samples for accurate detection
 	}
+
 /**
  * MagicDb::read should properly read MagicDb databases from .php-/.db-files and plain data arguments passed in and return false if the file wasn't found or
  * if the readed data did not validate.
@@ -99,6 +105,7 @@ class MagicDbTest extends UnitTestCase {
 		$r = $this->Db->read(MagicDbTestData::get('magic.snippet.db'));
 		$this->assertTrue($r === true);
 	}
+
 /**
  * MagicDb::toArray should either return the MagicDb::db property, or the parsed array data if a magic.db dump is passed in as the first argument
  *
@@ -122,6 +129,7 @@ class MagicDbTest extends UnitTestCase {
 		$r = $this->Db->toArray(MagicDbTestData::get('magic.snippet.db'));
 		$this->assertTrue($r === MagicDbTestData::get('magic.snippet.db.result'));
 	}
+
 /**
  * The MagicDb::validates function should return if the array passed to it or the local db property contains a valid MagicDb record set
  *
@@ -146,12 +154,14 @@ class MagicDbTest extends UnitTestCase {
 		$this->assertTrue($r === true);
 	}
 }
+
 /**
  * Test data holding object for MagicDb tests
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs
  */
+
 /**
  * MagicDbTestData class
  *
@@ -159,6 +169,7 @@ class MagicDbTest extends UnitTestCase {
  * @subpackage    cake.tests.cases.libs
  */
 class MagicDbTestData extends Object {
+
 /**
  * Base64 encoded data
  *
@@ -170,6 +181,7 @@ class MagicDbTestData extends Object {
 		'magic.snippet.db.result' => 'YToyOntzOjY6ImhlYWRlciI7YToyOntzOjQ6IkRhdGUiO3M6MTA6IjIwMDUtMDMtMjkiO3M6NjoiU291cmNlIjtzOjIyOiJodHRwOi8vd3d3Lm1hZ2ljZGIub3JnIjt9czo4OiJkYXRhYmFzZSI7YToyOntpOjA7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo1OToiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBoZWxwIGZpbGUiO31pOjE7YTo0OntpOjA7czoyOiImOSI7aToxO3M6NDoiYnl0ZSI7aToyO3M6NDoiMHgwMiI7aTozO3M6MDoiIjt9aToyO2E6Mzp7aTowO3M6ODoiPjEwIGJ5dGUiO2k6MTtzOjE6IngiO2k6MjtzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX1pOjE7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo3ODoiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBhcHBsaWNhdGlvbiByZXNvdXJjZSBsaWJyYXJ5Ijt9aToxO2E6NDp7aTowO3M6MjoiJjkiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjI6IjUxIjtpOjM7czowOiIiO31pOjI7YTo0OntpOjA7czozOiI+MTAiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX19fQ==',
 		'magic.db' => '# FILE_ID DB
# Date:2005-03-29
# Source:http://www.magicdb.org

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect help file
&9	byte	0x02	
>10 byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect application resource library
&9	byte	51	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect block file
&9	byte	13	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect column block
&9	byte	15	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary file
&9	byte	0x0B	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary rules file
&9	byte	34	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell code module file
&9	byte	46	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell dictionary file
&9	byte	47	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect Graphics screen driver file
&9	byte	26	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation code module file
&9	byte	23	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation data module file
&9	byte	24	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation lex module
&9	byte	27	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect installation information file
&9	byte	41	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect keyboard definition file
&9	byte	0x03	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro data file
&9	byte	0x01	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro resource file
&9	byte	25	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect printer Q codes (used by VAX/DG)
&9	byte	28	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect rectangular block file
&9	byte	14	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module rules file
&9	byte	33	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module word list
&9	byte	29	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect thesarus file
&9	byte	12	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect VAX keyboard definition file
&9	byte	0x04	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000ALL;ext=all;mime=;]Wordperfect printer resource file
&9	byte	19	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, little-endian
&8	string	ACON	

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, big-endian
&8	string	ACON	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]Macintosh Wordperfect document file
&9	byte	44	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]VAX Wordperfect document file
&9	byte	45	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DRS;ext=drs;mime=;]Wordperfect display resource file
&9	byte	20	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000FIL;ext=fil;mime=;]Wordperfect overlay file
&9	byte	21	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	string	PMCC	[fid=000001001-00-0000GRP;ext=grp;mime=;]Microsoft windows group file

# Submitted on 2004-02-14 by Carl
0	beshort	0xE310	[fid=000001007-00-000INFO;ext=info;mime=;]Amiga shortcut / icon file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000INS;ext=ins;mime=;]Wordperfect installation information file
&9	byte	43	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	lelong	0x0000004C	[fid=000001001-00-0000LNK;ext=lnk;mime=;]Microsoft Windows shortcut file
&4	string	\\x01\\x14\\x02	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000PRS;ext=prs;mime=;]Wordperfect printer resource file
&9	byte	16	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000QRS;ext=qrs;mime=;]Wordperfect 5.1 equation resource file
&9	byte	30	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000SET;ext=set;mime=;]Wordperfect setup data
&9	byte	17	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-0E-0000PAL;ext=pal,riff;mime=;]Microsoft Palette, little-endian
&8	string	PAL	

# Submitted on 2004-02-08 by Carl
0	string	RIFX	[fid=000001001-0E-0000PAL;ext=pal,rifx;mime=;]Microsoft Palette, big-endian
&8	string	PAL	

# Submitted on 2004-03-04 by Carl
0	string	DOS	[fid=000001007-0F-0000ADF;ext=adf;mime=;]AmigaOS File system
&3	byte&0xf8	0	
>3	byte&1	0	, OFS
>3	byte&1	1	, FFS

# Submitted on 2004-05-11 by Carl
0	belong	0x03F3	[fid=000001007-10-LIBRARY;ext=,library;mime=;]Amiga Classic executable file (680x0 family)

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=1	, 32-bit

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=2	, 64-bit

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Submitted on 2004-07-30 by Carl
0	string	MSFT	[fid=000001001-10-0000TLB;ext=tlb;mime=;]Microsoft component type library

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari MiNT executable/object file
&0x12	string	MiNT	

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari TOS executable/object file
&0x12	belong	0x0000	

# Magic ID for Virtual Pascal files.
# Submitted on 2004-07-30 by Carl
0	string	VPI	[fid=000000000-10-0000VPI;ext=vpi;mime=;]Virtual pascal unit file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Java compiler files.
# Submitted on 2004-05-11 by Carl
0	belong	0xCAFEBABE	[fid=000001011-11-00CLASS;ext=class;mime=;]Javal virtual machine class file
>6	beshort	x	, version %d
>4	beshort	x	.%d

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	PKG	[fid=000001005-11-0000DCP;ext=dcp;mime=;]Borland Delphi compiled package code file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	\\xDF\\x00\\x00\\x0F	[fid=000001005-11-0000DCU;ext=dcu;mime=;]Borland Delphi code unit file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPU9	[fid=000001005-11-0000TPU;ext=tpu;mime=;]Turbo Pascal 6.0 code unit file

# Magic ID for Turbo Pascal, Borland Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPUQ	[fid=000001005-11-0000TPU;ext=tpu,tpp,tpw;mime=;]Borland Pascal 7.0 code unit file

# Submitted on 2004-02-15 by Carl
2	string	ADLIB-	[fid=000001016-20-0000BNK;ext=bnk;mime=;]Adlib FM instrument bank file
>0	byte	x	, version %d
>1	byte	x	.%d

# Submitted on 2004-02-16 by Carl
0	string	IBK\\x1A	[fid=000001013-20-0000IBK;ext=ibk;mime=;]Creative Labs FM instrument bank file

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFF	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, little-endian
&8	string	IDF\\ 	

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFX	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, big-endian
&8	string	IDF\\ 	

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DIST	[fid=000100088-20-0000IST;ext=ist;mime=;]Digitrakker Instrument file
&4	byte	<2	

# Magic ID for Impulse tracker files.
# Submitted on 2004-03-04 by Carl
0	string	IMPI	[fid=000100032-20-0000ITI;ext=iti;mime=;]Impulse tracker instrument file
>0x20	string	x	[title=%.26s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MI21	[fid=000100091-20-0000MTI;ext=mti;mime=;]Madtracker instrument file

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH100\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (old instrument data)

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH110\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (instrument data)

# Submitted on 2004-02-15 by Carl
0	string	SBI\\x1A	[fid=000001013-20-0000SBI;ext=sbi;mime=;]Creative Labs FM instrument data file
>4	string	>0	[title=%.32s]

# Magic ID for Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	SIDPLAY\\ INFOFILE	[fid=000000000-20-0000SID;ext=sid;mime=;]SIDPlayer music file

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Instrument:\\ 	[fid=000100026-20-00000XI;ext=xi;mime=;]FastTracker II instrument file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, little-endian
&8	string	RMID	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, big-endian
&8	string	RMID	

# Magic ID for Abyss\'s highest experience (AHX) files.
# Submitted on 2004-02-15 by Carl
0	string	THX	[fid=000100029-21-0000AHX;ext=ahx;mime=;]AHX module music file

# Magic ID for Amusic files.
# Submitted on 2004-02-15 by Carl
1062	string	\\x3c\\x6f\\xef\\x51\\x55\\xEE\\x52\\x6F\\x52	[fid=000100034-21-0000AMD;ext=amd;mime=;]Amusic Adlib tracker music file
>0	string	>\\x00	[title=%.23s]
>24	string	>\\0	[creator=%.24s]

# Magic ID for Velvet Studio files.
# Submitted on 2004-02-15 by Carl
0	string	AMShdr\\x1a	[fid=000001276-21-0000AMS;ext=ams;mime=;]Velvet Studio module music file

# Magic ID for Audio visual research files.
# Submitted on 2004-03-04 by Carl
0	string	2BIT	[fid=000001301-21-0000AVR;ext=avr;mime=;]Audio visual research audio file
>4	string	x	[title=%.8s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.2	[fid=000100028-21-00000BP;ext=bp;mime=;]Soundmon module music file, version 2.x
>0	string	>\\0	[title=%.26s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.3	[fid=000100028-21-0000BP3;ext=bp3;mime=;]Soundmon module music file, version 3.x
>0	string	>\\0	[title=%.26s]

# Submitted on 2004-02-15 by Carl
0	string	CTMF	[fid=000001013-21-0000CMF;ext=cmf;mime=;]Creative Labs music file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Digibooster files.
# Submitted on 2004-03-04 by Carl
0	string	DIGI Booster module\\0	[fid=000001302-21-000DIGI;ext=digi;mime=;]Digibooster music file
>610	string	x	[title=%.32s]

# Magic ID for Delusion Xtracker files.
# Submitted on 2004-02-15 by Carl
0	string	DDMF	[fid=000000000-21-0000DMF;ext=dmf;mime=;]Delusion tracker module music file
>4	byte	x	, version %d.0
>13	string	>\\0	[title=%.30s]
>43	string	>\\0	[creator=%.20s]

# Magic ID for DOS Sound interface kit (DSIK) files.
# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000DSM;ext=dsm;mime=;]DOS Sound interface kit module music file
&8	string	DSMF	

# Magic ID for Edlib files.
# Submitted on 2004-03-07 by Carl
0	string	\\x00\\x06\\xFE\\xFD	[fid=000100027-21-0000EDL;ext=edl;mime=;]Edlib FM tracker music file

# Magic ID for Quadra Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000100085-21-0000EMD;ext=emd;mime=;]Enhanced module music file (IFF)
&8	string	EMOD	

# Magic ID for Farandole composer files.
# Submitted on 2004-02-15 by Carl
0	string	FAR\\xFE	[fid=000100087-21-0000FAR;ext=far;mime=;]Farandole composer module music file
>4	string	>\\0	[title=%.40s]

# Magic ID for Funktracker Gold files.
# Submitted on 2004-03-04 by Carl
0	string	Funk	[fid=000100086-21-0000FNK;ext=fnk;mime=;]Funktracker Gold music file

# Magic ID for Bells, Whistles, and Sound Boards files.
# Submitted on 2004-02-16 by Carl
0	string	GDM\\xFE	[fid=000001280-21-0000GDM;ext=gdm;mime=;]General DigiMusic module music file
>4	string	>\\x00	[title=%.32s]

# Magic ID for Graoumf Tracker 2 files.
# Submitted on 2004-02-15 by Carl
0	string	GT2	[fid=000100031-21-0000GT2;ext=gt2;mime=;]Graoumf Tracker module music file

# Magic ID for Imago Morpheus files.
# Submitted on 2004-03-04 by Carl
0x3C	string	IM10	[fid=000001279-21-0000IMF;ext=imf;mime=;]Imago morpheus music file, 32 channels
>0	string	x	[title=%.31s]

# Magic ID for Impulse tracker files.
# Submitted on 2004-02-15 by Carl
0	string	IMPM	[fid=000100032-21-00000IT;ext=it;mime=;]Impulse Tracker module music file
>4	string	>\\x00	[title=%.26s]

# Magic ID for Jamcracker files.
# Submitted on 2004-03-04 by Carl
0	string	BeEp	[fid=000000000-21-0000JAM;ext=jam;mime=;]Jamcracker tracker module music file

# Magic ID for Liquid tracker files.
# Submitted on 2004-03-04 by Carl
0	string	Liquid Module:	[fid=000100090-21-0000LIQ;ext=liq;mime=;]Liquid tracker module music file
&0x40	byte	0x1A	
>0x0E	string	>\\0	[title=%.30s]
>0x2c	string	>\\0	[creator=%.20s]

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DMDL	[fid=000100088-21-0000MDL;ext=mdl;mime=;]Digitrakker module music file
&4	byte	<0x12	

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD0	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD1	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD2	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD3	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Sound Studio module music file

# Magic ID for Musicline files.
# Submitted on 2004-03-05 by Carl
0	string	MLEDMODL	[fid=000001304-21-00000ML;ext=ml;mime=;]Musicline module music file

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M!K!	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker 2.3 module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M.K.	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file, version 3.x
&8	string	MODL	

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT4	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 4 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT8	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 8 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	6CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	8CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MT20	[fid=000100091-21-0000MT2;ext=mt2;mime=;]Madtracker module music file
>42	string	x	[title=%.64s]
>112	leshort	x	[chn=%d]

# Magic ID for Multitracker Module editor files.
# Submitted on 2004-02-15 by Carl
0	string	MTM	[fid=000100089-21-0000MTM;ext=mtm;mime=;]MultiTracker module music file
>4	string	>\\x00	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MTP2	[fid=000100091-21-0000MTP;ext=mtp;mime=;]Madtracker pattern file

# Magic ID for A/NES files.
# Submitted on 2004-03-07 by Carl
0	string	NESA	[fid=000100094-21-0000NSA;ext=nsa;mime=;]A/NES ripped audio file

# Submitted on 2004-03-07 by Carl
0	string	NESM\\x1A	[fid=000100093-21-0000NSF;ext=nsf;mime=;]NES ripped audio file
>5	byte	x	, version %d.0
>0x0E	string	x	[title=%.32s]
>0x2E	string	x	[creator=%.32s]

# Magic ID for Noisetracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M&K!	[fid=000100023-21-0000NST;ext=nst;mime=;]Noisetracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Oktalyzer tracker files.
# Submitted on 2004-02-15 by Carl
0	string	OKTASONG	[fid=000100030-21-0000OKT;ext=okt;mime=;]Oktalyzer module music file

# Magic ID for SBStudio sound files.
# Submitted on 2004-03-05 by Carl
0	string	PACG	[fid=000100020-21-0000PAC;ext=pac;mime=;]SBStudio module music file

# Magic ID for Polytracker files.
# Submitted on 2004-02-15 by Carl
44	string	PTMF	[fid=000000000-21-0000PTM;ext=ptm;mime=;]Poly Tracker module music file
>38	leshort	>0	[chn=%d]
>0	string	>\\0	[title=%.28s]

# Magic ID for Reality Adlib tracker files.
# Submitted on 2004-02-15 by Carl
0	string	RAD\\ by	[fid=000000000-21-0000RAD;ext=rad;mime=;]Reality Adlib tracker music file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, little-endian
&8	string	NIFF	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, big-endian
&8	string	NIFF	

# Magic ID for Adlib Visual Composer files.
# Submitted on 2004-02-15 by Carl
0	leshort	0x0000	[fid=000001016-21-0000ROL;ext=rol;mime=;]Adlib music file
&2	leshort	0x0004	

# Magic ID for Screamtracker 3 files.
# Submitted on 2004-02-15 by Carl
0x2C	string	SCRM	[fid=000100025-21-0000S3M;ext=s3m;mime=;]Scream tracker module music file
>0x2A	leshort	>0	, version %d.0
>0	string	>\\0	[title=%.28s]

# Magic ID for Surprise! Adlib Tracker files.
# Submitted on 2004-02-15 by Carl
0	string	SAdT	[fid=000100021-21-0000SA2;ext=sa2;mime=;]Surprise Productions Adlib tracker music file
>4	byte	x	, version 0.%d

# Magic ID for SoundFX files.
# Submitted on 2004-02-15 by Carl
60	string	SONG	[fid=000001277-21-0000SFX;ext=sfx;mime=;]SoundFX Tracker module music file

# Magic ID for PlaySID, Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	PSID	[fid=000000000-21-0000SID;ext=sid;mime=;]PlaySID music file
>16	string	x	[title=%.20s]
>36	string	x	[creator=%.20s]

# Submitted on 2004-02-15 by Carl
0	string	MThd	[fid=000001017-21-0000SMF;ext=smf,midi;mime=;]Standard MIDI music file
>10	beshort	>0	[chn=%d]

# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000001010-21-000SMUS;ext=smus,mus;mime=;]IFF Simple Musical Score file
&8	string	SMUS	

# Magic ID for Sndtool2,nezplay files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000000000-21-0000SND;ext=snd;mime=;]Nintendo Entertainment System audio file (NES)
&4	byte	3	, version %3.0
>5	byte	x	[chn=%d]

# Magic ID for iNES files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000100092-21-0000SND;ext=snd;mime=;]iNES emulator audio file
&4	byte	1	, version %1.0
>5	byte	x	[chn=%d]

# Magic ID for STMIK files.
# Submitted on 2004-02-15 by Carl
0x15	string	Scream!	[fid=000100025-21-0000STX;ext=stx;mime=;]STMIK module music file

# Magic ID for The Final Musicsystem eXtended (TFMX) files.
# Submitted on 2004-03-07 by Carl
0	string	TFMX-SONG\\ 	[fid=000100096-21-0000TFX;ext=tfx,tfmx;mime=;]TFMX tracker module music file

# Magic ID for Ultra Tracker files.
# Submitted on 2004-03-07 by Carl
0	string	MAS_UTrack_V00	[fid=000100097-21-0000ULT;ext=ult;mime=;]Ultra Tracker module music file
>15	string	x	[title=%.32s]

# Magic ID for APlayer files.
# Submitted on 2004-02-15 by Carl
0	string	APUN\\x01	[fid=000000000-21-0000UNI;ext=uni;mime=;]APlayer module music file

# Magic ID for Mikmod files.
# Submitted on 2004-02-15 by Carl
0	string	UN0	[fid=000000000-21-0000UNI;ext=uni;mime=;]Mikmod module music file
>4	byte	x	[chn=%d]

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Module:\\ 	[fid=000100026-21-00000XM;ext=xm;mime=;]FastTracker II module music file
>59	byte	x	, version %d
>58	byte	x	.0%d
>17	string	x	[title=%.20s]

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001010-22-0008SVX;ext=8svx;mime=;]Amiga Sampled audio file
&8	string	8SVX	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFC;ext=aifc,aif;mime=;]Audio Compressed Interchange File Format
&8	string	AIFC	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFF;ext=aiff,aif;mime=;]Audio Interchange File Format
&8	string	AIFF	

# Magic ID for MonkeyAudio software files.
# Submitted on 2004-05-20 by Carl
0	string	MAC\\ 	[fid=000100120-22-0000APE;ext=ape;mime=;]MonkeyAudio compressed audio file

# Submitted on 2004-02-11 by Carl
0	string	.snd	[fid=000001011-22-00000AU;ext=au,snd;mime=;]Sun / NeXt sampled audio file
>16	belong	>0	[freq=%d]

# Magic ID for Sppack files.
# Submitted on 2004-03-04 by Carl
252	beshort	0x40C3	[fid=000001019-22-000000D;ext=d;mime=;]Sppack audio sample file
&254	beshort	0xFC0E	

# Magic ID for Flac files.
# Submitted on 2004-03-08 by Carl
0	string	fLaC	[fid=000100098-22-000FLAC;ext=flac;mime=;]Free Lossless Audio Codec raw audio file

# Magic ID for Farandole Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FSM\\xFE	[fid=000100087-22-0000FSM;ext=fsm;mime=;]Farandole composer audio sample file
>4	string	x	[title=%.32s]

# Magic ID for MAUD files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-22-000MAUD;ext=maud;mime=;]MAUD audio sample file
&4	string	MAUD	

# Submitted on 2004-05-04 by Carl
0	beshort&0xFFE0	0xffe0	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file
&Z128	string	TAG	
>Z125	string	x	[title=%.30s]
>Z95	string	x	[creator=%.30s]

# Submitted on 2004-05-04 by Carl
0	string	ID3	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\001\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\002\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\0\\003\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\001\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\002\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\003\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\004\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Magic ID for Screamtracker files.
# Submitted on 2004-03-05 by Carl
0x4C	string	SCRS	[fid=000100025-22-0000SMP;ext=smp;mime=;]Screamtracker audio sample
>0x30	string	x	[title=%.30s]

# Magic ID for SoundTool files.
# Submitted on 2004-03-07 by Carl
0	string	SOUND\\x1A	[fid=000100095-22-0000SND;ext=snd;mime=;]Sound tool audio data file
>14	leshort	x	[freq=%d]

# Magic ID for SBStudio files.
# Submitted on 2004-02-11 by Carl
0	string	SND\\ 	[fid=000100020-22-0000SOU;ext=sou;mime=;]SBStudio sampled audio file

# Submitted on 2004-05-18 by Carl
0	string	Speex	[fid=000000000-22-00SPEEX;ext=speex;mime=;]Speex Lossy Audio Codec raw audio file

# Magic ID for Sound Blaster SDK files.
# Submitted on 2004-02-11 by Carl
0	string	Creative\\ Voice\\ File\\x1A	[fid=000001013-22-0000VOC;ext=voc;mime=;]Creative Voice audio file

# Submitted on 2004-05-18 by Carl
0	string	vorbis	[fid=000000000-22-0VORBIS;ext=vorbis;mime=;]Vorbis Lossy Audio Codec raw audio file

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, little-endian
&8	string	WAVE	
>24	lelong	>0	[freq=%d]

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, big-endian
&8	string	WAVE	
>24	belong	>0	[freq=%d]

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR4	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR8	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for AOL files.
# Submitted on 2004-04-02 by Carl
0	string	JG\\x04\\x0E	[fid=000001023-31-0000ART;ext=art;mime=;]AOL/Johnson-Grace image file, version 2.0
>0x0D	leshort	x	[res=%dx
>0x0F	leshort	x	%d]

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A0	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A2	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A1	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Submitted on 2004-02-14 by Carl
0	string	BM	[fid=000001001-31-0000BMP;ext=bmp;mime=;]Windows or OS/2 Bitmap image file
&6	lelong	0	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x9119	[fid=000001254-31-0000CEL;ext=cel,pic;mime=;]Autodesk animator image file
&10	byte	8	
&11	byte	0	
>2	leshort	x	[res=%d
>4	leshort	x	x%dx8bpp]

# Magic ID for Andrew User Interface System files.
# Submitted on 2004-04-02 by Carl
1	string	begindata{raster	[fid=000001315-31-0000CMU;ext=cmu;mime=;]Andrew toolkit raster image file

# Magic ID for Anivga toolkit files.
# Submitted on 2004-04-02 by Carl
38	string	KR\\x01\\x00	[fid=000100104-31-0000COD;ext=cod;mime=;]Anivga sprite image file

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	0	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	16	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	2	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	32	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	64	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	8	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Submitted on 2004-04-13 by Carl
128	string	DICM	[fid=000000004-31-000DICM;ext=dicm,dcm;mime=;]Digital imaging and communication in medecine img.

# Submitted on 2004-04-01 by Carl
0	string	SDPX	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Submitted on 2004-04-01 by Carl
0	string	XPDS	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-31-000FPBM;ext=fpbm;mime=;]Flexible Precision Buffer Map image file
&8	string	FPBM	

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	!0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%d]

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	0	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	16	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	2	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	32	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	64	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	8	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Magic ID for SunOS Icon files.
# Submitted on 2004-04-02 by Carl
0	string	/*\\ Format_version=1,\\ 	[fid=000001011-31-000ICON;ext=icon;mime=;]SunOS icon image file

# Submitted on 2004-03-31 by Carl
0	beshort	0x01	[fid=000001273-31-0000IMG;ext=img;mime=;]GEM Bit Image
&2	beshort	0x08	
>12	beshort	>0	[res=%dx
>14	beshort	>0	%d
>4	beshort	>0	x%dbpp]

# Submitted on 2004-04-02 by Carl
0	string	\\x8bJNG\\x0d\\x0a\\x1a\\x0a	[fid=000000000-31-0000JNG;ext=jng;mime=;]JPEG Network graphics image file
&12	string	JHDR	
>16	belong	x	[res=%d
>20	belong	x	x%d]

# Submitted on 2004-04-13 by Carl
0	string	\\x00\\x00\\x00\\x0cjP\\x20\\x20	[fid=000000001-31-0015444;ext=jp2;mime=image/jp2;]JPEG 2000 image file

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\x4f\\xff\\x51	[fid=000000001-31-0015444;ext=jpc;mime=;]JPEG 2000 code stream image file
&Z2	beshort	0xFFD9	
>8	belong	x	[res=%dx
>12	belong	x	%d]

# Submitted on 2004-03-31 by Carl
0	belong	0xffd8ffe0	[fid=000001305-31-000JPEG;ext=jpeg,jpg;mime=image/jpeg;]Joint Photographic Experts Group JFIF image file
&6	string	JFIF\\x00	
>11	byte	x	, version %d
>12	byte	x	.0%d

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\xd8\\xff\\xe1	[fid=000000005-31-000JPEG;ext=jpg,jpeg;mime=image/jpeg;]Digital still camera image file
&6	string	Exif	

# Magic ID for Deluxe Paint files.
# Submitted on 2004-03-31 by Carl
0	string	FORM	[fid=000001010-31-0000LBM;ext=lbm;mime=;]Interleaved bitmap image file
&8	string	ILBM	

# Submitted on 2004-04-13 by Carl
0	string	This\\ is\\ a\\ BitMap\\ file	[fid=000000000-31-000LISP;ext=lisp;mime=;]Lisp machine format image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDA	[fid=000001316-31-0000MDA;ext=mda;mime=;]Microdesign Area image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDP	[fid=000001316-31-0000MDP;ext=mdp;mime=;]Microdesign page image file

# Magic ID for Imagemagick files.
# Submitted on 2004-04-01 by Carl
0	string	id=ImageMagick	[fid=000100101-31-000MIFF;ext=miff,mif;mime=;]Imagemagick image file

# Magic ID for Netpbm files.
# Submitted on 2004-04-02 by Carl
0	string	MRF1	[fid=000100105-31-0000MRF;ext=mrf;mime=;]Monochrome recursive format image file
>4	belong	x	[res=%dx
>8	belong	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x6144	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 1.0
&2	leshort	0x4d6e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x694c	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 2.0
&2	leshort	0x536e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P7\\x0A	[fid=000100100-31-0000PAM;ext=pam;mime=;]Portable arbitrary map image file

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P1	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P4	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, binary

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A00	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.5
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A02	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A03	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A04	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush for windows image file
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A05	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 3.0
&2	byte	1	

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P2	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P5	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, binary

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x02	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x08	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x31	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for Softimage 3D files.
# Submitted on 2004-04-08 by Carl
0	belong	0x5380f634	[fid=000001321-31-0000PIC;ext=pic;mime=;]Softimage 3D image file
&88	string	PICT	
>8	string	>\\x00	[title=%.80s]
>92	beshort	x	[res=%d
>94	beshort	x	x%d]

# Magic ID for Bio-rad microscope files.
# Submitted on 2004-04-08 by Carl
54	leshort	12345	[fid=000001322-31-0000PIC;ext=pic;mime=;]Bio-rad confocal microscope image file
&16	leshort	0	
>0	leshort	>0	[res=%d
>2	leshort	>0	x%d]

# Submitted on 2004-02-06 by Carl
0	string	\\x89PNG\\x0d\\x0a\\x1a\\x0a	[fid=000000001-31-0015948;ext=png;mime=image/png;]Portable Network Graphic file
&12	string	IHDR	
>16	belong	>0	[res=%d
>20	belong	>0	x%d
>24	byte	x	x%dbpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P3	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P6	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, binary

# Magic ID for Photoshop files.
# Submitted on 2004-04-01 by Carl
0	string	8BPS\\x00\\x01	[fid=000001003-31-0000PSD;ext=psd;mime=;]Adobe Photoshop image file
>18	belong	>0	[res=%dx
>14	belong	>0	%d]

# Magic ID for Paint shop pro files.
# Submitted on 2004-04-01 by Carl
0	string	Paint Shop Pro Image File\\x0a\\x1a	[fid=000001310-31-0000PSP;ext=psp;mime=;]Paintshop pro image file
>50	lelong	>0	[res=%dx
>54	lelong	>0	%d
>69	leshort	>0	x%dbpp]

# Submitted on 2004-02-08 by Carl
0	belong	0x59a66a95	[fid=000001011-31-0000RAS;ext=ras;mime=;]Sun raster image
>4	belong	>0	[res=%dx
>8	belong	>0	%d
>12	belong	>0	x%dbpp]

# Submitted on 2004-03-31 by Carl
0	string	\\0x01\\xDA	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
>24	string	>\\x00	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGB8;ext=rgb8,rgb;mime=;]Turbo Silver 24-bit RGB image file
&8	string	RGB8	

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGBN;ext=rgbn,rgb;mime=;]Turbo Silver 12-bit RGB image file
&8	string	RGBN	

# Magic ID for ColoRIX VGA Paint files.
# Submitted on 2004-04-08 by Carl
0	string	RIX3	[fid=000001320-31-0000SCZ;ext=scz;mime=;]ColorRIX VGA Paint image file
>4	leshort	x	[res=%d
>6	leshort	x	x%d]

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 11
&4	string	\\013	

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 17
&4	string	\\021	

# Submitted on 2004-04-01 by Carl
Z18	string	TRUEVISION-XFILE	[fid=000001306-31-0000TGA;ext=tga;mime=;]Truevision Targa image file
>12	leshort	x	[res=%dx
>14	leshort	x	%d
>16	byte	x	x%dbpp]

# Magic ID for Graphics Workshop files.
# Submitted on 2004-04-01 by Carl
0	string	THNL	[fid=000001258-31-0000THN;ext=thn;mime=;]Graphics workshop thumbnail image file

# Submitted on 2004-03-31 by Carl
0	string	II	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, little-endian
&2	leshort	42	

# Submitted on 2004-03-31 by Carl
0	string	MM	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, big-endian
&2	leshort		

# Magic ID for VICAR files.
# Submitted on 2004-04-01 by Carl
0	string	LBLSIZE=	[fid=000001022-31-0000VIC;ext=vic,vicar;mime=;]Vicar image file

# Magic ID for Khoros files.
# Submitted on 2004-04-01 by Carl
0	string	\\xAB\\x01\\x01\\x03	[fid=000001308-31-0000VIF;ext=vif,viff;mime=;]Khoros Visualization/Image File Format, version 1.3
&4	byte	2	
>520	belong	>0	[res=%dx
>524	belong	>0	%d]

# Submitted on 2004-04-02 by Carl
0	string	FIASCO	[fid=000100107-31-0000WFA;ext=wfa;mime=;]Fractal Image And Sequence Codec image file

# Magic ID for X-Windows files.
# Submitted on 2004-04-01 by Carl
0	string	/* XPM */	[fid=000001020-31-0000XPM;ext=xpm;mime=;]X-Windows pixel map image file

# Magic ID for XV files.
# Submitted on 2004-04-01 by Carl
0	string	P7\\ 332	[fid=000100103-31-00000XV;ext=xv;mime=;]XV Thumbnail image file

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	belong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	belong	0x06	
>24	belong	x	[res=%d
>28	belong	x	x%d]

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	lelong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	lelong	0x06	
>24	lelong	x	[res=%d
>28	lelong	x	x%d]

# Magic ID for Provector files.
# Submitted on 2004-04-08 by Carl
0	string	FORM	[fid=000001319-32-000DR2D;ext=dr2d;mime=;]Provector 2D image file
&8	string	DR2D	

# Magic ID for XFig, WinFig, jFig files.
# Submitted on 2004-02-08 by Carl
0	string	#FIG	[fid=000100011-32-0000FIG;ext=fig;mime=;]Facility for Interactive Generation file
>5	string	x	, version %.1s.
>7	string	x	%.1s

# Magic ID for Lotus 1-2-3 files.
# Submitted on 2004-04-02 by Carl
0	string	\\x01\\x00\\x00\\x00\\x01\\x00\\x08\\x00\\x44	[fid=000001009-32-0000PIC;ext=pic;mime=;]Lotus 1-2-3 image file

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Slide	[fid=000001254-32-0000SLD;ext=sld;mime=;]Autocad slide image file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xffWPC	[fid=000001008-32-0000WPG;ext=wpg;mime=;]Wordperfect Graphics vectors
&8	byte	1	
&9	byte	0x16	
>10	byte	x	, version %d.
>11	byte	x	%d

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000100019-33-000AMFF;ext=amff;mime=;]Amiga metafile
&8	string	AMFF	

# Submitted on 2004-02-11 by Carl
0	lelong	0x9AC6CDD7	[fid=000001003-33-0000APM;ext=apm;mime=;]Aldus placeable Windows metafile
&4	leshort	0	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  little-endian metafile
&8	string	CDR	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  big-endian metafile
&8	string	CDR	

# Submitted on 2004-04-08 by Carl
0	beshort&0xFF20	0x0020	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, binary encoded
&Z0x02	beshort&0xFF40	0x0040	

# Submitted on 2004-04-08 by Carl
0	string	BEGMF	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, ascii encoded

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel little-endian metafile
&8	string	CMX1	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel big-endian metafile
&8	string	CMX1	

# Submitted on 2004-02-11 by Carl
0	lelong	0x00000001	[fid=000001001-33-0000EMF;ext=emf;mime=;]Microsoft Windows Enhanced metafile
&40	lelong	0x464D4520	

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-1.2	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 1.2

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-2.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 2.0

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-3.0\\ EPSF-3.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 3, version 3.0

# Submitted on 2004-02-11 by Carl
0	string	\\xC5\\xD0\\xD3\\xC6	[fid=000001003-33-000EPSF;ext=epsf,ai;mime=application/postscript;]Adobe Encapsulated Postscript, version 3.0, binary

# Magic ID for GEM Paint files.
# Submitted on 2004-03-31 by Carl
0	beshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Motorola Metafile, version 1.01
&4	beshort	101	

# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Metafile
&4	leshort	0	

# Magic ID for Artline files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 4.00
&4	leshort	400	

# Magic ID for Deskpress files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 3.10
&4	leshort	310	

# Magic ID for GEM Paint files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 1.01
&4	leshort	101	

# Magic ID for Quickdraw files.
# Submitted on 2004-04-01 by Carl
0x20A	belong	0x001102FF	[fid=000001002-33-0000PCT;ext=pct;mime=;]Macintosh Quickdraw metafile \'PICT\', version 2.0

# Submitted on 2004-02-11 by Carl
0	leshort	0x0001	[fid=000001001-33-0000WMF;ext=wmf;mime=;]Microsoft Windows metafile
&2	leshort	9	

# Magic ID for Cinema 4D Version 5.x files.
# Submitted on 2004-02-06 by Carl
0	string	MC50	[fid=000001255-40-0000000;ext=;mime=;]Maxon Cinema 4D version 5 3D data

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-02-06 by Carl
0	string	3DMF	[fid=000001002-40-0003DMF;ext=3dmf;mime=;]Apple Quickdraw 3D metafile

# Magic ID for Rhino 3d files.
# Submitted on 2004-04-12 by Carl
0	string	3D Geometry File Format	[fid=000001330-40-0003DMF;ext=3dmf;mime=;]Rhino3d / OpenNurbs 3d model

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-04-11 by Carl
0	string	3DMetafile	[fid=000001002-40-0003DMF;ext=3dmf,a3d;mime=;]Apple Quickdraw 3D metafile

# Magic ID for AC3d files.
# Submitted on 2004-04-12 by Carl
0	string	AC3D	[fid=000000000-40-00000AC;ext=ac;mime=;]Ac3d 3d model

# Magic ID for 3dStudio Max files.
# Submitted on 2004-04-12 by Carl
0	string	*3DSMAX_ASCIIEXPORT	[fid=000001326-40-0000ASE;ext=ase;mime=;]3d studio max ascii export 3D model

# Magic ID for Caligari Truespace Modeler files.
# Submitted on 2004-02-06 by Carl
0	string	Caligari\\ V	[fid=000001256-40-0000COB;ext=cob,scn;mime=;]Caligari Truespace2 3D model

# Magic ID for Tachyon parallel raytracer files.
# Submitted on 2004-04-12 by Carl
0	string	BEGIN_SCENE	[fid=000100116-40-0000DAT;ext=dat;mime=;]Tachyon ray-tracer 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AC10	[fid=000001254-40-0000DWG;ext=dwg;mime=image/vnd.dwg;]Autocad drawing format 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Binary DXF	[fid=000001254-40-0000DXF;ext=dxf;mime=image/vnd.dxf;]Autocad drawing interchange 3d model, binary

# Magic ID for Multigen creator files.
# Submitted on 2004-04-12 by Carl
0	beshort	1	[fid=000001332-40-0000FLT;ext=flt;mime=;]Openflight scene description 3d model
&4	string	db	

# Magic ID for Videoscape 3D files.
# Submitted on 2004-04-12 by Carl
0	string	GOUR	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored vertices

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG1	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored faces

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG2	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model light source

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG3	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with gouraud curves

# Magic ID for Softimage 4D Creative environment files.
# Submitted on 2004-04-12 by Carl
0	string	HRCH:	[fid=000001321-40-0000HRC;ext=hrc;mime=;]Softimage 4d model, ascii encoded

# Magic ID for Open Inventor Toolkit files.
# Submitted on 2004-02-06 by Carl
0	string	#Inventor	[fid=000001004-40-00000IV;ext=iv;mime=;]Open Inventor 3d model
>11	string	x	, version %.1s.
>13	string	x	%.1s
>15	string	binary	, binary encoded
>15	string	ascii	, ascii encoded

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	LIST	[fid=000100118-40-000LIST;ext=list;mime=;]Geomview list of 3D models and objects

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwo,lwob;mime=;]Lightwave 3D object
&8	string	LWO2	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwob,lwo;mime=;]Lightwave 3D object
&8	string	LWOB	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	LWSC	[fid=000001251-40-0000LWS;ext=lwsc,lws;mime=;]Lightwave 3D scene

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	//Maya	[fid=000001312-40-00000MA;ext=ma;mime=;]Maya 3d model, ascii encoded

# Magic ID for Cinema 4D Version 4.x and earlier files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001255-40-000MC4D;ext=mc4d;mime=;]Maxon Cinema 4D v4.x 3D data
&8	string	MC4D	

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	CMESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	MESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Milshape 3d files.
# Submitted on 2004-04-12 by Carl
0	string	MS3D000000	[fid=000100117-40-000MS3D;ext=ms3d;mime=;]Milkshape 3d model, binary encoded

# Magic ID for Worldtoolkit files.
# Submitted on 2004-02-06 by Carl
0	string	nff	[fid=000001253-40-0000NFF;ext=nff;mime=;]Sense8 Worldtoolkit 3D object

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	0	
&7	byte	0x99	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	1	
&7	byte	0x99	

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Do	[fid=000001334-40-0000Q3O;ext=q3o;mime=;]Quick3d 3D object

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Ds	[fid=000001334-40-0000Q3S;ext=q3s;mime=;]Quick3d 3D scene

# Magic ID for Renderman files.
# Submitted on 2004-04-12 by Carl
0	string	##RenderMan\\ RIB-Structure	[fid=000001323-40-0000RIB;ext=rib;mime=;]Renderman bytestream 3D model

# Magic ID for Sculpt 3d files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000000000-40-00SCENE;ext=scene;mime=;]Sculpt 3d scene model
&8	string	SC3D	

# Magic ID for Imagine 3D Studio, Turbo Silver files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001252-40-000TDDD;ext=tddd,obj;mime=;]Imagine 3D object
&8	string	TDDD	

# Magic ID for Macromedia Director files.
# Submitted on 2004-04-12 by Carl
0	string	IFX	[fid=000001259-40-0000W3D;ext=w3d;mime=;]Shockwave 3D model

# Submitted on 2004-02-06 by Carl
0	string	#VRML	[fid=000000001-40-0014772;ext=wrl;mime=model/vrml;]Virtual Reality modeling language
>7	string	x	, version %.1s.
>9	string	x	%.1s

# Submitted on 2004-04-12 by Carl
0	string	<WORLD>	[fid=000000000-40-0000XGL;ext=xgl;mime=;]XGL 3d model

# Magic ID for Direct3D files.
# Submitted on 2004-04-11 by Carl
0	string	xof\\ 	[fid=000001001-40-0000XIE;ext=xie;mime=;]Microsoft direct3d 3D model

# Magic ID for Softimage XSI files.
# Submitted on 2004-04-12 by Carl
0	string	xsi\\ 	[fid=000001321-40-0000XSI;ext=xsi;mime=;]Softimage 3d model

# Magic ID for Kaboom files.
# Submitted on 2004-02-08 by Carl
0	string	\\xA8MP\\xA8	[fid=000000000-50-0000000;ext=;mime=;]Kboom archive file

# Magic ID for CTW files.
# Submitted on 2004-03-04 by Carl
0	leshort	12	[fid=000100077-50-0000000;ext=;mime=;]Context tree weighing (CTW) archive file
&2	leshort	0	

# Magic ID for Microsoft Compress files.
# Submitted on 2004-03-04 by Carl
0	string	SZDD\\x88\\xF0\\x27\\x33	[fid=000001001-50-0000000;ext=;mime=;]Microsoft LZSS compressed file

# Magic ID for AAX files.
# Submitted on 2004-02-18 by Carl
0	string	\\x40\\xFE\\x00\\x00	[fid=000001281-50-0000AAX;ext=aax;mime=;]AAX archive file

# Magic ID for ABComp files.
# Submitted on 2004-02-18 by Carl
0	string	\\x03AB2	[fid=000001282-50-0000ABP;ext=abp;mime=;]ABComp archive file

# Magic ID for Ace / WinAce files.
# Submitted on 2004-02-08 by Carl
7	string	**ACE**	[fid=000001265-50-0000ACE;ext=ace;mime=;]Ace / WinACE archive file

# Magic ID for Ai Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	Ai	[fid=000000000-50-00000AI;ext=ai;mime=;]Ai archive file

# Magic ID for Akt archiver files.
# Submitted on 2004-02-18 by Carl
0	string	AKT\\x0A	[fid=000000000-50-0000AKT;ext=akt;mime=;]AKT archive file

# Magic ID for AMG Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	\\xAD\\x36	[fid=000001284-50-0000AMG;ext=amg;mime=;]AMG archive file
>2	byte	x	, version %bh.
>2	byte	x	%bl
&3	byte	0	

# Magic ID for ar files.
# Submitted on 2004-03-04 by Carl
0	string	\\x21<arch>\\x0A	[fid=000000003-50-00000AR;ext=ar;mime=;]UNIX archive file (ar)

# Magic ID for AR7 files.
# Submitted on 2004-02-18 by Carl
0	string	,AR7 e-mailable archive:	[fid=000100036-50-0000AR7;ext=ar7;mime=;]AR7 archive file

# Magic ID for Squash files.
# Submitted on 2004-02-18 by Carl
3	string	OctSqu	[fid=000100038-50-0000ARH;ext=arh;mime=;]Squash archive file

# Magic ID for Arj files.
# Submitted on 2004-02-18 by Carl
0	string	\\x60\\xEA	[fid=000001285-50-0000ARJ;ext=arj;mime=;]ARJ archive file
&10	byte	2	

# Magic ID for ASD files.
# Submitted on 2004-02-18 by Carl
0	string	ASD01\\x1A	[fid=000001287-50-0000ASD;ext=asd;mime=;]ASD archive file

# Magic ID for Boa constrictor files.
# Submitted on 2004-02-18 by Carl
0	string	BOA\\x00	[fid=000100040-50-0000B58;ext=b58;mime=;]BOA constrictor archive file

# Magic ID for BWC files.
# Submitted on 2004-02-18 by Carl
0	string	BWC	[fid=000100042-50-00000BC;ext=bc;mime=;]BWC archive file

# Magic ID for Bix files.
# Submitted on 2004-02-18 by Carl
0	string	BIX0	[fid=000100037-50-0000BIX;ext=bix;mime=;]BIX archive file

# Magic ID for Btoa files.
# Submitted on 2004-02-18 by Carl
0	string	xbtoa5	[fid=000100043-50-0000BOO;ext=boo;mime=;]Btoa encoded file

# Magic ID for Bsa files.
# Submitted on 2004-02-18 by Carl
0	string	\\xFFBSG\\x00\\x00\\xFFBSA	[fid=000001289-50-0000BSN;ext=bsn;mime=;]Bsa archive file

# Magic ID for BTPC files.
# Submitted on 2004-03-03 by Carl
0	string	btpc\\ 	[fid=000100074-50-000BTPC;ext=btpc;mime=;]BTPC compressed image file

# Magic ID for BTS files.
# Submitted on 2004-02-18 by Carl
0	string	\\x1A\\x03Descript	[fid=000100044-50-0000BTS;ext=bts;mime=;]BTSpk archive file
&0x521	string	BTSPK!	

# Magic ID for Bzip files.
# Submitted on 2004-02-18 by Carl
0	string	BZ0	[fid=000100008-50-00000BZ;ext=bz;mime=;]Bzip archive file

# Magic ID for Bzip2 files.
# Submitted on 2004-02-08 by Carl
0	string	BZh	[fid=000100008-50-0000BZ2;ext=bz2;mime=;]Bzip2 archive file

# Submitted on 2004-02-08 by Carl
0	string	MSCF	[fid=000001001-50-0000CAB;ext=cab;mime=;]Microsoft Cabinet file
>25	byte	x	, version %d.
>24	byte	x	%d

# Magic ID for Crush files.
# Submitted on 2004-02-23 by Carl
0	string	CRUSH\\ v1.8	[fid=000001290-50-0000CRU;ext=cru;mime=;]Crush archive file

# Magic ID for Ctxf files.
# Submitted on 2004-02-23 by Carl
0	string	CXF\\x1A	[fid=000100045-50-0000CXF;ext=cxf;mime=;]Ctx archive file

# Magic ID for DAXWav files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-50-0000DAX;ext=dax;mime=;]DAX audio archive file
&8	string	daxA	

# Magic ID for Diskmasher files.
# Submitted on 2004-02-23 by Carl
0	string	DMS!	[fid=000000000-50-0000DMS;ext=dms;mime=;]Diskmasher archive file

# Magic ID for Dpae files.
# Submitted on 2004-02-23 by Carl
0	string	Dirk\\ Paehl(c)	[fid=000100046-50-0000DPA;ext=dpa;mime=;]Dpae archive file

# Magic ID for Disintegrator files.
# Submitted on 2004-02-23 by Carl
0	string	DSTb	[fid=000100047-50-0000DST;ext=dst;mime=;]Disintegrator archive file

# Magic ID for Enhanced compressor (ENC) files.
# Submitted on 2004-02-23 by Carl
0	string	Ench	[fid=000100051-50-0000ENC;ext=enc;mime=;]Enhanced compressor archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0	string	ESP>	[fid=000100002-50-0000ESP;ext=esp;mime=;]ESP archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0x53f	string	ESP	[fid=000100002-50-0000EXE;ext=exe;mime=;]ESP Self-extracting archivew (MS-DOS)

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9E	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 1.0

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9F	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 2.0

# Magic ID for Qlfc files.
# Submitted on 2004-02-23 by Carl
0	string	\\x47\\x68\\x69\\x64\\x6f	[fid=000100055-50-00000GQ;ext=gq;mime=;]Qlfc archive file

# Magic ID for Gzip files.
# Submitted on 2004-02-08 by Carl
0	string	\\x1F\\x8B	[fid=000000002-50-0001952;ext=gz;mime=;]Gzip archive file

# Magic ID for Ha files.
# Submitted on 2004-02-10 by Carl
0	string	HA	[fid=000100013-50-00000HA;ext=ha;mime=;]HA archive file

# Magic ID for HAP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x913HF	[fid=000001291-50-0000HAP;ext=hap;mime=;]HAP archive file

# Magic ID for Hpack files.
# Submitted on 2004-02-11 by Carl
0	string	HPAK	[fid=000100016-50-0000HPK;ext=hpk;mime=;]Hpack archive file
&Z4	string	HPAK	

# Submitted on 2004-02-10 by Carl
11	string	must\\ be\\ converted\\ with\\ BinHex	[fid=000001002-50-0000HQX;ext=hqx;mime=;]BinHex archive

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AHP\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AST\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for Winimp files.
# Submitted on 2004-02-08 by Carl
0	lelong	0xA504D49	[fid=000001270-50-0000IMP;ext=imp;mime=;]Winimp archive file

# Magic ID for JRchive files.
# Submitted on 2004-02-08 by Carl
0	string	JRchive	[fid=000001263-50-0000JRC;ext=jrc;mime=;]JRchive archive file

# Magic ID for Archive Handler files.
# Submitted on 2004-02-08 by Carl
0	string	LG	[fid=000100001-50-00000LG;ext=lg;mime=;]Arhangel archive file

# Magic ID for Limit files.
# Submitted on 2004-02-08 by Carl
0	string	LM\\x1A	[fid=000100003-50-0000LIM;ext=lim;mime=;]Limit archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz4-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz5-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lzs-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh\\ -	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh0-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh1-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh2-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh3-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh4-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh5-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh6-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh7-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lhd-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lzo files.
# Submitted on 2004-02-11 by Carl
0	string	\\x89\\x4c\\x5a\\x4f\\x00\\x0d\\x0a\\x1a\\x0a	[fid=000100018-50-0000LZO;ext=lzo;mime=;]LZOP archive file

# Magic ID for Lzx files.
# Submitted on 2004-02-23 by Carl
0	string	LZX	[fid=000100058-50-0000LZX;ext=lzx;mime=;]LZX archive file

# Magic ID for Mdcd (Mike Davenport compressor) files.
# Submitted on 2004-02-08 by Carl
0	string	MDmd	[fid=000100004-50-00000MD;ext=md;mime=;]Mike Davenport archive file
>4	byte	x	, version %d
&5	byte	1	

# Magic ID for Nashrink files.
# Submitted on 2004-02-23 by Carl
0	string	NSK	[fid=000001292-50-0000NSK;ext=nsk;mime=;]NaShrink archive file

# Magic ID for Semone archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SEMh	[fid=000100068-50-0000ONE;ext=one;mime=;]Semone archive file

# Magic ID for Lpac files.
# Submitted on 2004-03-04 by Carl
0	string	LPAC	[fid=000100084-50-0000PAC;ext=pac;mime=;]LPAC audio archive file

# Magic ID for CrossePAC files.
# Submitted on 2004-02-08 by Carl
0	string	DSIGDCC	[fid=000001262-50-0000PAC;ext=pac;mime=;]CrossePAC archive file

# Magic ID for High Compression Markov Predictive Coder files.
# Submitted on 2004-02-23 by Carl
0	string	PPZ2	[fid=000100061-50-0000PMZ;ext=pmz;mime=;]PPMZ2 archive file

# Magic ID for Powerpacker files.
# Submitted on 2004-02-27 by Carl
0	string	PP20	[fid=000100062-50-00000PP;ext=pp;mime=;]Powerpacker archive file

# Magic ID for PAQ1 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ1\\x0D\\x0A	[fid=000100064-50-0000PQ1;ext=pq1;mime=;]PAQ1 archive file

# Magic ID for PAQ3 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ3\\x0D\\x0A	[fid=000100064-50-0000PQ3;ext=pq3;mime=;]PAQ3 archive file

# Magic ID for PAQ6 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ6	[fid=000100064-50-0000PQ6;ext=pq6;mime=;]PAQ6 archive file

# Magic ID for Pretty simple archiver files.
# Submitted on 2004-02-27 by Carl
0	string	PSA\\x01\\x03	[fid=000100065-50-0000PSA;ext=psa;mime=;]Pretty simple archiver archive file

# Magic ID for Quantum compressor files.
# Submitted on 2004-02-27 by Carl
0	string	DS	[fid=000001294-50-000000Q;ext=q;mime=;]Quantum archive file
&2	byte	<2	
>2	byte	x	, version %d
>3	byte	x	.%d

# Magic ID for Rar files.
# Submitted on 2004-02-08 by Carl
0	string	\\x52\\x61\\x72\\x21\\x1a\\x07\\x00	[fid=000001267-50-0000RAR;ext=rar;mime=;]RAR archive file

# Magic ID for Romanian archiver eXpert (RAX) files.
# Submitted on 2004-02-27 by Carl
0	string	ULEB	[fid=000001295-50-0000RAX;ext=rax;mime=;]RAX archive file

# Magic ID for Reduq files.
# Submitted on 2004-02-27 by Carl
0	string	rdqx	[fid=000100066-50-0000RDQ;ext=rdq;mime=;]Reduq archive file

# Magic ID for RPM files.
# Submitted on 2004-03-04 by Carl
0	string	\\xed\\xab\\xee\\xdb	[fid=000000000-50-0000RPM;ext=rpm;mime=;]RPM archive
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for rzip files.
# Submitted on 2004-03-04 by Carl
0	string	RZIP	[fid=000100076-50-00000RZ;ext=rz;mime=;]Rzip archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH0	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH4	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH5	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for SBX Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SB1\\x00	[fid=000001297-50-00000SB;ext=sb;mime=;]SBX archive file

# Magic ID for SBC Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SBC\\x1E	[fid=000100067-50-0000SBC;ext=sbc;mime=;]SBC archive file

# Submitted on 2004-02-10 by Carl
10	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Submitted on 2004-02-10 by Carl
11	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xd8	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xe9\\x6c\\xe5	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Stuffit files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt\\ 	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file

# Magic ID for Stuffit files.
# Submitted on 2004-02-11 by Carl
0	string	SIT!	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file
&10	string	rLau	
>14	byte	x	, version %d.0

# Magic ID for Stuffit Extended files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt!	[fid=000001272-50-000SITX;ext=sitx;mime=;]Stuffit extended archive file

# Magic ID for Sof files.
# Submitted on 2004-03-04 by Carl
0	string	PK\\x03\\x06	[fid=000000000-50-0000SOF;ext=sof;mime=;]SOF archive file

# Magic ID for Splint files.
# Submitted on 2004-02-08 by Carl
0	string	\\x93\\xB9\\x06	[fid=000100006-50-0000SPL;ext=spl;mime=;]Splint archive file

# Magic ID for Sqweez files.
# Submitted on 2004-02-10 by Carl
0	string	SQWEZ\\ 	[fid=000100014-50-0000SQZ;ext=sqz;mime=;]Sqwez archive file

# Magic ID for Sqz files.
# Submitted on 2004-02-10 by Carl
0	string	HLSQZ	[fid=000100015-50-0000SQZ;ext=sqz;mime=;]Squeeze archive file
>5	string	x	, version %.1s.0

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S401	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S401	, version 4.01

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S403	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S403	, version 4.03

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S404	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S404	, version 4.04

# Magic ID for Szip files.
# Submitted on 2004-02-08 by Carl
0	string	SZ\\x0A\\x04	[fid=000100009-50-00000SZ;ext=sz;mime=;]SZIP archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\040\\040\\0	[fid=000000000-50-0000TAR;ext=tar;mime=;]GNU tar archive

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\0\\x06	[fid=000000003-50-0001003;ext=tar;mime=;]Opengroup/POSIX tar archive

# Magic ID for uc2 files.
# Submitted on 2004-02-10 by Carl
0	string	UC2\\x1a	[fid=000001271-50-0000UC2;ext=uc2;mime=;]Ultra Compressor archive file

# Magic ID for Uharc files.
# Submitted on 2004-03-04 by Carl
0	string	UHA	[fid=000100083-50-0000UHA;ext=uha;mime=;]UHArc archive file

# Magic ID for YBS archiver files.
# Submitted on 2004-02-27 by Carl
0	string	YBS3	[fid=000100071-50-0000YBS;ext=ybs;mime=;]YBS archive file

# Submitted on 2004-02-11 by Carl
0	string	\\037\\235	[fid=000000000-50-000000Z;ext=z;mime=;]UNIX archive file

# Magic ID for Pkunzip, Info-zip Unzip files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x04034b50	[fid=000001266-50-0000ZIP;ext=zip;mime=application/zip;]Pkzip archive file

# Magic ID for zoo files.
# Submitted on 2004-02-10 by Carl
0	string	ZOO	[fid=000100012-50-0000ZOO;ext=zoo;mime=;]Zoo archive file
&0x14	lelong	0x0FDC4A7DC	
>32	byte	x	, version %d
>33	byte	x	.%d

# Magic ID for Zzip files.
# Submitted on 2004-02-08 by Carl
0	string	ZZ	[fid=000100007-50-00000ZZ;ext=zz;mime=;]ZZip archive file
>2	byte	x	, version %d.0

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	[ESP]\\xB5\\x78	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	PULP\\x83	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for Lzexe files.
# Submitted on 2004-02-23 by Carl
0x1C	string	LZ91	[fid=000100053-51-0000EXE;ext=exe;mime=;]Lzexe compressed executable file (MS-DOS)

# Magic ID for HTML Help Workshop files.
# Submitted on 2004-02-08 by Carl
0	string	ITSF	[fid=000001001-60-0000CHM;ext=chm;mime=;]Microsoft compiled hypertext document

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
2	string	DELPHI.DIAGRAM.PORTFOLIO	[fid=000001005-60-0000DDP;ext=ddp;mime=;]Delphi Diagram Portfolio file

# Magic ID for Pagestream files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001268-60-0000DOC;ext=doc;mime=;]Pagestream document
&8	string	DOC\\ 	

# Submitted on 2004-02-08 by Carl
0	string	CAT\\ 	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	LIST	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	@database	[fid=000001007-60-00GUIDE;ext=guide;mime=;]AmigaGuide hypertext document

# Submitted on 2004-02-14 by Carl
0	lelong	0x00035F3F	[fid=000001001-60-0000HLP;ext=hlp;mime=;]Microsoft Windows Help file

# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0015445;ext=html,htm;mime=text/html;]HyperText Markup Language document (HTML)
&10	string/c	html	

# Submitted on 2004-02-08 by Carl
0	string	HDOC	[fid=000001006-60-0000HYP;ext=hyp;mime=;]Atari ST-Guide hypertext document

# Magic ID for OS/2 files.
# Submitted on 2004-02-08 by Carl
0	string	HSP	[fid=000001009-60-0000INF;ext=inf;mime=;]OS/2 Guide hypertext document

# Submitted on 2004-02-08 by Carl
0	string	This\\ is\\ Info\\ file	[fid=000100010-60-000INFO;ext=info;mime=;]GNU Info hypertext document

# Magic ID for Adobe Acrobat files.
# Submitted on 2004-10-08 by Carl
0	string	%PDF-	[fid=000000001-60-0015930;ext=pdf;mime=application/pdf;]Portable document format document file (PDF)
>5	string	x	, version %.1s
>7	string	x	.%.1s

# Magic ID for Microsoft Wordpad files.
# Submitted on 2004-02-08 by Carl
0	string	{\\\\rtf	[fid=000001001-60-0000RTF;ext=rtf;mime=text/rtf;]Rich Text Format document
>5	string	x	, version %.1s.x

# Magic ID for DocBook files.
# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0008879;ext=sgml,sgm;mime=text/sgml;]Standard general markup language document (SGML)

# Magic ID for Turbo C files.
# Submitted on 2004-02-14 by Carl
0	string	TURBO\\ C\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TCH;ext=tch;mime=;]Turbo C help file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-02-08 by Carl
0	string	TURBO\\ PASCAL\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TPH;ext=tph;mime=;]Borland Pascal help file

# Magic ID for Turbo Vision files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x46484246	[fid=000001005-60-0000TVH;ext=tvh;mime=;]Borland Turbo Vision help file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xFFWPC	[fid=000001008-60-0000WPD;ext=wpd,doc;mime=application/vnd.wordperfect;]Wordperfect document
&9	byte	0x0A	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137061	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137062	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	string	STARTFONT\\ 	[fid=000001003-70-0000BDF;ext=bdf;mime=;]Adobe glyph bitmap distribution format font file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	CF\\x01\\x00	[fid=000001010-70-000000C;ext=c;mime=;]Deluxe paint multi-colour font file

# Magic ID for Figlet files.
# Submitted on 2004-09-01 by Carl
0	string	flf2	[fid=000100122-70-0000FLF;ext=flf;mime=;]Figlet font file

# Magic ID for PCL 5 files.
# Submitted on 2004-09-01 by Carl
0	string	\\x00\\x44\\x00\\x01\\x00\\x00\\x00\\x1A	[fid=000001336-70-0000LIB;ext=lib,type;mime=;]Intellifont Scalable Typeface Format  file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	\\x1B\\x29\\x73\\x36\\x34\\x57\\x00\\x40	[fid=000001010-70-000000M;ext=m;mime=;]Deluxe paint mono colour font file

# Submitted on 2004-05-20 by Carl
0	belong	0x00010000	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file

# Submitted on 2004-05-20 by Carl
0	string	OTTO	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file, CFF type

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	belong	0x01666370	[fid=000000000-70-0000PCF;ext=pcf;mime=;]Portable compiled format (PCF) font file

# Submitted on 2004-05-20 by Carl
0	string	%!FontType1	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
0	string	%!PS-AdobeFont-1.0	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
6	string	%!FontType1	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Submitted on 2004-05-20 by Carl
6	string	%!PS-AdobeFont-1.0	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Magic ID for X-Windows, GemDOS files.
# Submitted on 2004-09-01 by Carl
2	string	\\x2E\\x30\\x0D\\x0A\\x00\\x00	[fid=000001337-70-0000SPD;ext=spd;mime=;]Bitstream Speedo font file
&0	string	D	
>24	string	x	[title=%.70s]
>1	string	x	,version %.1s.0

# Submitted on 2004-05-20 by Carl
0	string	true	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	typ1	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	StartCompFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe composite font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartMasterFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe master font metrics file

# Submitted on 2004-05-20 by Carl
0	leshort	0x0100	[fid=000001001-70-0000PFM;ext=pfm;mime=;]Printer Font Metrics file for Type 1 fonts
&66	leshort	0x0081	

# Submitted on 2004-02-08 by Carl
0	lelong	0x75B22630	[fid=000001001-81-0000ASF;ext=asf,wma,wmv;mime=;]Microsoft Advanced Streaming format multimedia file
&6	leshort	0x11CF	

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, little-endian
&8	string	AVI\\ 	

# Submitted on 2004-02-13 by Carl
0	string	RIFX	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, big-endian
&8	string	AVI\\ 	

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	mdat	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie data (mdat)

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	moov	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie resource (moov)

# Submitted on 2004-05-20 by Carl
0	belong	0x1B3	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1BA	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1E0	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Magic ID for Alias/Wavefront files.
# Submitted on 2004-02-08 by Carl
0	string	MOVI	[fid=000001004-81-00000MV;ext=mv;mime=;]Alias/Wavefront movie file

# Submitted on 2004-05-18 by Carl
0	string	OggS	[fid=000000000-81-0000OGG;ext=ogg;mime=application/ogg;]OGG Multimedia container stream file

# Magic ID for Realplayer files.
# Submitted on 2004-05-19 by Carl
0	string	.RMF	[fid=000001027-81-00000RM;ext=rm,ra,rt,rp,rpa;mime=;]RealMedia multimedia container stream file

# Magic ID for Macromedia Flash files.
# Submitted on 2004-02-08 by Carl
0	string	FWS	[fid=000001259-81-0000SWF;ext=swf;mime=;]Shockwave Macromedia animation
>3	byte	x	, version %d.0

# Magic ID for Vivo player files.
# Submitted on 2004-05-20 by Carl
5	string	Version:Vivo	[fid=000000000-81-000VIVO;ext=viv,vivo;mime=video/vnd.vivo;]Vivo multimedia stream file

# Magic ID for Aegis Animator files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001261-82-000ANIM;ext=anim;mime=;]Amiga / Sparta software animation
&8	string	ANIM	

# Magic ID for Fantavision movie maker files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001260-82-000FANT;ext=fant;mime=;]Fantavision movie
&8	string	FANT	

# Magic ID for Autodesk Animator Pro files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF12	[fid=000001254-82-0000FLC;ext=flc;mime=;]Autodesk Animator Pro animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Magic ID for Autodesk Animator files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF11	[fid=000001254-82-0000FLI;ext=fli;mime=;]Autodesk Animator animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Submitted on 2004-04-13 by Carl
0	string	\\x8AMNG\\x0d\\x0A\\x1A\\x0A	[fid=000000000-82-0000MNG;ext=mng;mime=;]Multi-image network graphics animation file
>0x10	belong	x	[res=%dx
>0x14	belong	x	%d]

# Magic ID for Cyberpaint files.
# Submitted on 2004-02-08 by Carl
0	beshort	0xFEDB	[fid=000000000-82-0000SEQ;ext=seq;mime=;]Cyberpaint Animation Sequence
&2	beshort	0x0000	

# Magic ID for Quicken,Money files.
# Submitted on 2004-08-01 by Carl
0	string	OFXHEADER:	[fid=000000008-91-0000QFX;ext=qfx;mime=;]Open financial exchange file (SGML)

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Account	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Bank	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cash	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cat	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:CCard	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Class	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Invst	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Memorized	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth A	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth L	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Submitted on 2004-02-11 by Carl
0	string	RRG	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows 3.x cardfile

# Submitted on 2004-02-11 by Carl
0	string	MGC	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows NT 3.51 card file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCARD	[fid=000001015-B0-0000VCF;ext=vcf;mime=;]vCard Business Card file

# Submitted on 2004-02-14 by Carl
0	string	\\xb5\\xa2\\xb0\\xb3\\xb3\\xb0\\xa2\\xb5	[fid=000001001-B1-0000CAL;ext=cal;mime=;]Microsoft windows calendar file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCALENDAR	[fid=000001016-B1-0000VCS;ext=vcs;mime=;]vCalendar/iCalendar Agenda file

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\x00\\x3C\\x00\\x00\\x00\\x3F	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x00000078	
&12	belong	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\xfe\\xff\\x00\\x00\\x00\\x3C	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x0000003F	
&12	belong	0x00000078	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x00\\x00\\x3F\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x00000078	
&12	beshort	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xef\\xbb\\xbf<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-8 encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xfe\\xff\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x00\\x00\\x3C\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x3F000000	
&12	beshort	0x78000000	

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, big-endian
&0x1C	leshort	!0xFFFE	

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, little-endian
&0x1C	leshort	0xFFFE	
>0x1A	leshort	x	, version %d
>0x18	leshort	x	.%d

# Magic ID for Freepascal compiler files.
# Submitted on 2004-10-24 by Carl
0	string	PPU0	[fid=000100120-11-0000PPU;ext=ppu,ppl,ppo,ppw,ppa,ppt;mime=;]Freepascal unit file
>0x04	string	x	, version %.2s

# Magic ID for Smartcards files.
# Submitted on 2004-10-29 by Carl
0	belong	0x00FACADE	[fid=000001011-10-0000EXP;ext=exp;mime=;]Javacard API export file
>0x05	byte	x	, version %d
>4	byte	x	.%d

# Submitted on 2004-10-29 by Carl
0	string	-rom1fs-	[fid=000100121-0F-0000IMG;ext=img;mime=;]Simple ROM filesystem (ROMFS)
>16	string	x	[title=%s]

# Magic ID for Virtual PC files.
# Submitted on 2004-10-29 by Carl
0	string	conectix	[fid=000001001-0F-0000VHD;ext=vhd;mime=;]Virtual PC Hard drive

# Submitted on 2004-11-12 by Carl Eric Codere
0	string	%!PS-Adobe-	[fid=000001003-33-00000PS;ext=ps,eps;mime=application/postscript;]Postscript file
>11	string	x	, level %.1s
>13	string	x	.%.1s

# Submitted on 2004-11-12 by Carl Eric Codere
0	lelong	0x526f6d2e	[fid=000001338-0F-0000ROM;ext=rom,fs;mime=;]eCos ROM Filesystem image (ROMFS)
>16	string	x	[title=%.16s]

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Magic ID for Texinfo files.
# Submitted on 2004-11-26 by Carl Eric Codere
1	string	input texinfo	[fid=000001340-00-000TEXI;ext=texi;mime=;]Texinfo source file

# Magic ID for MS-DOS files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	\\xFFFONT	[fid=000001001-70-0000CPI;ext=cpi;mime=;]MS-DOS code page raster font

# Magic ID for UNIX files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	TZif	[fid=000000000-90-0000000;ext=;mime=;]Timezone information database file (compiled)

# Magic ID for Telix files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	lelong	0x2e2b291a	[fid=000100126-B0-0000FON;ext=fon;mime=;]Telix phone book
&4	leshort	1	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	VCPCH0\\x00\\x00	[fid=000001001-90-0000PCH;ext=pch;mime=;]Microsoft Visual C++ pre-compiled header(s)

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ C/C++\\ program\\ database	[fid=000001001-90-0000PDB;ext=pdb;mime=;]Microsoft Visual C++ debug information database
&0x25	string	\\x0D\\x0A\\x1A	
&0x28	string	JG\\x00	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ Linker\\ Database\\x0A\\x07\\x1A	[fid=000001001-90-0000ILK;ext=ilk;mime=;]Microsoft Visual C++ linker database


# CRC32:8BC3BA46
'
 	);
+
 /**
  * Returns the test data for a given key
  *
@@ -177,6 +189,7 @@ class MagicDbTestData extends Object {
  * @access public
  **/
 	function get($key) {
+
 /**
  * data property
  *
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index 3ca1974e3..0d12ba514 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AclBehaviorTest file
  *
@@ -26,6 +27,7 @@
  */
 App::import('Behavior', 'Acl');
 App::import('Core', 'db_acl');
+
 /**
 * Test Person class - self joined model
 *
@@ -33,6 +35,7 @@ App::import('Core', 'db_acl');
 * @subpackage    cake.tests.cases.libs.model.behaviors
 */
 class AclPerson extends CakeTestModel {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class AclPerson extends CakeTestModel {
  * @access public
  */
 	var $name = 'AclPerson';
+
 /**
  * useTable property
  *
@@ -47,6 +51,7 @@ class AclPerson extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'people';
+
 /**
  * actsAs property
  *
@@ -54,6 +59,7 @@ class AclPerson extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Acl' => 'requester');
+
 /**
  * belongsTo property
  *
@@ -66,6 +72,7 @@ class AclPerson extends CakeTestModel {
 			'foreignKey' => 'mother_id',
 		)
 	);
+
 /**
  * hasMany property
  *
@@ -78,6 +85,7 @@ class AclPerson extends CakeTestModel {
 			'foreignKey' => 'mother_id'
 		)
 	);
+
 /**
  * parentNode method
  *
@@ -99,6 +107,7 @@ class AclPerson extends CakeTestModel {
 		}
 	}
 }
+
 /**
 * AclUser class
 *
@@ -106,6 +115,7 @@ class AclPerson extends CakeTestModel {
 * @subpackage    cake.tests.cases.libs.model.behaviors
 */
 class AclUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -113,6 +123,7 @@ class AclUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'User';
+
 /**
  * useTable property
  *
@@ -120,6 +131,7 @@ class AclUser extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'users';
+
 /**
  * actsAs property
  *
@@ -127,6 +139,7 @@ class AclUser extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Acl');
+
 /**
  * parentNode
  *
@@ -136,6 +149,7 @@ class AclUser extends CakeTestModel {
 		return null;
 	}
 }
+
 /**
 * AclPost class
 *
@@ -143,6 +157,7 @@ class AclUser extends CakeTestModel {
 * @subpackage    cake.tests.cases.libs.model.behaviors
 */
 class AclPost extends CakeTestModel {
+
 /**
  * name property
  *
@@ -150,6 +165,7 @@ class AclPost extends CakeTestModel {
  * @access public
  */
 	var $name = 'Post';
+
 /**
  * useTable property
  *
@@ -157,6 +173,7 @@ class AclPost extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'posts';
+
 /**
  * actsAs property
  *
@@ -164,6 +181,7 @@ class AclPost extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Acl' => 'controlled');
+
 /**
  * parentNode
  *
@@ -173,6 +191,7 @@ class AclPost extends CakeTestModel {
 		return null;
 	}
 }
+
 /**
 * AclBehaviorTest class
 *
@@ -180,6 +199,7 @@ class AclPost extends CakeTestModel {
 * @subpackage    cake.tests.cases.libs.controller.components
 */
 class AclBehaviorTestCase extends CakeTestCase {
+
 /**
  * Aco property
  *
@@ -187,6 +207,7 @@ class AclBehaviorTestCase extends CakeTestCase {
  * @access public
  */
 	var $Aco;
+
 /**
  * Aro property
  *
@@ -194,6 +215,7 @@ class AclBehaviorTestCase extends CakeTestCase {
  * @access public
  */
 	var $Aro;
+
 /**
  * fixtures property
  *
@@ -201,6 +223,7 @@ class AclBehaviorTestCase extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.person', 'core.user', 'core.post', 'core.aco', 'core.aro', 'core.aros_aco');
+
 /**
  * Set up the test
  *
@@ -213,6 +236,7 @@ class AclBehaviorTestCase extends CakeTestCase {
 		$this->Aco =& new Aco();
 		$this->Aro =& new Aro();
 	}
+
 /**
  * tearDown method
  *
@@ -223,6 +247,7 @@ class AclBehaviorTestCase extends CakeTestCase {
 		ClassRegistry::flush();
 		unset($this->Aro, $this->Aco);
 	}
+
 /**
  * Test Setup of AclBehavior
  *
@@ -240,6 +265,7 @@ class AclBehaviorTestCase extends CakeTestCase {
 		$this->assertEqual($Post->Behaviors->Acl->settings['Post']['type'], 'controlled');
 		$this->assertTrue(is_object($Post->Aco));
 	}
+
 /**
  * test After Save
  *
@@ -289,6 +315,7 @@ class AclBehaviorTestCase extends CakeTestCase {
 		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
 		$this->assertEqual($node[1]['Aro']['parent_id'], null);
 	}
+
 /**
  * Test After Delete
  *
@@ -342,6 +369,7 @@ class AclBehaviorTestCase extends CakeTestCase {
 		$this->assertTrue(empty($result));
 
 	}
+
 /**
  * Test Node()
  *
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d7cf0d0c5..6601ae1c1 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ContainableBehaviorTest file
  *
@@ -26,6 +27,7 @@
  */
 App::import('Core', array('AppModel', 'Model'));
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
 /**
  * ContainableTest class
  *
@@ -33,6 +35,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class ContainableBehaviorTest extends CakeTestCase {
+
 /**
  * Fixtures associated with this test case
  *
@@ -43,6 +46,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		'core.article', 'core.article_featured', 'core.article_featureds_tags', 'core.articles_tag', 'core.attachment', 'core.category',
 		'core.comment', 'core.featured', 'core.tag', 'core.user'
 	);
+
 /**
  * Method executed before each test
  *
@@ -69,6 +73,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->Behaviors->attach('Containable');
 		$this->Tag->Behaviors->attach('Containable');
 	}
+
 /**
  * Method executed after each test
  *
@@ -81,6 +86,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		ClassRegistry::flush();
 	}
+
 /**
  * testContainments method
  *
@@ -142,6 +148,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/Article/keep/User', $r));
 		$this->assertTrue(Set::matches('/Tag/keep/Article', $r));
 	}
+
 /**
  * testInvalidContainments method
  *
@@ -155,6 +162,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->Behaviors->attach('Containable', array('notices' => false));
 		$r = $this->__containments($this->Article, array('Comment', 'InvalidBinding'));
 	}
+
 /**
  * testBeforeFind method
  *
@@ -229,6 +237,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->expectError();
 		$r = $this->Article->find('all', array('contain' => array('Comment' => 'NonExistingBinding')));
 	}
+
 /**
  * testContain method
  *
@@ -244,6 +253,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$r = $this->Article->find('all');
 		$this->assertFalse(Set::matches('/Comment/User', $r));
 	}
+
 /**
  * testFindEmbeddedNoBindings method
  *
@@ -268,6 +278,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindFirstLevel method
  *
@@ -376,6 +387,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindEmbeddedFirstLevel method
  *
@@ -482,6 +494,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindSecondLevel method
  *
@@ -828,6 +841,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindEmbeddedSecondLevel method
  *
@@ -1170,6 +1184,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindThirdLevel method
  *
@@ -1490,6 +1505,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindEmbeddedThirdLevel method
  *
@@ -1807,6 +1823,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSettingsThirdLevel method
  *
@@ -2047,6 +2064,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindThirdLevelNonReset method
  *
@@ -2371,6 +2389,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindEmbeddedThirdLevelNonReset method
  *
@@ -2860,6 +2879,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('ArticleFeatured', 'Category')));
 		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article', 'User'), 'hasOne' => array('Attachment')));
 	}
+
 /**
  * testEmbeddedFindFields method
  *
@@ -2920,6 +2940,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindConditionalBinding method
  *
@@ -3047,6 +3068,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/Article[id=1]/Tag[id=2]', $result));
 		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['order']));
 	}
+
 /**
  * testOtherFinds method
  *
@@ -3110,6 +3132,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testPaginate method
  *
@@ -3214,6 +3237,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
 		$this->assertTrue(Set::matches('/Comment[id=1]', $r));
 	}
+
 /**
  * testOriginalAssociations method
  *
@@ -3308,6 +3332,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/Comment[article_id=1]', $result));
 		$this->Article->resetBindings();
 	}
+
 /**
  * testResetAssociation method
  *
@@ -3341,6 +3366,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$result = $this->Article->Comment->find('all', $initialOptions);
 		$this->assertEqual($result, $initialModels);
 	}
+
 /**
  * testResetDeeperHasOneAssociations method
  *
@@ -3390,6 +3416,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
 	}
+
 /**
  * testResetMultipleHabtmAssociations method
  *
@@ -3480,6 +3507,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag', 'ShortTag.created')))));
 		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
 	}
+
 /**
  * containments method
  *
@@ -3501,6 +3529,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		return $result;
 	}
+
 /**
  * assertBindings method
  *
@@ -3516,6 +3545,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			$this->assertEqual(array_keys($Model->$binding), $expect);
 		}
 	}
+
 /**
  * bindings method
  *
@@ -3557,4 +3587,4 @@ class ContainableBehaviorTest extends CakeTestCase {
 		return $debug;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 20eb3651c..a8d50bd46 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TranslateBehaviorTest file
  *
@@ -30,6 +31,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 
 App::import('Core', array('AppModel', 'Model'));
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
 /**
  * TranslateBehaviorTest class
  *
@@ -37,6 +39,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class TranslateBehaviorTest extends CakeTestCase {
+
 /**
  * autoFixtures property
  *
@@ -44,6 +47,7 @@ class TranslateBehaviorTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * fixtures property
  *
@@ -54,6 +58,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		'core.translated_item', 'core.translate', 'core.translate_table',
 		'core.translated_article', 'core.translate_article', 'core.user', 'core.comment', 'core.tag', 'core.articles_tag'
 	);
+
 /**
  * endTest method
  *
@@ -63,6 +68,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 	function endTest() {
 		ClassRegistry::flush();
 	}
+
 /**
  * testTranslateModel method
  *
@@ -89,6 +95,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$this->assertEqual($TestModel->translateModel()->name, 'TranslateTestModel');
 		$this->assertEqual($TestModel->translateModel()->useTable, 'i18n');
 	}
+
 /**
  * testLocaleFalsePlain method
  *
@@ -113,6 +120,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLocaleFalseAssociations method
  *
@@ -167,6 +175,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLocaleSingle method
  *
@@ -222,6 +231,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLocaleSingleWithConditions method
  *
@@ -261,6 +271,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLocaleSingleAssociations method
  *
@@ -321,6 +332,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLocaleMultiple method
  *
@@ -384,6 +396,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMissingTranslation method
  *
@@ -411,6 +424,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testTranslatedFindList method
  *
@@ -441,6 +455,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$expected = array(1 => null, 2 => null, 3 => null);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testReadSelectedFields method
  *
@@ -476,6 +491,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveCreate method
  *
@@ -494,6 +510,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$expected = array('TranslatedItem' => array_merge($data, array('id' => $TestModel->id, 'locale' => 'spa')));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveUpdate method
  *
@@ -516,6 +533,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$expected = array('TranslatedItem' => array_merge($oldData, $newData, array('locale' => 'spa')));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultipleCreate method
  *
@@ -554,6 +572,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultipleUpdate method
  *
@@ -596,6 +615,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->unbindTranslation($translations);
 		$TestModel->bindTranslation(array('title', 'content'), false);
 	}
+
 /**
  * testMixedCreateUpdateWithArrayLocale method
  *
@@ -635,6 +655,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testValidation method
  *
@@ -666,6 +687,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->create();
 		$this->assertTrue($TestModel->save($data));
 	}
+
 /**
  * testAttachDetach method
  *
@@ -716,6 +738,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$result = isset($Behavior->runtime[$TestModel->alias]);
 		$this->assertTrue($result);
 	}
+
 /**
  * testAnotherTranslateTable method
  *
@@ -739,6 +762,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testTranslateWithAssociations method
  *
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 2d030cb4c..71b6f227b 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TreeBehaviorTest file
  *
@@ -26,6 +27,7 @@
  */
 App::import('Core', array('AppModel', 'Model'));
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
 /**
  * NumberTreeTest class
  *
@@ -33,6 +35,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class NumberTreeTest extends CakeTestCase {
+
 /**
  * settings property
  *
@@ -45,6 +48,7 @@ class NumberTreeTest extends CakeTestCase {
 		'rightField' => 'rght',
 		'parentField' => 'parent_id'
 	);
+
 /**
  * fixtures property
  *
@@ -52,6 +56,7 @@ class NumberTreeTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.number_tree');
+
 /**
  * testInitialize method
  *
@@ -69,6 +74,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testDetectInvalidLeft method
  *
@@ -95,6 +101,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testDetectInvalidRight method
  *
@@ -121,6 +128,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testDetectInvalidParent method
  *
@@ -146,6 +154,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testDetectNoneExistantParent method
  *
@@ -169,6 +178,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testRecoverFromMissingParent method
  *
@@ -192,6 +202,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testDetectInvalidParents method
  *
@@ -214,6 +225,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * testDetectInvalidLftsRghts method
  *
@@ -235,6 +247,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertIdentical($result, true);
 	}
+
 /**
  * Reproduces a situation where a single node has lft= rght, and all other lft and rght fields follow sequentially
  *
@@ -262,6 +275,7 @@ class NumberTreeTest extends CakeTestCase {
 		$result = $this->Tree->verify();
 		$this->assertTrue($result);
 	}
+
 /**
  * testAddOrphan method
  *
@@ -281,6 +295,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testAddMiddle method
  *
@@ -314,6 +329,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testAddInvalid method
  *
@@ -338,6 +354,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testAddNotIndexedByModel method
  *
@@ -357,6 +374,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 }
+
 /**
  * testMovePromote method
  *
@@ -383,6 +401,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveWithWhitelist method
  *
@@ -410,6 +429,7 @@ class NumberTreeTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 		$this->assertTrue($this->Tree->verify());
 	}
+
 /**
  * testInsertWithWhitelist method
  *
@@ -428,6 +448,7 @@ class NumberTreeTest extends CakeTestCase {
 		$this->assertEqual($result[$modelClass], $expected);
 		$this->assertIdentical($this->Tree->verify(), true);
 	}
+
 /**
  * testMoveBefore method
  *
@@ -456,6 +477,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveAfter method
  *
@@ -484,6 +506,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveDemoteInvalid method
  *
@@ -517,6 +540,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveInvalid method
  *
@@ -543,6 +567,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveSelfInvalid method
  *
@@ -569,6 +594,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveUpSuccess method
  *
@@ -590,6 +616,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.1', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveUpFail method
  *
@@ -612,6 +639,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.2', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveUp2 method
  *
@@ -642,6 +670,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.10', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveUpFirst method
  *
@@ -672,6 +701,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.10', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveDownSuccess method
  *
@@ -693,6 +723,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.1', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveDownFail method
  *
@@ -714,6 +745,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.2', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveDownLast method
  *
@@ -744,6 +776,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.5', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveDown2 method
  *
@@ -774,6 +807,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.10', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testSaveNoMove method
  *
@@ -804,6 +838,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.10', )));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMoveToRootAndMoveUp method
  *
@@ -828,6 +863,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1. Root')));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testDelete method
  *
@@ -863,6 +899,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemove method
  *
@@ -895,6 +932,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemoveLastTopParent method
  *
@@ -928,6 +966,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemoveNoChildren method
  *
@@ -962,6 +1001,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemoveAndDelete method
  *
@@ -994,6 +1034,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemoveAndDeleteNoChildren method
  *
@@ -1026,6 +1067,7 @@ class NumberTreeTest extends CakeTestCase {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testChildren method
  *
@@ -1054,6 +1096,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12)));
 		$this->assertEqual($total, $expects);
 	}
+
 /**
  * testCountChildren method
  *
@@ -1074,6 +1117,7 @@ class NumberTreeTest extends CakeTestCase {
 		$total = $this->Tree->childCount();
 		$this->assertEqual($total, 6);
 	}
+
 /**
  * testGetParentNode method
  *
@@ -1092,6 +1136,7 @@ class NumberTreeTest extends CakeTestCase {
 		$expects = array($modelClass => array('name' => '1.2'));
 		$this->assertIdentical($result, $expects);
 	}
+
 /**
  * testGetPath method
  *
@@ -1112,6 +1157,7 @@ class NumberTreeTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.2.2')));
 		$this->assertIdentical($result, $expects);
 	}
+
 /**
  * testNoAmbiguousColumn method
  *
@@ -1144,6 +1190,7 @@ class NumberTreeTest extends CakeTestCase {
 		);
 		$this->assertEqual($total, $expects);
 	}
+
 /**
  * testReorderTree method
  *
@@ -1172,6 +1219,7 @@ class NumberTreeTest extends CakeTestCase {
 		$sortedNodes = $this->Tree->find('list', array('order' => $leftField));
 		$this->assertIdentical($nodes, $sortedNodes);
 	}
+
 /**
  * testGenerateTreeListWithSelfJoin method
  *
@@ -1189,6 +1237,7 @@ class NumberTreeTest extends CakeTestCase {
 		$expected = array(1 => '1. Root', 2 => '_1.1', 3 => '__1.1.1', 4 => '__1.1.2', 5 => '_1.2', 6 => '__1.2.1', 7 => '__1.2.2');
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testArraySyntax method
  *
@@ -1204,6 +1253,7 @@ class NumberTreeTest extends CakeTestCase {
 		$this->assertIdentical($this->Tree->getPath(4), $this->Tree->getPath(array('id' => 4)));
 	}
 }
+
 /**
  * ScopedTreeTest class
  *
@@ -1211,6 +1261,7 @@ class NumberTreeTest extends CakeTestCase {
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class ScopedTreeTest extends NumberTreeTest {
+
 /**
  * settings property
  *
@@ -1223,6 +1274,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		'rightField' => 'rght',
 		'parentField' => 'parent_id'
 	);
+
 /**
  * fixtures property
  *
@@ -1230,6 +1282,7 @@ class ScopedTreeTest extends NumberTreeTest {
  * @access public
  */
 	var $fixtures = array('core.flag_tree', 'core.ad', 'core.campaign', 'core.translate', 'core.number_tree_two');
+
 /**
  * testStringScope method
  *
@@ -1266,6 +1319,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		$this->assertTrue($this->Tree->delete());
 		$this->assertEqual($this->Tree->find('count'), 11);
 	}
+
 /**
  * testArrayScope method
  *
@@ -1302,6 +1356,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		$this->assertTrue($this->Tree->delete());
 		$this->assertEqual($this->Tree->find('count'), 11);
 	}
+
 /**
  * testMoveUpWithScope method
  *
@@ -1318,6 +1373,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		$this->assertEqual(Set::extract('/Ad/id', $result), array(6, 5));
 		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
 	}
+
 /**
  * testMoveDownWithScope method
  *
@@ -1334,6 +1390,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		$this->assertEqual(Set::extract('/Ad/id', $result), array(5, 6));
 		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
 	}
+
 /**
  * Tests the interaction (non-interference) between TreeBehavior and other behaviors with respect
  * to callback hooks
@@ -1433,6 +1490,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testGenerateTreeListWithSelfJoin method
  *
@@ -1489,6 +1547,7 @@ class ScopedTreeTest extends NumberTreeTest {
 		$this->assertEqual($result, $expected);
 	}
 }
+
 /**
  * AfterTreeTest class
  *
@@ -1496,6 +1555,7 @@ class ScopedTreeTest extends NumberTreeTest {
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class AfterTreeTest extends NumberTreeTest {
+
 /**
  * settings property
  *
@@ -1508,6 +1568,7 @@ class AfterTreeTest extends NumberTreeTest {
 		'rightField' => 'rght',
 		'parentField' => 'parent_id'
 	);
+
 /**
  * fixtures property
  *
@@ -1515,6 +1576,7 @@ class AfterTreeTest extends NumberTreeTest {
  * @access public
  */
 	var $fixtures = array('core.after_tree');
+
 /**
  * Tests the afterSave callback in the model
  *
@@ -1533,6 +1595,7 @@ class AfterTreeTest extends NumberTreeTest {
 		$this->assertEqual($result[7], $expected);
 	}
 }
+
 /**
  * UnconventionalTreeTest class
  *
@@ -1540,6 +1603,7 @@ class AfterTreeTest extends NumberTreeTest {
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class UnconventionalTreeTest extends NumberTreeTest {
+
 /**
  * settings property
  *
@@ -1552,6 +1616,7 @@ class UnconventionalTreeTest extends NumberTreeTest {
 		'rightField' => 'right',
 		'parentField' => 'join'
 	);
+
 /**
  * fixtures property
  *
@@ -1560,6 +1625,7 @@ class UnconventionalTreeTest extends NumberTreeTest {
  */
 	var $fixtures = array('core.unconventional_tree');
 }
+
 /**
  * UuidTreeTest class
  *
@@ -1567,6 +1633,7 @@ class UnconventionalTreeTest extends NumberTreeTest {
  * @subpackage    cake.tests.cases.libs.model.behaviors
  */
 class UuidTreeTest extends NumberTreeTest {
+
 /**
  * settings property
  *
@@ -1579,6 +1646,7 @@ class UuidTreeTest extends NumberTreeTest {
 		'rightField' => 'rght',
 		'parentField' => 'parent_id'
 	);
+
 /**
  * fixtures property
  *
@@ -1586,6 +1654,7 @@ class UuidTreeTest extends NumberTreeTest {
  * @access public
  */
 	var $fixtures = array('core.uuid_tree');
+
 /**
  * testMovePromote method
  *
@@ -1612,6 +1681,7 @@ class UuidTreeTest extends NumberTreeTest {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testMoveWithWhitelist method
  *
@@ -1639,6 +1709,7 @@ class UuidTreeTest extends NumberTreeTest {
 		$this->assertEqual($result, $expected);
 		$this->assertTrue($this->Tree->verify());
 	}
+
 /**
  * testRemoveNoChildren method
  *
@@ -1673,6 +1744,7 @@ class UuidTreeTest extends NumberTreeTest {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testRemoveAndDeleteNoChildren method
  *
@@ -1705,6 +1777,7 @@ class UuidTreeTest extends NumberTreeTest {
 		$validTree = $this->Tree->verify();
 		$this->assertIdentical($validTree, true);
 	}
+
 /**
  * testChildren method
  *
@@ -1733,6 +1806,7 @@ class UuidTreeTest extends NumberTreeTest {
 			array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12)));
 		$this->assertEqual($total, $expects);
 	}
+
 /**
  * testNoAmbiguousColumn method
  *
@@ -1765,6 +1839,7 @@ class UuidTreeTest extends NumberTreeTest {
 		);
 		$this->assertEqual($total, $expects);
 	}
+
 /**
  * testGenerateTreeListWithSelfJoin method
  *
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php
index 206b16f73..71f7a7fed 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/cake/tests/cases/libs/model/cake_schema.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test for Schema database management
  *
@@ -24,6 +25,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'CakeSchema');
+
 /**
  * Test for Schema database management
  *
@@ -31,6 +33,7 @@ App::import('Core', 'CakeSchema');
  * @subpackage    cake.tests.cases.libs
  */
 class MyAppSchema extends CakeSchema {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyAppSchema extends CakeSchema {
  * @access public
  */
 	var $name = 'MyApp';
+
 /**
  * connection property
  *
@@ -45,6 +49,7 @@ class MyAppSchema extends CakeSchema {
  * @access public
  */
 	var $connection = 'test_suite';
+
 /**
  * comments property
  *
@@ -62,6 +67,7 @@ class MyAppSchema extends CakeSchema {
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 	);
+
 /**
  * posts property
  *
@@ -79,6 +85,7 @@ class MyAppSchema extends CakeSchema {
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 	);
+
 /**
  * setup method
  *
@@ -88,6 +95,7 @@ class MyAppSchema extends CakeSchema {
  */
 	function setup($version) {
 	}
+
 /**
  * teardown method
  *
@@ -98,6 +106,7 @@ class MyAppSchema extends CakeSchema {
 	function teardown($version) {
 	}
 }
+
 /**
  * TestAppSchema class
  *
@@ -105,6 +114,7 @@ class MyAppSchema extends CakeSchema {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestAppSchema extends CakeSchema {
+
 /**
  * name property
  *
@@ -112,6 +122,7 @@ class TestAppSchema extends CakeSchema {
  * @access public
  */
 	var $name = 'MyApp';
+
 /**
  * comments property
  *
@@ -128,6 +139,7 @@ class TestAppSchema extends CakeSchema {
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 	);
+
 /**
  * posts property
  *
@@ -144,6 +156,7 @@ class TestAppSchema extends CakeSchema {
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 	);
+
 /**
  * posts_tags property
  *
@@ -155,6 +168,7 @@ class TestAppSchema extends CakeSchema {
 		'tag_id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
 		'indexes' => array('posts_tag' => array('column' => array('tag_id', 'post_id'), 'unique' => 1))
 	);
+
 /**
  * tags property
  *
@@ -168,6 +182,7 @@ class TestAppSchema extends CakeSchema {
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true))
 	);
+
 /**
  * datatypes property
  *
@@ -179,6 +194,7 @@ class TestAppSchema extends CakeSchema {
 		'float_field' => array('type' => 'float', 'null' => false, 'length' => '5,2'),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true))
 	);
+
 /**
  * setup method
  *
@@ -188,6 +204,7 @@ class TestAppSchema extends CakeSchema {
  */
 	function setup($version) {
 	}
+
 /**
  * teardown method
  *
@@ -198,6 +215,7 @@ class TestAppSchema extends CakeSchema {
 	function teardown($version) {
 	}
 }
+
 /**
  * SchmeaPost class
  *
@@ -205,6 +223,7 @@ class TestAppSchema extends CakeSchema {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SchemaPost extends CakeTestModel {
+
 /**
  * name property
  *
@@ -212,6 +231,7 @@ class SchemaPost extends CakeTestModel {
  * @access public
  */
 	var $name = 'SchemaPost';
+
 /**
  * useTable property
  *
@@ -219,6 +239,7 @@ class SchemaPost extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'posts';
+
 /**
  * hasMany property
  *
@@ -226,6 +247,7 @@ class SchemaPost extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('SchemaComment');
+
 /**
  * hasAndBelongsToMany property
  *
@@ -234,6 +256,7 @@ class SchemaPost extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('SchemaTag');
 }
+
 /**
  * SchemaComment class
  *
@@ -241,6 +264,7 @@ class SchemaPost extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SchemaComment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -248,6 +272,7 @@ class SchemaComment extends CakeTestModel {
  * @access public
  */
 	var $name = 'SchemaComment';
+
 /**
  * useTable property
  *
@@ -255,6 +280,7 @@ class SchemaComment extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * belongsTo property
  *
@@ -263,6 +289,7 @@ class SchemaComment extends CakeTestModel {
  */
 	var $belongsTo = array('SchemaPost');
 }
+
 /**
  * SchemaTag class
  *
@@ -270,6 +297,7 @@ class SchemaComment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SchemaTag extends CakeTestModel {
+
 /**
  * name property
  *
@@ -277,6 +305,7 @@ class SchemaTag extends CakeTestModel {
  * @access public
  */
 	var $name = 'SchemaTag';
+
 /**
  * useTable property
  *
@@ -284,6 +313,7 @@ class SchemaTag extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'tags';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -292,6 +322,7 @@ class SchemaTag extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('SchemaPost');
 }
+
 /**
  * SchemaDatatype class
  *
@@ -299,6 +330,7 @@ class SchemaTag extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SchemaDatatype extends CakeTestModel {
+
 /**
  * name property
  *
@@ -306,6 +338,7 @@ class SchemaDatatype extends CakeTestModel {
  * @access public
  */
 	var $name = 'SchemaDatatype';
+
 /**
  * useTable property
  *
@@ -314,6 +347,7 @@ class SchemaDatatype extends CakeTestModel {
  */
 	var $useTable = 'datatypes';
 }
+
 /**
  * Testdescribe class
  *
@@ -326,6 +360,7 @@ class SchemaDatatype extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Testdescribe extends CakeTestModel {
+
 /**
  * name property
  *
@@ -334,6 +369,7 @@ class Testdescribe extends CakeTestModel {
  */
 	var $name = 'Testdescribe';
 }
+
 /**
  * CakeSchemaTest
  *
@@ -341,6 +377,7 @@ class Testdescribe extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class CakeSchemaTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -348,6 +385,7 @@ class CakeSchemaTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.post', 'core.tag', 'core.posts_tag', 'core.comment', 'core.datatype');
+
 /**
  * setUp method
  *
@@ -357,6 +395,7 @@ class CakeSchemaTest extends CakeTestCase {
 	function startTest() {
 		$this->Schema = new TestAppSchema();
 	}
+
 /**
  * tearDown method
  *
@@ -366,6 +405,7 @@ class CakeSchemaTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Schema);
 	}
+
 /**
  * testSchemaName method
  *
@@ -382,6 +422,7 @@ class CakeSchemaTest extends CakeTestCase {
 
 		Configure::write('App.dir', 'app');
 	}
+
 /**
  * testSchemaRead method
  *
@@ -410,6 +451,7 @@ class CakeSchemaTest extends CakeTestCase {
 		$read = $this->Schema->read(array('connection' => 'schema_prefix', 'models' => false));
 		$this->assertTrue(empty($read['tables']));
 	}
+
 /**
  * testSchemaWrite method
  *
@@ -426,6 +468,7 @@ class CakeSchemaTest extends CakeTestCase {
 		$this->assertEqual($this->Schema->tables, $OtherSchema->tables);
 
 	}
+
 /**
  * testSchemaComparison method
  *
@@ -459,6 +502,7 @@ class CakeSchemaTest extends CakeTestCase {
 		);
 		$this->assertEqual($expected, $compare);
 	}
+
 /**
  * testSchemaLoading method
  *
@@ -470,6 +514,7 @@ class CakeSchemaTest extends CakeTestCase {
 		$this->assertEqual($Other->name, 'MyOtherApp');
 		$this->assertEqual($Other->tables, $this->Schema->tables);
 	}
+
 /**
  * testSchemaCreateTable method
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 45f71fe16..c661c4e08 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboAdodbTest file
  *
@@ -28,6 +29,7 @@ require_once LIBS.'model'.DS.'model.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'datasource.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_adodb.php';
+
 /**
  * DboAdoTestDb
  *
@@ -35,6 +37,7 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_adodb.php';
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboAdoTestDb extends DboAdodb {
+
 /**
  * simulated property
  *
@@ -42,6 +45,7 @@ class DboAdoTestDb extends DboAdodb {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * testing property
  *
@@ -49,6 +53,7 @@ class DboAdoTestDb extends DboAdodb {
  * @access public
  */
 	var $testing = true;
+
 /**
  * execute method
  *
@@ -63,6 +68,7 @@ class DboAdoTestDb extends DboAdodb {
 		}
 		return parent::_execute($sql);
 	}
+
 /**
  * getLastQuery method
  *
@@ -73,6 +79,7 @@ class DboAdoTestDb extends DboAdodb {
 		return $this->simulated[count($this->simulated) - 1];
 	}
 }
+
 /**
  * AdodbTestModel
  *
@@ -80,6 +87,7 @@ class DboAdoTestDb extends DboAdodb {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class AdodbTestModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -87,6 +95,7 @@ class AdodbTestModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'AdodbTestModel';
+
 /**
  * useTable property
  *
@@ -94,6 +103,7 @@ class AdodbTestModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * find method
  *
@@ -107,6 +117,7 @@ class AdodbTestModel extends CakeTestModel {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * findAll method
  *
@@ -120,6 +131,7 @@ class AdodbTestModel extends CakeTestModel {
 	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * schema method
  *
@@ -150,6 +162,7 @@ class AdodbTestModel extends CakeTestModel {
 	}
 }
 if (!class_exists('Article')) {
+
 /**
  * Article class
  *
@@ -157,6 +170,7 @@ if (!class_exists('Article')) {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 	class Article extends CakeTestModel {
+
 /**
  * name property
  *
@@ -166,6 +180,7 @@ if (!class_exists('Article')) {
 		var $name = 'Article';
 	}
 }
+
 /**
  * DboAdodbTest class
  *
@@ -173,6 +188,7 @@ if (!class_exists('Article')) {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboAdodbTest extends CakeTestCase {
+
 /**
  * The Dbo instance to be tested
  *
@@ -180,6 +196,7 @@ class DboAdodbTest extends CakeTestCase {
  * @access public
  */
 	var $db = null;
+
 /**
  * fixtures property
  *
@@ -187,6 +204,7 @@ class DboAdodbTest extends CakeTestCase {
  * @access public
  **/
 	var $fixtures = array('core.article');
+
 /**
  * Skip if cannot connect to AdoDb
  *
@@ -197,6 +215,7 @@ class DboAdodbTest extends CakeTestCase {
 		$db =& ConnectionManager::getDataSource('test_suite');
 		$this->skipIf($db->config['driver'] != 'adodb', '%s Adodb connection not available');
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -207,6 +226,7 @@ class DboAdodbTest extends CakeTestCase {
 		$this->db = new DboAdoTestDb($db->config);
 		$this->model = new AdodbTestModel();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -215,6 +235,7 @@ class DboAdodbTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->db);
 	}
+
 /**
  * Test Dbo value method
  *
@@ -264,6 +285,7 @@ class DboAdodbTest extends CakeTestCase {
 		$result = $this->db->value('00010010001');
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testColumns method
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 1cd3268fa..fec6782b1 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboMssqlTest file
  *
@@ -29,6 +30,7 @@ require_once LIBS.'model'.DS.'model.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'datasource.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
 require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php';
+
 /**
  * DboMssqlTestDb class
  *
@@ -36,6 +38,7 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php';
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMssqlTestDb extends DboMssql {
+
 /**
  * simulated property
  *
@@ -43,6 +46,7 @@ class DboMssqlTestDb extends DboMssql {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * fetchAllResultsStack
  *
@@ -50,6 +54,7 @@ class DboMssqlTestDb extends DboMssql {
  * @access public
  */
 	var $fetchAllResultsStack = array();
+
 /**
  * execute method
  *
@@ -61,6 +66,7 @@ class DboMssqlTestDb extends DboMssql {
 		$this->simulated[] = $sql;
 		return null;
 	}
+
 /**
  * fetchAll method
  *
@@ -71,6 +77,7 @@ class DboMssqlTestDb extends DboMssql {
 	function _matchRecords(&$model, $conditions = null) {
 		return $this->conditions(array('id' => array(1, 2)));
 	}
+
 /**
  * fetchAll method
  *
@@ -85,6 +92,7 @@ class DboMssqlTestDb extends DboMssql {
 		}
 		return $result;
 	}
+
 /**
  * getLastQuery method
  *
@@ -94,6 +102,7 @@ class DboMssqlTestDb extends DboMssql {
 	function getLastQuery() {
 		return $this->simulated[count($this->simulated) - 1];
 	}
+
 /**
  * getPrimaryKey method
  *
@@ -105,6 +114,7 @@ class DboMssqlTestDb extends DboMssql {
 		return parent::_getPrimaryKey($model);
 	}
 }
+
 /**
  * MssqlTestModel class
  *
@@ -112,6 +122,7 @@ class DboMssqlTestDb extends DboMssql {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class MssqlTestModel extends Model {
+
 /**
  * name property
  *
@@ -119,6 +130,7 @@ class MssqlTestModel extends Model {
  * @access public
  */
 	var $name = 'MssqlTestModel';
+
 /**
  * useTable property
  *
@@ -126,6 +138,7 @@ class MssqlTestModel extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * _schema property
  *
@@ -152,6 +165,7 @@ class MssqlTestModel extends Model {
 		'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * find method
  *
@@ -165,6 +179,7 @@ class MssqlTestModel extends Model {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * findAll method
  *
@@ -178,6 +193,7 @@ class MssqlTestModel extends Model {
 	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * setSchema method
  *
@@ -189,6 +205,7 @@ class MssqlTestModel extends Model {
 		$this->_schema = $schema;
 	}
 }
+
 /**
  * DboMssqlTest class
  *
@@ -196,6 +213,7 @@ class MssqlTestModel extends Model {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMssqlTest extends CakeTestCase {
+
 /**
  * The Dbo instance to be tested
  *
@@ -203,6 +221,7 @@ class DboMssqlTest extends CakeTestCase {
  * @access public
  */
 	var $db = null;
+
 /**
  * Skip if cannot connect to mssql
  *
@@ -212,6 +231,7 @@ class DboMssqlTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'mssql', '%s SQL Server connection not available');
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -222,6 +242,7 @@ class DboMssqlTest extends CakeTestCase {
 		$this->db = new DboMssqlTestDb($db->config);
 		$this->model = new MssqlTestModel();
 	}
+
 /**
  * tearDown method
  *
@@ -231,6 +252,7 @@ class DboMssqlTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->model);
 	}
+
 /**
  * testQuoting method
  *
@@ -269,6 +291,7 @@ class DboMssqlTest extends CakeTestCase {
 		$result = $this->db->value('1,2', 'float');
 		$this->assertIdentical($expected, $result);
 	}
+
 /**
  * testDistinctFields method
  *
@@ -284,6 +307,7 @@ class DboMssqlTest extends CakeTestCase {
 		$expected = array('DISTINCT [Car].[country_code] AS [Car__1]');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDistinctWithLimit method
  *
@@ -298,6 +322,7 @@ class DboMssqlTest extends CakeTestCase {
 		$result = $this->db->getLastQuery();
 		$this->assertPattern('/^SELECT DISTINCT TOP 5/', $result);
 	}
+
 /**
  * testDescribe method
  *
@@ -330,6 +355,7 @@ class DboMssqlTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUpdateAllSyntax method
  *
@@ -346,6 +372,7 @@ class DboMssqlTest extends CakeTestCase {
 		$this->assertPattern('/^UPDATE \[mssql_test_models\]/', $result);
 		$this->assertPattern('/SET \[client_id\] = \[client_id\] \+ 1/', $result);
 	}
+
 /**
  * testGetPrimaryKey method
  *
@@ -362,6 +389,7 @@ class DboMssqlTest extends CakeTestCase {
 		$result = $this->db->getPrimaryKey($this->model);
 		$this->assertNull($result);
 	}
+
 /**
  * testInsertMulti
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 3cf86ed92..f8ba9669a 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboMysqlTest file
  *
@@ -25,6 +26,7 @@
 App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql'));
 
 Mock::generatePartial('DboMysql', 'QueryMockDboMysql', array('query'));
+
 /**
  * DboMysqlTestDb class
  *
@@ -32,6 +34,7 @@ Mock::generatePartial('DboMysql', 'QueryMockDboMysql', array('query'));
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboMysqlTestDb extends DboMysql {
+
 /**
  * simulated property
  *
@@ -39,6 +42,7 @@ class DboMysqlTestDb extends DboMysql {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * testing property
  *
@@ -46,6 +50,7 @@ class DboMysqlTestDb extends DboMysql {
  * @access public
  */
 	var $testing = true;
+
 /**
  * execute method
  *
@@ -60,6 +65,7 @@ class DboMysqlTestDb extends DboMysql {
 		}
 		return parent::_execute($sql);
 	}
+
 /**
  * getLastQuery method
  *
@@ -70,6 +76,7 @@ class DboMysqlTestDb extends DboMysql {
 		return $this->simulated[count($this->simulated) - 1];
 	}
 }
+
 /**
  * MysqlTestModel class
  *
@@ -77,6 +84,7 @@ class DboMysqlTestDb extends DboMysql {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class MysqlTestModel extends Model {
+
 /**
  * name property
  *
@@ -84,6 +92,7 @@ class MysqlTestModel extends Model {
  * @access public
  */
 	var $name = 'MysqlTestModel';
+
 /**
  * useTable property
  *
@@ -91,6 +100,7 @@ class MysqlTestModel extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * find method
  *
@@ -104,6 +114,7 @@ class MysqlTestModel extends Model {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * findAll method
  *
@@ -117,6 +128,7 @@ class MysqlTestModel extends Model {
 	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * schema method
  *
@@ -146,6 +158,7 @@ class MysqlTestModel extends Model {
 		);
 	}
 }
+
 /**
  * DboMysqlTest class
  *
@@ -153,6 +166,7 @@ class MysqlTestModel extends Model {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMysqlTest extends CakeTestCase {
+
 /**
  * The Dbo instance to be tested
  *
@@ -160,6 +174,7 @@ class DboMysqlTest extends CakeTestCase {
  * @access public
  */
 	var $Db = null;
+
 /**
  * Skip if cannot connect to mysql
  *
@@ -169,6 +184,7 @@ class DboMysqlTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'mysql', '%s MySQL connection not available');
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -179,6 +195,7 @@ class DboMysqlTest extends CakeTestCase {
 		$this->db = new DboMysqlTestDb($db->config);
 		$this->model = new MysqlTestModel();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -187,6 +204,7 @@ class DboMysqlTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->db);
 	}
+
 /**
  * startCase
  *
@@ -196,6 +214,7 @@ class DboMysqlTest extends CakeTestCase {
 		$this->_debug = Configure::read('debug');
 		Configure::write('debug', 1);
 	}
+
 /**
  * endCase
  *
@@ -204,6 +223,7 @@ class DboMysqlTest extends CakeTestCase {
 	function endCase() {
 		Configure::write('debug', $this->_debug);
 	}
+
 /**
  * Test Dbo value method
  *
@@ -262,6 +282,7 @@ class DboMysqlTest extends CakeTestCase {
 		$result = $this->db->value('00010010001');
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testTinyintCasting method
  *
@@ -300,6 +321,7 @@ class DboMysqlTest extends CakeTestCase {
 
 		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
 	}
+
 /**
  * testIndexDetection method
  *
@@ -362,6 +384,7 @@ class DboMysqlTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 	}
+
 /**
  * MySQL 4.x returns index data in a different format,
  * Using a mock ensure that MySQL 4.x output is properly parsed.
@@ -455,6 +478,7 @@ class DboMysqlTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testColumn method
  *
@@ -502,6 +526,7 @@ class DboMysqlTest extends CakeTestCase {
 		$expected = 'float';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testAlterSchemaIndexes method
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 3b19174c4..1ceee963c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboMysqliTest file
  *
@@ -26,6 +27,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysqli'));
+
 /**
  * DboMysqliTestDb class
  *
@@ -33,6 +35,7 @@ App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysqli'));
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboMysqliTestDb extends DboMysqli {
+
 /**
  * simulated property
  *
@@ -40,6 +43,7 @@ class DboMysqliTestDb extends DboMysqli {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * testing property
  *
@@ -47,6 +51,7 @@ class DboMysqliTestDb extends DboMysqli {
  * @access public
  */
 	var $testing = true;
+
 /**
  * execute method
  *
@@ -61,6 +66,7 @@ class DboMysqliTestDb extends DboMysqli {
 		}
 		return parent::_execute($sql);
 	}
+
 /**
  * getLastQuery method
  *
@@ -71,6 +77,7 @@ class DboMysqliTestDb extends DboMysqli {
 		return $this->simulated[count($this->simulated) - 1];
 	}
 }
+
 /**
  * MysqliTestModel class
  *
@@ -78,6 +85,7 @@ class DboMysqliTestDb extends DboMysqli {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class MysqliTestModel extends Model {
+
 /**
  * name property
  *
@@ -85,6 +93,7 @@ class MysqliTestModel extends Model {
  * @access public
  */
 	var $name = 'MysqliTestModel';
+
 /**
  * useTable property
  *
@@ -92,6 +101,7 @@ class MysqliTestModel extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * find method
  *
@@ -105,6 +115,7 @@ class MysqliTestModel extends Model {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * findAll method
  *
@@ -118,6 +129,7 @@ class MysqliTestModel extends Model {
 	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * schema method
  *
@@ -147,6 +159,7 @@ class MysqliTestModel extends Model {
 		);
 	}
 }
+
 /**
  * DboMysqliTest class
  *
@@ -154,6 +167,7 @@ class MysqliTestModel extends Model {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMysqliTest extends CakeTestCase {
+
 /**
  * The Dbo instance to be tested
  *
@@ -161,6 +175,7 @@ class DboMysqliTest extends CakeTestCase {
  * @access public
  */
 	var $Db = null;
+
 /**
  * Skip if cannot connect to mysqli
  *
@@ -170,6 +185,7 @@ class DboMysqliTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'mysqli', '%s MySQLi connection not available');
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -180,6 +196,7 @@ class DboMysqliTest extends CakeTestCase {
 		$this->db = new DboMysqliTestDb($db->config);
 		$this->model = new MysqliTestModel();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -188,6 +205,7 @@ class DboMysqliTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->db);
 	}
+
 /**
  * testIndexDetection method
  *
@@ -250,6 +268,7 @@ class DboMysqliTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 	}
+
 /**
  * testColumn method
  *
@@ -297,6 +316,7 @@ class DboMysqliTest extends CakeTestCase {
 		$expected = 'float';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * undocumented function
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index 6b835890a..a1e51a37b 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboOracleTest file
  *
@@ -27,6 +28,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 }
 require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo_source.php';
 require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_oracle.php';
+
 /**
  * DboOracleTest class
  *
@@ -34,10 +36,12 @@ require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_oracle
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboOracleTest extends CakeTestCase {
+
 /**
  * fixtures property
  */
 	var $fixtures = array('core.oracle_user');
+
 /**
  * setup method
  *
@@ -47,6 +51,7 @@ class DboOracleTest extends CakeTestCase {
 	function setUp() {
 		$this->_initDb();
 	}
+
 /**
  * skip method
  *
@@ -57,6 +62,7 @@ class DboOracleTest extends CakeTestCase {
     	$this->_initDb();
     	$this->skipUnless($this->db->config['driver'] == 'oracle', '%s Oracle connection not available');
     }
+
 /**
  * testLastErrorStatement method
  *
@@ -74,6 +80,7 @@ class DboOracleTest extends CakeTestCase {
 		$r = 'ORA-01756: quoted string not properly terminated';
 		$this->assertEqual($e, $r);
 	}
+
 /**
  * testLastErrorConnect method
  *
@@ -95,6 +102,7 @@ class DboOracleTest extends CakeTestCase {
 		$this->db->config['password'] = $old_pw;
 		$this->db->connect();
 	}
+
 /**
  * testName method
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index aec59ba4c..936a931e7 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboPostgresTest file
  *
@@ -25,6 +26,7 @@
 App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboPostgres'));
 App::import('Model', 'App');
 require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
+
 /**
  * DboPostgresTestDb class
  *
@@ -32,6 +34,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboPostgresTestDb extends DboPostgres {
+
 /**
  * simulated property
  *
@@ -39,6 +42,7 @@ class DboPostgresTestDb extends DboPostgres {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * execute method
  *
@@ -50,6 +54,7 @@ class DboPostgresTestDb extends DboPostgres {
 		$this->simulated[] = $sql;
 		return null;
 	}
+
 /**
  * getLastQuery method
  *
@@ -60,6 +65,7 @@ class DboPostgresTestDb extends DboPostgres {
 		return $this->simulated[count($this->simulated) - 1];
 	}
 }
+
 /**
  * PostgresTestModel class
  *
@@ -67,6 +73,7 @@ class DboPostgresTestDb extends DboPostgres {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class PostgresTestModel extends Model {
+
 /**
  * name property
  *
@@ -74,6 +81,7 @@ class PostgresTestModel extends Model {
  * @access public
  */
 	var $name = 'PostgresTestModel';
+
 /**
  * useTable property
  *
@@ -81,6 +89,7 @@ class PostgresTestModel extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * find method
  *
@@ -94,6 +103,7 @@ class PostgresTestModel extends Model {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * findAll method
  *
@@ -107,6 +117,7 @@ class PostgresTestModel extends Model {
 	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return $conditions;
 	}
+
 /**
  * schema method
  *
@@ -136,6 +147,7 @@ class PostgresTestModel extends Model {
 		);
 	}
 }
+
 /**
  * DboPostgresTest class
  *
@@ -143,6 +155,7 @@ class PostgresTestModel extends Model {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboPostgresTest extends CakeTestCase {
+
 /**
  * Do not automatically load fixtures for each test, they will be loaded manually
  * using CakeTestCase::loadFixtures
@@ -151,6 +164,7 @@ class DboPostgresTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * Fixtures
  *
@@ -159,6 +173,7 @@ class DboPostgresTest extends CakeTestCase {
  */
 	var $fixtures = array('core.user', 'core.binary_test', 'core.comment', 'core.article',
 		'core.tag', 'core.articles_tag', 'core.attachment', 'core.person', 'core.post', 'core.author');
+
 /**
  * Actual DB connection used in testing
  *
@@ -166,6 +181,7 @@ class DboPostgresTest extends CakeTestCase {
  * @access public
  */
 	var $db = null;
+
 /**
  * Simulated DB connection used in testing
  *
@@ -173,6 +189,7 @@ class DboPostgresTest extends CakeTestCase {
  * @access public
  */
 	var $db2 = null;
+
 /**
  * Skip if cannot connect to postgres
  *
@@ -182,6 +199,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'postgres', '%s PostgreSQL connection not available');
 	}
+
 /**
  * Set up test suite database connection
  *
@@ -190,6 +208,7 @@ class DboPostgresTest extends CakeTestCase {
 	function startTest() {
 		$this->_initDb();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -202,6 +221,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->db2 = new DboPostgresTestDb($this->db->config, false);
 		$this->model = new PostgresTestModel();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -211,6 +231,7 @@ class DboPostgresTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 		unset($this->db2);
 	}
+
 /**
  * Test field and value quoting method
  *
@@ -248,6 +269,7 @@ class DboPostgresTest extends CakeTestCase {
 		$result = $this->db2->value('1,2', 'float');
 		$this->assertIdentical($expected, $result);
 	}
+
 /**
  * testColumnParsing method
  *
@@ -262,6 +284,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($this->db2->column('time without time zone'), 'time');
 		$this->assertEqual($this->db2->column('timestamp without time zone'), 'datetime');
 	}
+
 /**
  * testValueQuoting method
  *
@@ -290,6 +313,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($this->db2->value('1', 'boolean'), 'TRUE');
 		$this->assertEqual($this->db2->value(null, 'boolean'), "NULL");
 	}
+
 /**
  * test that date columns do not generate errors with null and nullish values.
  *
@@ -305,6 +329,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($this->db2->value('', 'timestamp'), 'NULL');
 		$this->assertEqual($this->db2->value(null, 'timestamp'), 'NULL');
 	}
+
 /**
  * Tests that different Postgres boolean 'flavors' are properly returned as native PHP booleans
  *
@@ -326,6 +351,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertFalse($this->db2->boolean(0));
 		$this->assertFalse($this->db2->boolean(''));
 	}
+
 /**
  * testLastInsertIdMultipleInsert method
  *
@@ -353,6 +379,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($db1->lastInsertId($table), 1);
 		$this->assertEqual($db2->lastInsertId($table), 2);
 	}
+
 /**
  * Tests that table lists and descriptions are scoped to the proper Postgres schema
  *
@@ -373,6 +400,7 @@ class DboPostgresTest extends CakeTestCase {
 
 		$db2->query('DROP SCHEMA _scope_test');
 	}
+
 /**
  * Tests that column types without default lengths in $columns do not have length values
  * applied when generating schemas.
@@ -389,6 +417,7 @@ class DboPostgresTest extends CakeTestCase {
 		$expected = '"foo" text DEFAULT \'FOO\'';
 		$this->assertEqual($this->db->buildColumn($result), $expected);
 	}
+
 /**
  * Tests that binary data is escaped/unescaped properly on reads and writes
  *
@@ -421,6 +450,7 @@ class DboPostgresTest extends CakeTestCase {
 		$result = $model->find('first');
 		$this->assertEqual($result['BinaryTest']['data'], $data);
 	}
+
 /**
  * Tests the syntax of generated schema indexes
  *
@@ -453,6 +483,7 @@ class DboPostgresTest extends CakeTestCase {
 		$result = $this->db->createSchema($schema);
 		$this->assertNoPattern('/^CREATE INDEX(.+);,$/', $result);
 	}
+
 /**
  * testCakeSchema method
  *
@@ -490,6 +521,7 @@ class DboPostgresTest extends CakeTestCase {
 
 		$db1->query('DROP TABLE ' . $db1->fullTableName('datatypes'));
 	}
+
 /**
  * Test index generation from table info.
  *
@@ -521,6 +553,7 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 	}
+
 /**
  * Test the alterSchema capabilities of postgres
  *
@@ -566,6 +599,7 @@ class DboPostgresTest extends CakeTestCase {
 
 		$this->db->query($this->db->dropSchema($New));
 	}
+
 /**
  * Test the alter index capabilities of postgres
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 2f1ea4ad6..75acb73e6 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboSqliteTest file
  *
@@ -23,6 +24,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
+
 /**
  * DboSqliteTestDb class
  *
@@ -30,6 +32,7 @@ App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboSqliteTestDb extends DboSqlite {
+
 /**
  * simulated property
  *
@@ -37,6 +40,7 @@ class DboSqliteTestDb extends DboSqlite {
  * @access public
  */
 	var $simulated = array();
+
 /**
  * execute method
  *
@@ -48,6 +52,7 @@ class DboSqliteTestDb extends DboSqlite {
 		$this->simulated[] = $sql;
 		return null;
 	}
+
 /**
  * getLastQuery method
  *
@@ -58,6 +63,7 @@ class DboSqliteTestDb extends DboSqlite {
 		return $this->simulated[count($this->simulated) - 1];
 	}
 }
+
 /**
  * DboSqliteTest class
  *
@@ -65,6 +71,7 @@ class DboSqliteTestDb extends DboSqlite {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboSqliteTest extends CakeTestCase {
+
 /**
  * Do not automatically load fixtures for each test, they will be loaded manually using CakeTestCase::loadFixtures
  *
@@ -72,6 +79,7 @@ class DboSqliteTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * Fixtures
  *
@@ -79,6 +87,7 @@ class DboSqliteTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.user');
+
 /**
  * Actual DB connection used in testing
  *
@@ -86,6 +95,7 @@ class DboSqliteTest extends CakeTestCase {
  * @access public
  */
 	var $db = null;
+
 /**
  * Simulated DB connection used in testing
  *
@@ -93,6 +103,7 @@ class DboSqliteTest extends CakeTestCase {
  * @access public
  */
 	var $db2 = null;
+
 /**
  * Skip if cannot connect to SQLite
  *
@@ -102,6 +113,7 @@ class DboSqliteTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'sqlite', '%s SQLite connection not available');
 	}
+
 /**
  * Set up test suite database connection
  *
@@ -110,6 +122,7 @@ class DboSqliteTest extends CakeTestCase {
 	function startTest() {
 		$this->_initDb();
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -121,6 +134,7 @@ class DboSqliteTest extends CakeTestCase {
 		$this->db =& ConnectionManager::getDataSource('test_suite');
 		$this->db2 = new DboSqliteTestDb($this->db->config, false);
 	}
+
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -130,6 +144,7 @@ class DboSqliteTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 		unset($this->db2);
 	}
+
 /**
  * Tests that SELECT queries from DboSqlite::listSources() are not cached
  *
@@ -144,6 +159,7 @@ class DboSqliteTest extends CakeTestCase {
 		$this->db->query('DROP TABLE foo_test;');
 		$this->assertFalse(in_array('foo_test', $this->db->listSources()));
 	}
+
 /**
  * test Index introspection.
  *
@@ -175,6 +191,7 @@ class DboSqliteTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 	}
+
 /**
  * Tests that cached table descriptions are saved under the sanitized key name
  *
@@ -204,6 +221,7 @@ class DboSqliteTest extends CakeTestCase {
 		Cache::delete($fileName, '_cake_model_');
 		Configure::write('Cache.disable', true);
 	}
+
 /**
  * test describe() and normal results.
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index cb10ebc46..8fe318d1b 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DboSourceTest file
  *
@@ -30,6 +31,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql'));
 App::import('Model', 'App');
 require_once dirname(dirname(__FILE__)) . DS . 'models.php';
+
 /**
  * TestModel class
  *
@@ -37,6 +39,7 @@ require_once dirname(dirname(__FILE__)) . DS . 'models.php';
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -44,6 +47,7 @@ class TestModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel';
+
 /**
  * useTable property
  *
@@ -51,6 +55,7 @@ class TestModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema property
  *
@@ -77,6 +82,7 @@ class TestModel extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * find method
  *
@@ -90,6 +96,7 @@ class TestModel extends CakeTestModel {
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
 		return array($conditions, $fields);
 	}
+
 /**
  * findAll method
  *
@@ -104,6 +111,7 @@ class TestModel extends CakeTestModel {
 		return $conditions;
 	}
 }
+
 /**
  * TestModel2 class
  *
@@ -111,6 +119,7 @@ class TestModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -118,6 +127,7 @@ class TestModel2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel2';
+
 /**
  * useTable property
  *
@@ -126,6 +136,7 @@ class TestModel2 extends CakeTestModel {
  */
 	var $useTable = false;
 }
+
 /**
  * TestModel4 class
  *
@@ -133,6 +144,7 @@ class TestModel2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel3 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -140,6 +152,7 @@ class TestModel3 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel3';
+
 /**
  * useTable property
  *
@@ -148,6 +161,7 @@ class TestModel3 extends CakeTestModel {
  */
 	var $useTable = false;
 }
+
 /**
  * TestModel4 class
  *
@@ -155,6 +169,7 @@ class TestModel3 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel4 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -162,6 +177,7 @@ class TestModel4 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel4';
+
 /**
  * table property
  *
@@ -169,6 +185,7 @@ class TestModel4 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model4';
+
 /**
  * useTable property
  *
@@ -176,6 +193,7 @@ class TestModel4 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -188,6 +206,7 @@ class TestModel4 extends CakeTestModel {
 			'foreignKey' => 'parent_id'
 		)
 	);
+
 /**
  * hasOne property
  *
@@ -200,6 +219,7 @@ class TestModel4 extends CakeTestModel {
 			'foreignKey' => 'test_model4_id'
 		)
 	);
+
 /**
  * hasAndBelongsToMany property
  *
@@ -213,6 +233,7 @@ class TestModel4 extends CakeTestModel {
 		'associationForeignKey' => 'test_model7_id',
 		'with' => 'TestModel4TestModel7'
 	));
+
 /**
  * schema method
  *
@@ -231,6 +252,7 @@ class TestModel4 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel4TestModel7 class
  *
@@ -238,6 +260,7 @@ class TestModel4 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel4TestModel7 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -245,6 +268,7 @@ class TestModel4TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel4TestModel7';
+
 /**
  * table property
  *
@@ -252,6 +276,7 @@ class TestModel4TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model4_test_model7';
+
 /**
  * useTable property
  *
@@ -259,6 +284,7 @@ class TestModel4TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -275,6 +301,7 @@ class TestModel4TestModel7 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel5 class
  *
@@ -282,6 +309,7 @@ class TestModel4TestModel7 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel5 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -289,6 +317,7 @@ class TestModel5 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel5';
+
 /**
  * table property
  *
@@ -296,6 +325,7 @@ class TestModel5 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model5';
+
 /**
  * useTable property
  *
@@ -303,6 +333,7 @@ class TestModel5 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -313,6 +344,7 @@ class TestModel5 extends CakeTestModel {
 		'className' => 'TestModel4',
 		'foreignKey' => 'test_model4_id'
 	));
+
 /**
  * hasMany property
  *
@@ -323,6 +355,7 @@ class TestModel5 extends CakeTestModel {
 		'className' => 'TestModel6',
 		'foreignKey' => 'test_model5_id'
 	));
+
 /**
  * schema method
  *
@@ -342,6 +375,7 @@ class TestModel5 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel6 class
  *
@@ -349,6 +383,7 @@ class TestModel5 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel6 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -356,6 +391,7 @@ class TestModel6 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel6';
+
 /**
  * table property
  *
@@ -363,6 +399,7 @@ class TestModel6 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model6';
+
 /**
  * useTable property
  *
@@ -370,6 +407,7 @@ class TestModel6 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -380,6 +418,7 @@ class TestModel6 extends CakeTestModel {
 		'className' => 'TestModel5',
 		'foreignKey' => 'test_model5_id'
 	));
+
 /**
  * schema method
  *
@@ -399,6 +438,7 @@ class TestModel6 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel7 class
  *
@@ -406,6 +446,7 @@ class TestModel6 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel7 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -413,6 +454,7 @@ class TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel7';
+
 /**
  * table property
  *
@@ -420,6 +462,7 @@ class TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model7';
+
 /**
  * useTable property
  *
@@ -427,6 +470,7 @@ class TestModel7 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -445,6 +489,7 @@ class TestModel7 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel8 class
  *
@@ -452,6 +497,7 @@ class TestModel7 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel8 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -459,6 +505,7 @@ class TestModel8 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel8';
+
 /**
  * table property
  *
@@ -466,6 +513,7 @@ class TestModel8 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model8';
+
 /**
  * useTable property
  *
@@ -473,6 +521,7 @@ class TestModel8 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * hasOne property
  *
@@ -486,6 +535,7 @@ class TestModel8 extends CakeTestModel {
 			'conditions' => 'TestModel9.name != \'mariano\''
 		)
 	);
+
 /**
  * schema method
  *
@@ -505,6 +555,7 @@ class TestModel8 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * TestModel9 class
  *
@@ -512,6 +563,7 @@ class TestModel8 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class TestModel9 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -519,6 +571,7 @@ class TestModel9 extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestModel9';
+
 /**
  * table property
  *
@@ -526,6 +579,7 @@ class TestModel9 extends CakeTestModel {
  * @access public
  */
 	var $table = 'test_model9';
+
 /**
  * useTable property
  *
@@ -533,6 +587,7 @@ class TestModel9 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -544,6 +599,7 @@ class TestModel9 extends CakeTestModel {
 		'foreignKey' => 'test_model8_id',
 		'conditions' => 'TestModel8.name != \'larry\''
 	));
+
 /**
  * schema method
  *
@@ -563,6 +619,7 @@ class TestModel9 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Level class
  *
@@ -570,6 +627,7 @@ class TestModel9 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Level extends CakeTestModel {
+
 /**
  * name property
  *
@@ -577,6 +635,7 @@ class Level extends CakeTestModel {
  * @access public
  */
 	var $name = 'Level';
+
 /**
  * table property
  *
@@ -584,6 +643,7 @@ class Level extends CakeTestModel {
  * @access public
  */
 	var $table = 'level';
+
 /**
  * useTable property
  *
@@ -591,6 +651,7 @@ class Level extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * hasMany property
  *
@@ -605,6 +666,7 @@ class Level extends CakeTestModel {
 			'className' => 'User2'
 		)
 	);
+
 /**
  * schema method
  *
@@ -621,6 +683,7 @@ class Level extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Group class
  *
@@ -628,6 +691,7 @@ class Level extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Group extends CakeTestModel {
+
 /**
  * name property
  *
@@ -635,6 +699,7 @@ class Group extends CakeTestModel {
  * @access public
  */
 	var $name = 'Group';
+
 /**
  * table property
  *
@@ -642,6 +707,7 @@ class Group extends CakeTestModel {
  * @access public
  */
 	var $table = 'group';
+
 /**
  * useTable property
  *
@@ -649,6 +715,7 @@ class Group extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -656,6 +723,7 @@ class Group extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Level');
+
 /**
  * hasMany property
  *
@@ -663,6 +731,7 @@ class Group extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Category2', 'User2');
+
 /**
  * schema method
  *
@@ -681,6 +750,7 @@ class Group extends CakeTestModel {
 	}
 
 }
+
 /**
  * User2 class
  *
@@ -688,6 +758,7 @@ class Group extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class User2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -695,6 +766,7 @@ class User2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'User2';
+
 /**
  * table property
  *
@@ -702,6 +774,7 @@ class User2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'user';
+
 /**
  * useTable property
  *
@@ -709,6 +782,7 @@ class User2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -723,6 +797,7 @@ class User2 extends CakeTestModel {
 			'className' => 'Level'
 		)
 	);
+
 /**
  * hasMany property
  *
@@ -734,6 +809,7 @@ class User2 extends CakeTestModel {
 			'className' => 'Article2'
 		),
 	);
+
 /**
  * schema method
  *
@@ -752,6 +828,7 @@ class User2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Category2 class
  *
@@ -759,6 +836,7 @@ class User2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Category2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -766,6 +844,7 @@ class Category2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'Category2';
+
 /**
  * table property
  *
@@ -773,6 +852,7 @@ class Category2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'category';
+
 /**
  * useTable property
  *
@@ -780,6 +860,7 @@ class Category2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -796,6 +877,7 @@ class Category2 extends CakeTestModel {
 			'foreignKey' => 'parent_id'
 		)
 	);
+
 /**
  * hasMany property
  *
@@ -813,6 +895,7 @@ class Category2 extends CakeTestModel {
 			'foreignKey' => 'category_id',
 			'limit'=>'3')
 	);
+
 /**
  * schema method
  *
@@ -834,6 +917,7 @@ class Category2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Article2 class
  *
@@ -841,6 +925,7 @@ class Category2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Article2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -848,6 +933,7 @@ class Article2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'Article2';
+
 /**
  * table property
  *
@@ -855,6 +941,7 @@ class Article2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'article';
+
 /**
  * useTable property
  *
@@ -862,6 +949,7 @@ class Article2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -872,6 +960,7 @@ class Article2 extends CakeTestModel {
 		'Category2' => array('className' => 'Category2'),
 		'User2' => array('className' => 'User2')
 	);
+
 /**
  * schema method
  *
@@ -905,6 +994,7 @@ class Article2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * CategoryFeatured2 class
  *
@@ -912,6 +1002,7 @@ class Article2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class CategoryFeatured2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -919,6 +1010,7 @@ class CategoryFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'CategoryFeatured2';
+
 /**
  * table property
  *
@@ -926,6 +1018,7 @@ class CategoryFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'category_featured';
+
 /**
  * useTable property
  *
@@ -933,6 +1026,7 @@ class CategoryFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -952,6 +1046,7 @@ class CategoryFeatured2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Featured2 class
  *
@@ -959,6 +1054,7 @@ class CategoryFeatured2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Featured2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -966,6 +1062,7 @@ class Featured2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'Featured2';
+
 /**
  * table property
  *
@@ -973,6 +1070,7 @@ class Featured2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'featured2';
+
 /**
  * useTable property
  *
@@ -980,6 +1078,7 @@ class Featured2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -991,6 +1090,7 @@ class Featured2 extends CakeTestModel {
 			'className' => 'CategoryFeatured2'
 		)
 	);
+
 /**
  * schema method
  *
@@ -1009,6 +1109,7 @@ class Featured2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * Comment2 class
  *
@@ -1016,6 +1117,7 @@ class Featured2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class Comment2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1023,6 +1125,7 @@ class Comment2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'Comment2';
+
 /**
  * table property
  *
@@ -1030,6 +1133,7 @@ class Comment2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'comment';
+
 /**
  * belongsTo property
  *
@@ -1037,6 +1141,7 @@ class Comment2 extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('ArticleFeatured2', 'User2');
+
 /**
  * useTable property
  *
@@ -1044,6 +1149,7 @@ class Comment2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -1062,6 +1168,7 @@ class Comment2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * ArticleFeatured2 class
  *
@@ -1069,6 +1176,7 @@ class Comment2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class ArticleFeatured2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1076,6 +1184,7 @@ class ArticleFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'ArticleFeatured2';
+
 /**
  * table property
  *
@@ -1083,6 +1192,7 @@ class ArticleFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $table = 'article_featured';
+
 /**
  * useTable property
  *
@@ -1090,6 +1200,7 @@ class ArticleFeatured2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * belongsTo property
  *
@@ -1100,6 +1211,7 @@ class ArticleFeatured2 extends CakeTestModel {
 		'CategoryFeatured2' => array('className' => 'CategoryFeatured2'),
 		'User2' => array('className' => 'User2')
 	);
+
 /**
  * hasOne property
  *
@@ -1109,6 +1221,7 @@ class ArticleFeatured2 extends CakeTestModel {
 	var $hasOne = array(
 		'Featured2' => array('className' => 'Featured2')
 	);
+
 /**
  * hasMany property
  *
@@ -1118,6 +1231,7 @@ class ArticleFeatured2 extends CakeTestModel {
 	var $hasMany = array(
 		'Comment2' => array('className'=>'Comment2', 'dependent' => true)
 	);
+
 /**
  * schema method
  *
@@ -1141,6 +1255,7 @@ class ArticleFeatured2 extends CakeTestModel {
 		return $this->_schema;
 	}
 }
+
 /**
  * DboSourceTest class
  *
@@ -1148,6 +1263,7 @@ class ArticleFeatured2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model.datasources
  */
 class DboSourceTest extends CakeTestCase {
+
 /**
  * debug property
  *
@@ -1155,6 +1271,7 @@ class DboSourceTest extends CakeTestCase {
  * @access public
  */
 	var $debug = null;
+
 /**
  * autoFixtures property
  *
@@ -1162,6 +1279,7 @@ class DboSourceTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * fixtures property
  *
@@ -1172,6 +1290,7 @@ class DboSourceTest extends CakeTestCase {
 		'core.apple', 'core.article', 'core.articles_tag', 'core.attachment', 'core.comment',
 		'core.sample', 'core.tag', 'core.user', 'core.post', 'core.author'
 	);
+
 /**
  * startTest method
  *
@@ -1186,6 +1305,7 @@ class DboSourceTest extends CakeTestCase {
 			$class = get_class($db);
 			eval("class DboTest extends $class {
 				var \$simulated = array();
+
 /**
  * execute method
  *
@@ -1197,6 +1317,7 @@ class DboSourceTest extends CakeTestCase {
 					\$this->simulated[] = \$sql;
 					return null;
 				}
+
 /**
  * getLastQuery method
  *
@@ -1215,6 +1336,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->debug = Configure::read('debug');
 		$this->Model =& new TestModel();
 	}
+
 /**
  * endTest method
  *
@@ -1226,6 +1348,7 @@ class DboSourceTest extends CakeTestCase {
 		Configure::write('debug', $this->debug);
 		unset($this->debug);
 	}
+
 /**
  * testFieldDoubleEscaping method
  *
@@ -1266,6 +1389,7 @@ class DboSourceTest extends CakeTestCase {
 
 		ClassRegistry::removeObject('Article');
 	}
+
 /**
  * testGenerateAssociationQuerySelfJoin method
  *
@@ -1356,6 +1480,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertTrue($result);
 		$this->assertEqual($_queryData['joins'][0]['type'], 'INNER');
 	}
+
 /**
  * testGenerateInnerJoinAssociationQuery method
  *
@@ -1379,6 +1504,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/`TestModel9` INNER JOIN `' . $this->testDb->fullTableName('test_model8', false) . '`/', $result);
 
 	}
+
 /**
  * testGenerateAssociationQuerySelfJoinWithConditionsInHasOneBinding method
  *
@@ -1406,6 +1532,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+ON\s+\(`TestModel9`\.`name` != \'mariano\'\s+AND\s+`TestModel9`.`test_model8_id` = `TestModel8`.`id`\)\s+WHERE/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQuerySelfJoinWithConditionsInBelongsToBinding method
  *
@@ -1432,6 +1559,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+ON\s+\(`TestModel8`\.`name` != \'larry\'\s+AND\s+`TestModel9`.`test_model8_id` = `TestModel8`.`id`\)\s+WHERE/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQuerySelfJoinWithConditions method
  *
@@ -1493,6 +1621,7 @@ class DboSourceTest extends CakeTestCase {
 			$result
 		);
 	}
+
 /**
  * testGenerateAssociationQueryHasOne method
  *
@@ -1525,6 +1654,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/`test_model5` AS `TestModel5`\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasOneWithConditions method
  *
@@ -1554,6 +1684,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id`\s+=\s+`TestModel4`.`id`\)\s+WHERE/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*`TestModel5`.`name`\s+!=\s+\'mariano\'\s*(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryBelongsTo method
  *
@@ -1585,6 +1716,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE\s+/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryBelongsToWithConditions method
  *
@@ -1616,6 +1748,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE\s+/', $result);
 		$this->assertPattern('/\s+WHERE\s+`TestModel5`.`name` != \'mariano\'\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasMany method
  *
@@ -1645,6 +1778,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasManyWithLimit method
  *
@@ -1684,6 +1818,7 @@ class DboSourceTest extends CakeTestCase {
 			'\s*$/', $result
 		);
 	}
+
 /**
  * testGenerateAssociationQueryHasManyWithConditions method
  *
@@ -1712,6 +1847,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?`TestModel5`.`name`\s+!=\s+\'mariano\'(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasManyWithOffsetAndLimit method
  *
@@ -1749,6 +1885,7 @@ class DboSourceTest extends CakeTestCase {
 
 		$this->Model->hasMany['TestModel6'] = $__backup;
 	}
+
 /**
  * testGenerateAssociationQueryHasManyWithPageAndLimit method
  *
@@ -1785,6 +1922,7 @@ class DboSourceTest extends CakeTestCase {
 
 		$this->Model->hasMany['TestModel6'] = $__backup;
 	}
+
 /**
  * testGenerateAssociationQueryHasManyWithFields method
  *
@@ -1910,6 +2048,7 @@ class DboSourceTest extends CakeTestCase {
 
 		unset($this->Model->hasMany['TestModel6']['fields']);
 	}
+
 /**
  * testGenerateAssociationQueryHasAndBelongsToMany method
  *
@@ -1940,6 +2079,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE/', $result);
 		$this->assertPattern('/\s+WHERE\s+(?:\()?1 = 1(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasAndBelongsToManyWithConditions method
  *
@@ -1968,6 +2108,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
 		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE\s+(?:\()?`TestModel4`.`name`\s+!=\s+\'mariano\'(?:\))?\s*$/', $result);
 	}
+
 /**
  * testGenerateAssociationQueryHasAndBelongsToManyWithOffsetAndLimit method
  *
@@ -2004,6 +2145,7 @@ class DboSourceTest extends CakeTestCase {
 
 		$this->Model->hasAndBelongsToMany['TestModel7'] = $__backup;
 	}
+
 /**
  * testGenerateAssociationQueryHasAndBelongsToManyWithPageAndLimit method
  *
@@ -2040,6 +2182,7 @@ class DboSourceTest extends CakeTestCase {
 
 		$this->Model->hasAndBelongsToMany['TestModel7'] = $__backup;
 	}
+
 /**
  * buildRelatedModels method
  *
@@ -2060,6 +2203,7 @@ class DboSourceTest extends CakeTestCase {
 			}
 		}
 	}
+
 /**
  * &_prepareAssociationQuery method
  *
@@ -2082,6 +2226,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = array_merge(array('linkModel' => &$linkModel), compact('type', 'assoc', 'assocData', 'external'));
 		return $result;
 	}
+
 /**
  * testSelectDistict method
  *
@@ -2093,6 +2238,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = array('DISTINCT `Vendor`.`id`', '`Vendor`.`name`');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testStringConditionsParsing method
  *
@@ -2133,7 +2279,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array(2=>1, 2, 10)));
-		$expected = " WHERE `score` IN (1, 2, 10)";
+		$expected = " WHERE score IN (1, 2, 10)";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions("Aro.rght = Aro.lft + 1.1");
@@ -2209,6 +2355,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = " WHERE `Artist`.`name` = 'JUDY AND MARY'";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testQuotesInStringConditions method
  *
@@ -2233,6 +2380,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = ' WHERE `Member`.`email` = "mariano@cricava.com" AND `Member`.`user` LIKE "mariano.iglesias%"';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testParenthesisInStringConditions method
  *
@@ -2282,6 +2430,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->conditions('Member.name = \'(mariano.iglesias) CakePHP\'');
 		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\) CakePHP\'$/', $result);
 	}
+
 /**
  * testParenthesisInArrayConditions method
  *
@@ -2331,6 +2480,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->conditions(array('Member.name' => '(mariano.iglesias) CakePHP'));
 		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\) CakePHP\'$/', $result);
 	}
+
 /**
  * testArrayConditionsParsing method
  *
@@ -2385,7 +2535,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array(1, 2, 10)));
-		$expected = " WHERE `score` IN (1, 2, 10)";
+		$expected = " WHERE score IN (1, 2, 10)";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array()));
@@ -2476,7 +2626,7 @@ class DboSourceTest extends CakeTestCase {
 			'NOT' => array('Course.id' => null, 'Course.vet' => 'N', 'level_of_education_id' => array(912,999)),
 			'Enrollment.yearcompleted >' => '0')
 		);
-		$this->assertPattern('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(`level_of_education_id` IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
+		$this->assertPattern('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(level_of_education_id IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
 
 		$result = $this->testDb->conditions(array('id <>' => '8'));
 		$this->assertPattern('/^\s*WHERE\s+`id`\s+<>\s+\'8\'\s*$/', $result);
@@ -2495,16 +2645,24 @@ class DboSourceTest extends CakeTestCase {
 			"Listing.description LIKE" => "%term_2%"
 		);
 		$result = $this->testDb->conditions($conditions);
-		$expected = " WHERE NOT (`Listing`.`expiration` BETWEEN '1' AND '100') AND ((`Listing`.`title` LIKE '%term%') OR (`Listing`.`description` LIKE '%term%')) AND ((`Listing`.`title` LIKE '%term_2%') OR (`Listing`.`description` LIKE '%term_2%'))";
+		$expected = " WHERE NOT (`Listing`.`expiration` BETWEEN '1' AND '100') AND" .
+		" ((`Listing`.`title` LIKE '%term%') OR (`Listing`.`description` LIKE '%term%')) AND" .
+		" ((`Listing`.`title` LIKE '%term_2%') OR (`Listing`.`description` LIKE '%term_2%'))";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('MD5(CONCAT(Reg.email,Reg.id))' => 'blah'));
 		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) = 'blah'";
 		$this->assertEqual($result, $expected);
 
+		$result = $this->testDb->conditions(array(
+			'MD5(CONCAT(Reg.email,Reg.id))' => array('blah', 'blahblah')
+		));
+		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) IN ('blah', 'blahblah')";
+		$this->assertEqual($result, $expected);
+
 		$conditions = array('id' => array(2, 5, 6, 9, 12, 45, 78, 43, 76));
 		$result = $this->testDb->conditions($conditions);
-		$expected = " WHERE `id` IN (2, 5, 6, 9, 12, 45, 78, 43, 76)";
+		$expected = " WHERE id IN (2, 5, 6, 9, 12, 45, 78, 43, 76)";
 		$this->assertEqual($result, $expected);
 
 		$conditions = array('title' => 'user(s)');
@@ -2554,6 +2712,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = " WHERE '2009-03-04' BETWEEN Model.field1 AND Model.field2";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testArrayConditionsParsingComplexKeys method
  *
@@ -2579,6 +2738,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = " WHERE (`Stats`.`clicks` * 100) / `Stats`.`views` > 50";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMixedConditionsParsing method
  *
@@ -2600,6 +2760,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->conditions($conditions);
 		$this->assertPattern('/^\s*WHERE\s+`Thread`.`project_id`\s*=\s*5\s+AND\s+`Thread`.`buyer_id`\s*=\s*14\s+AND\s+1\s*=\s*1\s+GROUP BY `Thread`.`project_id`$/', $result);
 	}
+
 /**
  * testConditionsOptionalArguments method
  *
@@ -2613,6 +2774,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->conditions( array(), true, false);
 		$this->assertPattern('/^\s*1\s*=\s*1\s*$/', $result);
 	}
+
 /**
  * testConditionsWithModel
  *
@@ -2646,6 +2808,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = " WHERE `Article2`.`rate_sum` BETWEEN 1 AND 10";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFieldParsing method
  *
@@ -2766,6 +2929,7 @@ class DboSourceTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMergeAssociations method
  *
@@ -3039,6 +3203,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->testDb->__mergeAssociation($data, $merge, 'Tag', 'hasOne');
 		$this->assertEqual($data, $expected);
 	}
+
 /**
  * testRenderStatement method
  *
@@ -3064,6 +3229,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->renderStatement('delete', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => 'alias', 'joins' => ''));
 		$this->assertPattern('/^\s*DELETE\s+alias\s+FROM\s+table\s+AS\s+alias\s+WHERE\s+1=1\s*$/', $result);
 	}
+
 /**
  * testStatements method
  *
@@ -3106,6 +3272,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->getLastQuery();
 		$this->assertPattern('/^\s*INSERT INTO\s+' . $this->testDb->fullTableName('articles') . '\s+\(`field`\)\s+VALUES\s+\(1\),\s*\(2\)\s*$/', $result);
 	}
+
 /**
  * testSchema method
  *
@@ -3126,6 +3293,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->dropSchema($Schema, 'table');
 		$this->assertPattern('/^\s*DROP TABLE IF EXISTS\s+' . $this->testDb->fullTableName('table') . ';\s*$/s', $result);
 	}
+
 /**
  * testMagicMethodQuerying method
  *
@@ -3197,6 +3365,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->query('directCall', false, $this->Model);
 		$this->assertFalse($result);
 	}
+
 /**
  * testOrderParsing method
  *
@@ -3272,6 +3441,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = ' ORDER BY `Property`.`sale_price` IS NULL ASC';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testComplexSortExpression method
  *
@@ -3282,6 +3452,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->order(array('(Model.field > 100) DESC', 'Model.field ASC'));
 		$this->assertPattern("/^\s*ORDER BY\s+\(`Model`\.`field`\s+>\s+100\)\s+DESC,\s+`Model`\.`field`\s+ASC\s*$/", $result);
 	}
+
 /**
  * testCalculations method
  *
@@ -3323,6 +3494,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->calculate($this->Model, 'min', 'left');
 		$this->assertEqual($result, 'MIN(`left`) AS `left`');
 	}
+
 /**
  * testLength method
  *
@@ -3366,6 +3538,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = null;
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testBuildIndex method
  *
@@ -3394,6 +3567,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = array('UNIQUE KEY MyIndex (`id`, `name`)');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testBuildColumn method
  *
@@ -3434,6 +3608,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = '`int_field` int(11) NOT NULL';
 		$this->assertTrue($result, $expected);
 	}
+
 /**
  * test hasAny()
  *
@@ -3448,6 +3623,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = "SELECT COUNT(`TestModel`.`id`) AS count FROM `test_models` AS `TestModel` WHERE `TestModel`.`name` = 'harry'";
 		$this->assertEqual($this->testDb->simulated[1], $expected);
 	}
+
 /**
  * testIntrospectType method
  *
@@ -3608,6 +3784,7 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->testDb->value('a bc', 'string');
 		$this->assertEqual($result, "'a bc'");
 	}
+
 /**
  * testValue method
  *
@@ -3622,6 +3799,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = array('\'first\'', 2, '\'third\'');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testReconnect method
  *
@@ -3633,6 +3811,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertTrue($this->testDb->connected);
 		$this->assertEqual($this->testDb->config['prefix'], 'foo');
 	}
+
 /**
  * testRealQueries method
  *
@@ -3702,6 +3881,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/Comment[id=2]', $result));
 		$this->assertFalse(Set::matches('/Comment[id=10]', $result));
 	}
+
 /**
  * testName method
  *
@@ -3729,6 +3909,7 @@ class DboSourceTest extends CakeTestCase {
 		$expected = 'Function(`Something`.`foo`)';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testLog method
  *
@@ -3784,6 +3965,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->testDb->error = $oldError;
 		Configure::write('debug', $oldDebug);
 	}
+
 /**
  * test ShowQuery generation of regular and error messages
  *
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index 82d4d15ad..b56fcaa58 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * DbAclTest file
  *
@@ -29,6 +30,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 }
 App::import('Component', 'Acl');
 App::import('Core', 'db_acl');
+
 /**
  * DB ACL wrapper test class
  *
@@ -36,6 +38,7 @@ App::import('Core', 'db_acl');
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAclNodeTestBase extends AclNode {
+
 /**
  * useDbConfig property
  *
@@ -43,6 +46,7 @@ class DbAclNodeTestBase extends AclNode {
  * @access public
  */
 	var $useDbConfig = 'test_suite';
+
 /**
  * cacheSources property
  *
@@ -51,6 +55,7 @@ class DbAclNodeTestBase extends AclNode {
  */
 	var $cacheSources = false;
 }
+
 /**
  * Aro Test Wrapper
  *
@@ -58,6 +63,7 @@ class DbAclNodeTestBase extends AclNode {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAroTest extends DbAclNodeTestBase {
+
 /**
  * name property
  *
@@ -65,6 +71,7 @@ class DbAroTest extends DbAclNodeTestBase {
  * @access public
  */
 	var $name = 'DbAroTest';
+
 /**
  * useTable property
  *
@@ -72,6 +79,7 @@ class DbAroTest extends DbAclNodeTestBase {
  * @access public
  */
 	var $useTable = 'aros';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -80,6 +88,7 @@ class DbAroTest extends DbAclNodeTestBase {
  */
 	var $hasAndBelongsToMany = array('DbAcoTest' => array('with' => 'DbPermissionTest'));
 }
+
 /**
  * Aco Test Wrapper
  *
@@ -87,6 +96,7 @@ class DbAroTest extends DbAclNodeTestBase {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAcoTest extends DbAclNodeTestBase {
+
 /**
  * name property
  *
@@ -94,6 +104,7 @@ class DbAcoTest extends DbAclNodeTestBase {
  * @access public
  */
 	var $name = 'DbAcoTest';
+
 /**
  * useTable property
  *
@@ -101,6 +112,7 @@ class DbAcoTest extends DbAclNodeTestBase {
  * @access public
  */
 	var $useTable = 'acos';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -109,6 +121,7 @@ class DbAcoTest extends DbAclNodeTestBase {
  */
 	var $hasAndBelongsToMany = array('DbAroTest' => array('with' => 'DbPermissionTest'));
 }
+
 /**
  * Permission Test Wrapper
  *
@@ -116,6 +129,7 @@ class DbAcoTest extends DbAclNodeTestBase {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbPermissionTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -123,6 +137,7 @@ class DbPermissionTest extends CakeTestModel {
  * @access public
  */
 	var $name = 'DbPermissionTest';
+
 /**
  * useTable property
  *
@@ -130,6 +145,7 @@ class DbPermissionTest extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'aros_acos';
+
 /**
  * cacheQueries property
  *
@@ -137,6 +153,7 @@ class DbPermissionTest extends CakeTestModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * belongsTo property
  *
@@ -145,6 +162,7 @@ class DbPermissionTest extends CakeTestModel {
  */
 	var $belongsTo = array('DbAroTest' => array('foreignKey' => 'aro_id'), 'DbAcoTest' => array('foreignKey' => 'aco_id'));
 }
+
 /**
  * DboActionTest class
  *
@@ -152,6 +170,7 @@ class DbPermissionTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAcoActionTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -159,6 +178,7 @@ class DbAcoActionTest extends CakeTestModel {
  * @access public
  */
 	var $name = 'DbAcoActionTest';
+
 /**
  * useTable property
  *
@@ -166,6 +186,7 @@ class DbAcoActionTest extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'aco_actions';
+
 /**
  * belongsTo property
  *
@@ -174,6 +195,7 @@ class DbAcoActionTest extends CakeTestModel {
  */
 	var $belongsTo = array('DbAcoTest' => array('foreignKey' => 'aco_id'));
 }
+
 /**
  * DbAroUserTest class
  *
@@ -181,6 +203,7 @@ class DbAcoActionTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAroUserTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -188,6 +211,7 @@ class DbAroUserTest extends CakeTestModel {
  * @access public
  */
 	var $name = 'AuthUser';
+
 /**
  * useTable property
  *
@@ -210,6 +234,7 @@ class DbAroUserTest extends CakeTestModel {
 		}
 	}
 }
+
 /**
  * DbAclTest class
  *
@@ -217,6 +242,7 @@ class DbAroUserTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class DbAclTest extends DbAcl {
+
 /**
  * construct method
  *
@@ -230,6 +256,7 @@ class DbAclTest extends DbAcl {
 		$this->Aro->Permission =& new DbPermissionTest();
 	}
 }
+
 /**
  * AclNodeTest class
  *
@@ -237,6 +264,7 @@ class DbAclTest extends DbAcl {
  * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
  */
 class AclNodeTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -244,6 +272,7 @@ class AclNodeTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.aro', 'core.aco', 'core.aros_aco', 'core.aco_action', 'core.auth_user');
+
 /**
  * setUp method
  *
@@ -254,6 +283,7 @@ class AclNodeTest extends CakeTestCase {
 		Configure::write('Acl.classname', 'DbAclTest');
 		Configure::write('Acl.database', 'test_suite');
 	}
+
 /**
  * testNode method
  *
@@ -333,6 +363,7 @@ class AclNodeTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 	}
+
 /**
  * testNodeAliasParenting method
  *
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index 2cc00c3e2..11e6f7262 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ModelTest file
  *
@@ -26,13 +27,17 @@
  */
 App::import('Core', array('AppModel', 'Model'));
 require_once dirname(__FILE__) . DS . 'models.php';
+
+SimpleTest::ignore('BaseModelTest');
+
 /**
- * ModelTest
+ * ModelBaseTest
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
  */
-class ModelTest extends CakeTestCase {
+class BaseModelTest extends CakeTestCase {
+
 /**
  * autoFixtures property
  *
@@ -40,6 +45,7 @@ class ModelTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * fixtures property
  *
@@ -69,6 +75,7 @@ class ModelTest extends CakeTestCase {
 		'core.uuiditems_uuidportfolio', 'core.uuiditems_uuidportfolio_numericid', 'core.fruit',
 		'core.fruits_uuid_tag', 'core.uuid_tag'
 	);
+
 /**
  * start method
  *
@@ -80,6 +87,7 @@ class ModelTest extends CakeTestCase {
 		$this->debug = Configure::read('debug');
 		Configure::write('debug', 2);
 	}
+
 /**
  * end method
  *
@@ -90,6 +98,7 @@ class ModelTest extends CakeTestCase {
 		parent::end();
 		Configure::write('debug', $this->debug);
 	}
+
 /**
  * endTest method
  *
@@ -99,12915 +108,5 @@ class ModelTest extends CakeTestCase {
 	function endTest() {
 		ClassRegistry::flush();
 	}
-
-/**
- * Tests getAssociated method
- *
- * @access public
- * @return void
- */
-	function testGetAssociated() {
-		$this->loadFixtures('Article');
-		$Article = ClassRegistry::init('Article');
-
-		$assocTypes = array('hasMany', 'hasOne', 'belongsTo', 'hasAndBelongsToMany');
-		foreach ($assocTypes as $type) {
-			 $this->assertEqual($Article->getAssociated($type), array_keys($Article->{$type}));
-		}
-
-		$Article->bindModel(array('hasMany' => array('Category')));
-		$this->assertEqual($Article->getAssociated('hasMany'), array('Comment', 'Category'));
-
-		$results = $Article->getAssociated();
-		$this->assertEqual(sort(array_keys($results)), array('Category', 'Comment', 'Tag'));
-
-		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
-		$this->assertEqual($Article->getAssociated('hasAndBelongsToMany'), array());
-
-		$result = $Article->getAssociated('Category');
-		$expected = array(
-			'className' => 'Category',
-			'foreignKey' => 'article_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'dependent' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => '',
-			'association' => 'hasMany',
-		);
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * testAutoConstructAssociations method
- *
- * @access public
- * @return void
- */
-	function testAutoConstructAssociations() {
-		$this->loadFixtures('User', 'ArticleFeatured');
-		$TestModel =& new AssociationTest1();
-
-		$result = $TestModel->hasAndBelongsToMany;
-		$expected = array('AssociationTest2' => array(
-				'unique' => false,
-				'joinTable' => 'join_as_join_bs',
-				'foreignKey' => false,
-				'className' => 'AssociationTest2',
-				'with' => 'JoinAsJoinB',
-				'associationForeignKey' => 'join_b_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
-				'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
-		));
-		$this->assertEqual($result, $expected);
-
-		// Tests related to ticket https://trac.cakephp.org/ticket/5594
-		$TestModel =& new ArticleFeatured();
-		$TestFakeModel =& new ArticleFeatured(array('table' => false));
-
-		$expected = array(
-			'User' => array(
-				'className' => 'User', 'foreignKey' => 'user_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
-			),
-			'Category' => array(
-				'className' => 'Category', 'foreignKey' => 'category_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
-			)
-		);
-		$this->assertIdentical($TestModel->belongsTo, $expected);
-		$this->assertIdentical($TestFakeModel->belongsTo, $expected);
-
-		$this->assertEqual($TestModel->User->name, 'User');
-		$this->assertEqual($TestFakeModel->User->name, 'User');
-		$this->assertEqual($TestModel->Category->name, 'Category');
-		$this->assertEqual($TestFakeModel->Category->name, 'Category');
-
-		$expected = array(
-			'Featured' => array(
-				'className' => 'Featured',
-				'foreignKey' => 'article_featured_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => '',
-				'dependent' => ''
-		));
-
-		$this->assertIdentical($TestModel->hasOne, $expected);
-		$this->assertIdentical($TestFakeModel->hasOne, $expected);
-
-		$this->assertEqual($TestModel->Featured->name, 'Featured');
-		$this->assertEqual($TestFakeModel->Featured->name, 'Featured');
-
-		$expected = array(
-			'Comment' => array(
-				'className' => 'Comment',
-				'dependent' => true,
-				'foreignKey' => 'article_featured_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => '',
-				'limit' => '',
-				'offset' => '',
-				'exclusive' => '',
-				'finderQuery' => '',
-				'counterQuery' => ''
-		));
-
-		$this->assertIdentical($TestModel->hasMany, $expected);
-		$this->assertIdentical($TestFakeModel->hasMany, $expected);
-
-		$this->assertEqual($TestModel->Comment->name, 'Comment');
-		$this->assertEqual($TestFakeModel->Comment->name, 'Comment');
-
-		$expected = array(
-			'Tag' => array(
-				'className' => 'Tag',
-				'joinTable' => 'article_featureds_tags',
-				'with' => 'ArticleFeaturedsTag',
-				'foreignKey' => 'article_featured_id',
-				'associationForeignKey' => 'tag_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => '',
-				'limit' => '',
-				'offset' => '',
-				'unique' => true,
-				'finderQuery' => '',
-				'deleteQuery' => '',
-				'insertQuery' => ''
-		));
-
-		$this->assertIdentical($TestModel->hasAndBelongsToMany, $expected);
-		$this->assertIdentical($TestFakeModel->hasAndBelongsToMany, $expected);
-
-		$this->assertEqual($TestModel->Tag->name, 'Tag');
-		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
-	}
-/**
- * test Model::__construct
- *
- * ensure that $actsAS and $_findMethods are merged.
- *
- * @return void
- **/
-	function testConstruct() {
-		$this->loadFixtures('Post', 'Comment');
-
-		$TestModel =& ClassRegistry::init('MergeVarPluginPost');
-		$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
-		$this->assertTrue(isset($TestModel->Behaviors->Containable));
-		$this->assertTrue(isset($TestModel->Behaviors->Tree));
-
-		$TestModel =& ClassRegistry::init('MergeVarPluginComment');
-		$expected = array('Containable', 'Containable' => array('some_settings'));
-		$this->assertEqual($TestModel->actsAs, $expected);
-		$this->assertTrue(isset($TestModel->Behaviors->Containable));
-	}
-/**
- * test Model::__construct
- *
- * ensure that $actsAS and $_findMethods are merged.
- *
- * @return void
- **/
-	function testConstructWithAlternateDataSource() {
-		$TestModel =& ClassRegistry::init(array(
-			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
-		));
-		$this->assertEqual('test_suite', $TestModel->useDbConfig);
-
-		//deprecated but test it anyway
-		$NewVoid =& new TheVoid(null, false, 'other');
-		$this->assertEqual('other', $NewVoid->useDbConfig);
-	}
-/**
- * testColumnTypeFetching method
- *
- * @access public
- * @return void
- */
-	function testColumnTypeFetching() {
-		$model =& new Test();
-		$this->assertEqual($model->getColumnType('id'), 'integer');
-		$this->assertEqual($model->getColumnType('notes'), 'text');
-		$this->assertEqual($model->getColumnType('updated'), 'datetime');
-		$this->assertEqual($model->getColumnType('unknown'), null);
-
-		$model =& new Article();
-		$this->assertEqual($model->getColumnType('User.created'), 'datetime');
-		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
-		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
-	}
-
-/**
- * testMultipleBelongsToWithSameClass method
- *
- * @access public
- * @return void
- */
-	function testMultipleBelongsToWithSameClass() {
-		$this->loadFixtures(
-			'DeviceType',
-			'DeviceTypeCategory',
-			'FeatureSet',
-			'ExteriorTypeCategory',
-			'Document',
-			'Device',
-			'DocumentDirectory'
-		);
-
-		$DeviceType =& new DeviceType();
-
-		$DeviceType->recursive = 2;
-		$result = $DeviceType->read(null, 1);
-
-		$expected = array(
-			'DeviceType' => array(
-				'id' => 1,
-				'device_type_category_id' => 1,
-				'feature_set_id' => 1,
-				'exterior_type_category_id' => 1,
-				'image_id' => 1,
-				'extra1_id' => 1,
-				'extra2_id' => 1,
-				'name' => 'DeviceType 1',
-				'order' => 0
-			),
-			'Image' => array(
-				'id' => 1,
-				'document_directory_id' => 1,
-				'name' => 'Document 1',
-				'DocumentDirectory' => array(
-					'id' => 1,
-					'name' => 'DocumentDirectory 1'
-			)),
-			'Extra1' => array(
-				'id' => 1,
-				'document_directory_id' => 1,
-				'name' => 'Document 1',
-				'DocumentDirectory' => array(
-					'id' => 1,
-					'name' => 'DocumentDirectory 1'
-			)),
-			'Extra2' => array(
-				'id' => 1,
-				'document_directory_id' => 1,
-				'name' => 'Document 1',
-				'DocumentDirectory' => array(
-					'id' => 1,
-					'name' => 'DocumentDirectory 1'
-			)),
-			'DeviceTypeCategory' => array(
-				'id' => 1,
-				'name' => 'DeviceTypeCategory 1'
-			),
-			'FeatureSet' => array(
-				'id' => 1,
-				'name' => 'FeatureSet 1'
-			),
-			'ExteriorTypeCategory' => array(
-				'id' => 1,
-				'image_id' => 1,
-				'name' => 'ExteriorTypeCategory 1',
-				'Image' => array(
-					'id' => 1,
-					'device_type_id' => 1,
-					'name' => 'Device 1',
-					'typ' => 1
-			)),
-			'Device' => array(
-				array(
-					'id' => 1,
-					'device_type_id' => 1,
-					'name' => 'Device 1',
-					'typ' => 1
-				),
-				array(
-					'id' => 2,
-					'device_type_id' => 1,
-					'name' => 'Device 2',
-					'typ' => 1
-				),
-				array(
-					'id' => 3,
-					'device_type_id' => 1,
-					'name' => 'Device 3',
-					'typ' => 2
-		)));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmRecursiveBelongsTo method
- *
- * @access public
- * @return void
- */
-	function testHabtmRecursiveBelongsTo() {
-		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio', 'Syfile', 'Image');
-		$Portfolio =& new Portfolio();
-
-		$result = $Portfolio->find(array('id' => 2), null, null, 3);
-		$expected = array(
-			'Portfolio' => array(
-				'id' => 2,
-				'seller_id' => 1,
-				'name' => 'Portfolio 2'
-			),
-			'Item' => array(
-				array(
-					'id' => 2,
-					'syfile_id' => 2,
-					'published' => 0,
-					'name' => 'Item 2',
-					'ItemsPortfolio' => array(
-						'id' => 2,
-						'item_id' => 2,
-						'portfolio_id' => 2
-					),
-					'Syfile' => array(
-						'id' => 2,
-						'image_id' => 2,
-						'name' => 'Syfile 2',
-						'item_count' => null,
-						'Image' => array(
-							'id' => 2,
-							'name' => 'Image 2'
-						)
-				)),
-				array(
-					'id' => 6,
-					'syfile_id' => 6,
-					'published' => 0,
-					'name' => 'Item 6',
-					'ItemsPortfolio' => array(
-						'id' => 6,
-						'item_id' => 6,
-						'portfolio_id' => 2
-					),
-					'Syfile' => array(
-						'id' => 6,
-						'image_id' => null,
-						'name' => 'Syfile 6',
-						'item_count' => null,
-						'Image' => array()
-		))));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmUuidWithUuidId method
- *
- * @access public
- * @return void
- */
-	function testHabtmUuidWithUuidId() {
-		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolio');
-		$TestModel =& new Uuidportfolio();
-
-		$data = array('Uuidportfolio' => array('name' => 'Portfolio 3'));
-		$data['Uuiditem']['Uuiditem'] = array('483798c8-c7cc-430e-8cf9-4fcc40cf8569');
-		$TestModel->create($data);
-		$TestModel->save();
-		$id = $TestModel->id;
-		$result = $TestModel->read(null, $id);
-		$this->assertEqual(1, count($result['Uuiditem']));
-		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
-	}
-/**
- * test HABTM saving when join table has no primary key and only 2 columns.
- *
- * @return void
- **/
-	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
-		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
-		$Fruit =& new Fruit();
-		$data = array(
-			'Fruit' => array(
-				'color' => 'Red',
-				'shape' => 'Heart-shaped',
-				'taste' => 'sweet',
-				'name' => 'Strawberry',
-			),
-			'UuidTag' => array(
-				'UuidTag' => array(
-					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
-				)
-			)
-		);
-		$this->assertTrue($Fruit->save($data));
-	}
-/**
- * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
- *
- * @return void
- **/
-	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
-		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
-		$Fruit =& new FruitNoWith();
-		$data = array(
-			'Fruit' => array(
-				'color' => 'Red',
-				'shape' => 'Heart-shaped',
-				'taste' => 'sweet',
-				'name' => 'Strawberry',
-			),
-			'UuidTag' => array(
-				'UuidTag' => array(
-					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
-				)
-			)
-		);
-		$this->assertTrue($Fruit->save($data));
-	}
-
-/**
- * testHabtmUuidWithNumericId method
- *
- * @access public
- * @return void
- */
-	function testHabtmUuidWithNumericId() {
-		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolioNumericid');
-		$TestModel =& new Uuiditem();
-
-		$data = array('Uuiditem' => array('name' => 'Item 7', 'published' => 0));
-		$data['Uuidportfolio']['Uuidportfolio'] = array('480af662-eb8c-47d3-886b-230540cf8569');
-		$TestModel->create($data);
-		$TestModel->save();
-		$id = $TestModel->id;
-		$result = $TestModel->read(null, $id);
-		$this->assertEqual(1, count($result['Uuidportfolio']));
-	}
-/**
- * testHabtmFinderQuery method
- *
- * @access public
- * @return void
- */
-	function testHabtmFinderQuery() {
-		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
-		$Article =& new Article();
-
-		$sql = $this->db->buildStatement(
-			array(
-				'fields' => $this->db->fields($Article->Tag, null, array(
-					'Tag.id', 'Tag.tag', 'ArticlesTag.article_id', 'ArticlesTag.tag_id'
-				)),
-				'table' => $this->db->fullTableName('tags'),
-				'alias' => 'Tag',
-				'limit' => null,
-				'offset' => null,
-				'group' => null,
-				'joins' => array(array(
-					'alias' => 'ArticlesTag',
-					'table' => $this->db->fullTableName('articles_tags'),
-					'conditions' => array(
-						array("ArticlesTag.article_id" => '{$__cakeID__$}'),
-						array("ArticlesTag.tag_id" => $this->db->identifier('Tag.id'))
-					)
-				)),
-				'conditions' => array(),
-				'order' => null
-			),
-			$Article
-		);
-
-		$Article->hasAndBelongsToMany['Tag']['finderQuery'] = $sql;
-		$result = $Article->find('first');
-		$expected = array(
-			array(
-				'id' => '1',
-				'tag' => 'tag1'
-			),
-			array(
-				'id' => '2',
-				'tag' => 'tag2'
-		));
-
-		$this->assertEqual($result['Tag'], $expected);
-	}
-/**
- * testHabtmLimitOptimization method
- *
- * @access public
- * @return void
- */
-	function testHabtmLimitOptimization() {
-		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
-		$TestModel =& new Article();
-
-		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 2;
-		$result = $TestModel->read(null, 2);
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'Second Article',
-				'body' => 'Second Article Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:41:23',
-				'updated' => '2007-03-18 10:43:31'
-			),
-			'User' => array(
-				'id' => '3',
-				'user' => 'larry',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:20:23',
-				'updated' => '2007-03-17 01:22:31'
-			),
-			'Comment' => array(
-				array(
-					'id' => '5',
-					'article_id' => '2',
-					'user_id' => '1',
-					'comment' => 'First Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:53:23',
-					'updated' => '2007-03-18 10:55:31'
-				),
-				array(
-					'id' => '6',
-					'article_id' => '2',
-					'user_id' => '2',
-					'comment' => 'Second Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:55:23',
-					'updated' => '2007-03-18 10:57:31'
-			)),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 1;
-		$result = $TestModel->read(null, 2);
-		unset($expected['Tag'][1]);
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmUniqueKey method
- *
- * @access public
- * @return void
- */
-	function testHabtmUniqueKey() {
-		$model =& new Item();
-		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
-	}
-/**
- * testHasManyLimitOptimization method
- *
- * @access public
- * @return void
- */
-	function testHasManyLimitOptimization() {
-		$this->loadFixtures('Project', 'Thread', 'Message', 'Bid');
-		$Project =& new Project();
-		$Project->recursive = 3;
-
-		$result = $Project->find('all');
-		$expected = array(
-			array(
-				'Project' => array(
-					'id' => 1,
-					'name' => 'Project 1'
-				),
-				'Thread' => array(
-					array(
-						'id' => 1,
-						'project_id' => 1,
-						'name' => 'Project 1, Thread 1',
-						'Project' => array(
-							'id' => 1,
-							'name' => 'Project 1',
-							'Thread' => array(
-								array(
-									'id' => 1,
-									'project_id' => 1,
-									'name' => 'Project 1, Thread 1'
-								),
-								array(
-									'id' => 2,
-									'project_id' => 1,
-									'name' => 'Project 1, Thread 2'
-						))),
-						'Message' => array(
-							array(
-								'id' => 1,
-								'thread_id' => 1,
-								'name' => 'Thread 1, Message 1',
-								'Bid' => array(
-									'id' => 1,
-									'message_id' => 1,
-									'name' => 'Bid 1.1'
-					)))),
-					array(
-						'id' => 2,
-						'project_id' => 1,
-						'name' => 'Project 1, Thread 2',
-						'Project' => array(
-							'id' => 1,
-							'name' => 'Project 1',
-							'Thread' => array(
-								array(
-									'id' => 1,
-									'project_id' => 1,
-									'name' => 'Project 1, Thread 1'
-								),
-								array(
-									'id' => 2,
-									'project_id' => 1,
-									'name' => 'Project 1, Thread 2'
-						))),
-						'Message' => array(
-							array(
-								'id' => 2,
-								'thread_id' => 2,
-								'name' => 'Thread 2, Message 1',
-								'Bid' => array(
-									'id' => 4,
-									'message_id' => 2,
-									'name' => 'Bid 2.1'
-			)))))),
-			array(
-				'Project' => array(
-					'id' => 2,
-					'name' => 'Project 2'
-				),
-				'Thread' => array(
-					array(
-						'id' => 3,
-						'project_id' => 2,
-						'name' => 'Project 2, Thread 1',
-						'Project' => array(
-							'id' => 2,
-							'name' => 'Project 2',
-							'Thread' => array(
-								array(
-									'id' => 3,
-									'project_id' => 2,
-									'name' => 'Project 2, Thread 1'
-						))),
-						'Message' => array(
-							array(
-								'id' => 3,
-								'thread_id' => 3,
-								'name' => 'Thread 3, Message 1',
-								'Bid' => array(
-									'id' => 3,
-									'message_id' => 3,
-									'name' => 'Bid 3.1'
-			)))))),
-			array(
-				'Project' => array(
-					'id' => 3,
-					'name' => 'Project 3'
-				),
-				'Thread' => array()
-		));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testWithAssociation method
- *
- * @access public
- * @return void
- */
-	function testWithAssociation() {
-		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
-		$TestModel =& new Something();
-		$result = $TestModel->SomethingElse->find('all');
-
-		$expected = array(
-			array('SomethingElse' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'Something' => array(array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-					'JoinThing' => array('id' => '3', 'something_id' => '3', 'something_else_id' => '1', 'doomed' => '1', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')))),
-			array('SomethingElse' => array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'Something' => array(array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-					'JoinThing' => array('id' => '1', 'something_id' => '1', 'something_else_id' => '2', 'doomed' => '1', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')))),
-			array('SomethingElse' => array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'Something' => array (array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-					'JoinThing' => array('id' => '2', 'something_id' => '2', 'something_else_id' => '3', 'doomed' => '0', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array('Something' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'SomethingElse' => array(
-					array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2')))),
-				array('Something' => array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-					'SomethingElse' => array(
-						array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-						'JoinThing' => array('doomed' => '0', 'something_id' => '2', 'something_else_id' => '3')))),
-				array('Something' => array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-					'SomethingElse' => array(
-						array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '3', 'something_else_id' => '1')))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'Something' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'SomethingElse' => array(array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-					'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2'))));
-		$this->assertEqual($result, $expected);
-
-		$expected = $TestModel->findById(1);
-		$TestModel->set($expected);
-		$TestModel->save();
-		$result = $TestModel->findById(1);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
-		$TestModel->create(array(
-			'Something' => array('id' => 1),
-			'SomethingElse' => array(3, array(
-				'something_else_id' => 1,
-				'doomed' => '1'
-		))));
-
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->save();
-
-		$TestModel->hasAndBelongsToMany['SomethingElse']['order'] = 'SomethingElse.id ASC';
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'Something' => array(
-				'id' => '1',
-				'title' => 'First Post',
-				'body' => 'First Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:39:23',
-				'updated' => $ts),
-				'SomethingElse' => array(
-					array(
-						'id' => '1',
-						'title' => 'First Post',
-						'body' => 'First Post Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:39:23',
-						'updated' => '2007-03-18 10:41:31',
-						'JoinThing' => array(
-							'doomed' => '1',
-							'something_id' => '1',
-							'something_else_id' => '1'
-					)),
-					array(
-						'id' => '2',
-						'title' => 'Second Post',
-						'body' => 'Second Post Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:41:23',
-						'updated' => '2007-03-18 10:43:31',
-						'JoinThing' => array(
-							'doomed' => '1',
-							'something_id' => '1',
-							'something_else_id' => '2'
-					)),
-					array(
-						'id' => '3',
-						'title' => 'Third Post',
-						'body' => 'Third Post Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:43:23',
-						'updated' => '2007-03-18 10:45:31',
-						'JoinThing' => array(
-							'doomed' => '0',
-							'something_id' => '1',
-							'something_else_id' => '3'
-		))));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDynamicAssociations method
- *
- * @access public
- * @return void
- */
-	function testDynamicAssociations() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = $TestModel->hasOne = array();
-		$TestModel->hasMany['Comment'] = array_merge($TestModel->hasMany['Comment'], array(
-			'foreignKey' => false,
-			'conditions' => array('Comment.user_id =' => '2')
-		));
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-		))));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveMultipleHabtm method
- *
- * @access public
- * @return void
- */
-	function testSaveMultipleHabtm() {
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
-		$TestModel = new JoinA();
-		$result = $TestModel->findById(1);
-
-		$expected = array(
-			'JoinA' => array(
-				'id' => 1,
-				'name' => 'Join A 1',
-				'body' => 'Join A 1 Body',
-				'created' => '2008-01-03 10:54:23',
-				'updated' => '2008-01-03 10:54:23'
-			),
-			'JoinB' => array(
-				0 => array(
-					'id' => 2,
-					'name' => 'Join B 2',
-					'created' => '2008-01-03 10:55:02',
-					'updated' => '2008-01-03 10:55:02',
-					'JoinAsJoinB' => array(
-						'id' => 1,
-						'join_a_id' => 1,
-						'join_b_id' => 2,
-						'other' => 'Data for Join A 1 Join B 2',
-						'created' => '2008-01-03 10:56:33',
-						'updated' => '2008-01-03 10:56:33'
-			))),
-			'JoinC' => array(
-				0 => array(
-					'id' => 2,
-					'name' => 'Join C 2',
-					'created' => '2008-01-03 10:56:12',
-					'updated' => '2008-01-03 10:56:12',
-					'JoinAsJoinC' => array(
-						'id' => 1,
-						'join_a_id' => 1,
-						'join_c_id' => 2,
-						'other' => 'Data for Join A 1 Join C 2',
-						'created' => '2008-01-03 10:57:22',
-						'updated' => '2008-01-03 10:57:22'
-		))));
-
-		$this->assertEqual($result, $expected);
-
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->id = 1;
-		$data = array(
-			'JoinA' => array(
-				'id' => '1',
-				'name' => 'New name for Join A 1',
-				'updated' => $ts
-			),
-			'JoinB' => array(
-				array(
-					'id' => 1,
-					'join_b_id' => 2,
-					'other' => 'New data for Join A 1 Join B 2',
-					'created' => $ts,
-					'updated' => $ts
-			)),
-			'JoinC' => array(
-				array(
-					'id' => 1,
-					'join_c_id' => 2,
-					'other' => 'New data for Join A 1 Join C 2',
-					'created' => $ts,
-					'updated' => $ts
-		)));
-
-		$TestModel->set($data);
-		$TestModel->save();
-
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'JoinA' => array(
-				'id' => 1,
-				'name' => 'New name for Join A 1',
-				'body' => 'Join A 1 Body',
-				'created' => '2008-01-03 10:54:23',
-				'updated' => $ts
-			),
-			'JoinB' => array(
-				0 => array(
-					'id' => 2,
-					'name' => 'Join B 2',
-					'created' => '2008-01-03 10:55:02',
-					'updated' => '2008-01-03 10:55:02',
-					'JoinAsJoinB' => array(
-						'id' => 1,
-						'join_a_id' => 1,
-						'join_b_id' => 2,
-						'other' => 'New data for Join A 1 Join B 2',
-						'created' => $ts,
-						'updated' => $ts
-			))),
-			'JoinC' => array(
-				0 => array(
-					'id' => 2,
-					'name' => 'Join C 2',
-					'created' => '2008-01-03 10:56:12',
-					'updated' => '2008-01-03 10:56:12',
-					'JoinAsJoinC' => array(
-						'id' => 1,
-						'join_a_id' => 1,
-						'join_c_id' => 2,
-						'other' => 'New data for Join A 1 Join C 2',
-						'created' => $ts,
-						'updated' => $ts
-		))));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllRecursiveSelfJoin method
- *
- * @access public
- * @return void
- */
-	function testFindAllRecursiveSelfJoin() {
-		$this->loadFixtures('Home', 'AnotherArticle', 'Advertisement');
-		$TestModel =& new Home();
-		$TestModel->recursive = 2;
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Home' => array(
-					'id' => '1',
-					'another_article_id' => '1',
-					'advertisement_id' => '1',
-					'title' => 'First Home',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'AnotherArticle' => array(
-					'id' => '1',
-					'title' => 'First Article',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31',
-					'Home' => array(
-						array(
-							'id' => '1',
-							'another_article_id' => '1',
-							'advertisement_id' => '1',
-							'title' => 'First Home',
-							'created' => '2007-03-18 10:39:23',
-							'updated' => '2007-03-18 10:41:31'
-				))),
-				'Advertisement' => array(
-					'id' => '1',
-					'title' => 'First Ad',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31',
-					'Home' => array(
-						array(
-							'id' => '1',
-							'another_article_id' => '1',
-							'advertisement_id' => '1',
-							'title' => 'First Home',
-							'created' => '2007-03-18 10:39:23',
-							'updated' => '2007-03-18 10:41:31'
-						),
-						array(
-							'id' => '2',
-							'another_article_id' => '3',
-							'advertisement_id' => '1',
-							'title' => 'Second Home',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-			)))),
-			array(
-				'Home' => array(
-					'id' => '2',
-					'another_article_id' => '3',
-					'advertisement_id' => '1',
-					'title' => 'Second Home',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'AnotherArticle' => array(
-					'id' => '3',
-					'title' => 'Third Article',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31',
-					'Home' => array(
-						array(
-							'id' => '2',
-							'another_article_id' => '3',
-							'advertisement_id' => '1',
-							'title' => 'Second Home',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-				))),
-				'Advertisement' => array(
-					'id' => '1',
-					'title' => 'First Ad',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31',
-					'Home' => array(
-						array(
-							'id' => '1',
-							'another_article_id' => '1',
-							'advertisement_id' => '1',
-							'title' => 'First Home',
-							'created' => '2007-03-18 10:39:23',
-							'updated' => '2007-03-18 10:41:31'
-						),
-						array(
-							'id' => '2',
-							'another_article_id' => '3',
-							'advertisement_id' => '1',
-							'title' => 'Second Home',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-		)))));
-
-		$this->assertEqual($result, $expected);
-
-
-
-	}
-/**
- * testFindAllRecursiveWithHabtm method
- *
- * @return void
- * @access public
- */
-	function testFindAllRecursiveWithHabtm() {
-		$this->loadFixtures(
-			'MyCategoriesMyUsers',
-			'MyCategoriesMyProducts',
-			'MyCategory',
-			'MyUser',
-			'MyProduct'
-		);
-
-		$MyUser =& new MyUser();
-		$MyUser->recursive = 2;
-
-		$result = $MyUser->find('all');
-		$expected = array(
-			array(
-				'MyUser' => array('id' => '1', 'firstname' => 'userA'),
-				'MyCategory' => array(
-					array(
-						'id' => '1',
-						'name' => 'A',
-						'MyProduct' => array(
-							array(
-								'id' => '1',
-								'name' => 'book'
-					))),
-					array(
-						'id' => '3',
-						'name' => 'C',
-						'MyProduct' => array(
-							array(
-								'id' => '2',
-								'name' => 'computer'
-			))))),
-			array(
-				'MyUser' => array(
-					'id' => '2',
-					'firstname' => 'userB'
-				),
-				'MyCategory' => array(
-					array(
-						'id' => '1',
-						'name' => 'A',
-						'MyProduct' => array(
-							array(
-								'id' => '1',
-								'name' => 'book'
-					))),
-					array(
-						'id' => '2',
-						'name' => 'B',
-						'MyProduct' => array(
-							array(
-								'id' => '1',
-								'name' => 'book'
-							),
-							array(
-								'id' => '2',
-								'name' => 'computer'
-		))))));
-
-		$this->assertIdentical($result, $expected);
-	}
-/**
- * testFindSelfAssociations method
- *
- * @access public
- * @return void
- */
-	function testFindSelfAssociations() {
-		$this->loadFixtures('Person');
-
-		$TestModel =& new Person();
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 1);
-		$expected = array(
-			'Person' => array(
-				'id' => 1,
-				'name' => 'person',
-				'mother_id' => 2,
-				'father_id' => 3
-			),
-			'Mother' => array(
-				'id' => 2,
-				'name' => 'mother',
-				'mother_id' => 4,
-				'father_id' => 5,
-				'Mother' => array(
-					'id' => 4,
-					'name' => 'mother - grand mother',
-					'mother_id' => 0,
-					'father_id' => 0
-				),
-				'Father' => array(
-					'id' => 5,
-					'name' => 'mother - grand father',
-					'mother_id' => 0,
-					'father_id' => 0
-			)),
-			'Father' => array(
-				'id' => 3,
-				'name' => 'father',
-				'mother_id' => 6,
-				'father_id' => 7,
-				'Father' => array(
-					'id' => 7,
-					'name' => 'father - grand father',
-					'mother_id' => 0,
-					'father_id' => 0
-				),
-				'Mother' => array(
-					'id' => 6,
-					'name' => 'father - grand mother',
-					'mother_id' => 0,
-					'father_id' => 0
-		)));
-
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 3;
-		$result = $TestModel->read(null, 1);
-		$expected = array(
-			'Person' => array(
-				'id' => 1,
-				'name' => 'person',
-				'mother_id' => 2,
-				'father_id' => 3
-			),
-			'Mother' => array(
-				'id' => 2,
-				'name' => 'mother',
-				'mother_id' => 4,
-				'father_id' => 5,
-				'Mother' => array(
-					'id' => 4,
-					'name' => 'mother - grand mother',
-					'mother_id' => 0,
-					'father_id' => 0,
-					'Mother' => array(),
-					'Father' => array()),
-				'Father' => array(
-					'id' => 5,
-					'name' => 'mother - grand father',
-					'mother_id' => 0,
-					'father_id' => 0,
-					'Father' => array(),
-					'Mother' => array()
-			)),
-			'Father' => array(
-				'id' => 3,
-				'name' => 'father',
-				'mother_id' => 6,
-				'father_id' => 7,
-				'Father' => array(
-					'id' => 7,
-					'name' => 'father - grand father',
-					'mother_id' => 0,
-					'father_id' => 0,
-					'Father' => array(),
-					'Mother' => array()
-				),
-				'Mother' => array(
-					'id' => 6,
-					'name' => 'father - grand mother',
-					'mother_id' => 0,
-					'father_id' => 0,
-					'Mother' => array(),
-					'Father' => array()
-		)));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testPluginAssociations method
- *
- * @access public
- * @return void
- */
-	function testPluginAssociations() {
-		$this->loadFixtures('TestPluginArticle', 'User', 'TestPluginComment');
-		$TestModel =& new TestPluginArticle();
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'TestPluginArticle' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Plugin Article',
-					'body' => 'First Plugin Article Body',
-					'published' => 'Y',
-					'created' => '2008-09-24 10:39:23',
-					'updated' => '2008-09-24 10:41:31'
-				),
-				'User' => array(
-					'id' => 1,
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'TestPluginComment' => array(
-					array(
-						'id' => 1,
-						'article_id' => 1,
-						'user_id' => 2,
-						'comment' => 'First Comment for First Plugin Article',
-						'published' => 'Y',
-						'created' => '2008-09-24 10:45:23',
-						'updated' => '2008-09-24 10:47:31'
-					),
-					array(
-						'id' => 2,
-						'article_id' => 1,
-						'user_id' => 4,
-						'comment' => 'Second Comment for First Plugin Article',
-						'published' => 'Y',
-						'created' => '2008-09-24 10:47:23',
-						'updated' => '2008-09-24 10:49:31'
-					),
-					array(
-						'id' => 3,
-						'article_id' => 1,
-						'user_id' => 1,
-						'comment' => 'Third Comment for First Plugin Article',
-						'published' => 'Y',
-						'created' => '2008-09-24 10:49:23',
-						'updated' => '2008-09-24 10:51:31'
-					),
-					array(
-						'id' => 4,
-						'article_id' => 1,
-						'user_id' => 1,
-						'comment' => 'Fourth Comment for First Plugin Article',
-						'published' => 'N',
-						'created' => '2008-09-24 10:51:23',
-						'updated' => '2008-09-24 10:53:31'
-			))),
-			array(
-				'TestPluginArticle' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Plugin Article',
-					'body' => 'Second Plugin Article Body',
-					'published' => 'Y',
-					'created' => '2008-09-24 10:41:23',
-					'updated' => '2008-09-24 10:43:31'
-				),
-				'User' => array(
-					'id' => 3,
-					'user' => 'larry',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23',
-					'updated' => '2007-03-17 01:22:31'
-				),
-				'TestPluginComment' => array(
-					array(
-						'id' => 5,
-						'article_id' => 2,
-						'user_id' => 1,
-						'comment' => 'First Comment for Second Plugin Article',
-						'published' => 'Y',
-						'created' => '2008-09-24 10:53:23',
-						'updated' => '2008-09-24 10:55:31'
-					),
-					array(
-						'id' => 6,
-						'article_id' => 2,
-						'user_id' => 2,
-						'comment' => 'Second Comment for Second Plugin Article',
-						'published' => 'Y',
-						'created' => '2008-09-24 10:55:23',
-						'updated' => '2008-09-24 10:57:31'
-			))),
-			array(
-				'TestPluginArticle' => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Plugin Article',
-					'body' => 'Third Plugin Article Body',
-					'published' => 'Y',
-					'created' => '2008-09-24 10:43:23',
-					'updated' => '2008-09-24 10:45:31'
-				),
-				'User' => array(
-					'id' => 1,
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'TestPluginComment' => array()
-		));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testIdentity method
- *
- * @access public
- * @return void
- */
-	function testIdentity() {
-		$TestModel =& new Test();
-		$result = $TestModel->alias;
-		$expected = 'Test';
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new TestAlias();
-		$result = $TestModel->alias;
-		$expected = 'TestAlias';
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Test(array('alias' => 'AnotherTest'));
-		$result = $TestModel->alias;
-		$expected = 'AnotherTest';
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testCreation method
- *
- * @access public
- * @return void
- */
-	function testCreation() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Test();
-		$result = $TestModel->create();
-		$expected = array('Test' => array('notes' => 'write some notes here'));
-		$this->assertEqual($result, $expected);
-		$TestModel =& new User();
-		$result = $TestModel->schema();
-
-		if (isset($this->db->columns['primary_key']['length'])) {
-			$intLength = $this->db->columns['primary_key']['length'];
-		} elseif (isset($this->db->columns['integer']['length'])) {
-			$intLength = $this->db->columns['integer']['length'];
-		} else {
-			$intLength = 11;
-		}
-		foreach (array('collate', 'charset') as $type) {
-			unset($result['user'][$type]);
-			unset($result['password'][$type]);
-		}
-
-		$expected = array(
-			'id' => array(
-				'type' => 'integer',
-				'null' => false,
-				'default' => null,
-				'length' => $intLength,
-				'key' => 'primary'
-			),
-			'user' => array(
-				'type' => 'string',
-				'null' => false,
-				'default' => '',
-				'length' => 255
-			),
-			'password' => array(
-				'type' => 'string',
-				'null' => false,
-				'default' => '',
-				'length' => 255
-			),
-			'created' => array(
-				'type' => 'datetime',
-				'null' => true,
-				'default' => null,
-				'length' => null
-			),
-			'updated'=> array(
-				'type' => 'datetime',
-				'null' => true,
-				'default' => null,
-				'length' => null
-		));
-
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Article();
-		$result = $TestModel->create();
-		$expected = array('Article' => array('published' => 'N'));
-		$this->assertEqual($result, $expected);
-
-		$FeaturedModel =& new Featured();
-		$data = array(
-			'article_featured_id' => 1,
-			'category_id' => 1,
-			'published_date' => array(
-				'year' => 2008,
-				'month' => 06,
-				'day' => 11
-			),
-			'end_date' => array(
-				'year' => 2008,
-				'month' => 06,
-				'day' => 20
-		));
-
-		$expected = array(
-			'Featured' => array(
-				'article_featured_id' => 1,
-				'category_id' => 1,
-				'published_date' => '2008-6-11 00:00:00',
-				'end_date' => '2008-6-20 00:00:00'
-		));
-
-		$this->assertEqual($FeaturedModel->create($data), $expected);
-
-		$data = array(
-			'published_date' => array(
-				'year' => 2008,
-				'month' => 06,
-				'day' => 11
-			),
-			'end_date' => array(
-				'year' => 2008,
-				'month' => 06,
-				'day' => 20
-			),
-			'article_featured_id' => 1,
-			'category_id' => 1
-		);
-
-		$expected = array(
-			'Featured' => array(
-				'published_date' => '2008-6-11 00:00:00',
-				'end_date' => '2008-6-20 00:00:00',
-				'article_featured_id' => 1,
-				'category_id' => 1
-		));
-
-		$this->assertEqual($FeaturedModel->create($data), $expected);
-	}
-/**
- * ensure that __exists is reset on create
- *
- * @return void
- **/
-	function testResetOfExistsOnCreate() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$Article->id = 1;
-		$Article->saveField('title', 'Reset me');
-		$Article->delete();
-		$Article->id = 1;
-		$this->assertFalse($Article->exists());
-
-		$Article->create();
-		$this->assertFalse($Article->exists());
-		$Article->id = 2;
-		$Article->saveField('title', 'Staying alive');
-		$result = $Article->read(null, 2);
-		$this->assertEqual($result['Article']['title'], 'Staying alive');
-	}
-/**
- * testCreationOfEmptyRecord method
- *
- * @access public
- * @return void
- */
-	function testCreationOfEmptyRecord() {
-		$this->loadFixtures('Author');
-		$TestModel =& new Author();
-		$this->assertEqual($TestModel->find('count'), 4);
-
-		$TestModel->deleteAll(true, false, false);
-		$this->assertEqual($TestModel->find('count'), 0);
-
-		$result = $TestModel->save();
-		$this->assertTrue(isset($result['Author']['created']));
-		$this->assertTrue(isset($result['Author']['updated']));
-		$this->assertEqual($TestModel->find('count'), 1);
-	}
-/**
- * testCreateWithPKFiltering method
- *
- * @access public
- * @return void
- */
-	function testCreateWithPKFiltering() {
-		$TestModel =& new Article();
-		$data = array(
-			'id' => 5,
-			'user_id' => 2,
-			'title' => 'My article',
-			'body' => 'Some text'
-		);
-
-		$result = $TestModel->create($data);
-		$expected = array(
-			'Article' => array(
-				'published' => 'N',
-				'id' => 5,
-				'user_id' => 2,
-				'title' => 'My article',
-				'body' => 'Some text'
-		));
-
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->id, 5);
-
-		$result = $TestModel->create($data, true);
-		$expected = array(
-			'Article' => array(
-				'published' => 'N',
-				'id' => false,
-				'user_id' => 2,
-				'title' => 'My article',
-				'body' => 'Some text'
-		));
-
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-
-		$result = $TestModel->create(array('Article' => $data), true);
-		$expected = array(
-			'Article' => array(
-				'published' => 'N',
-				'id' => false,
-				'user_id' => 2,
-				'title' => 'My article',
-				'body' => 'Some text'
-		));
-
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-
-		$data = array(
-			'id' => 6,
-			'user_id' => 2,
-			'title' => 'My article',
-			'body' => 'Some text',
-			'created' => '1970-01-01 00:00:00',
-			'updated' => '1970-01-01 12:00:00',
-			'modified' => '1970-01-01 12:00:00'
-		);
-
-		$result = $TestModel->create($data);
-		$expected = array(
-			'Article' => array(
-				'published' => 'N',
-				'id' => 6,
-				'user_id' => 2,
-				'title' => 'My article',
-				'body' => 'Some text',
-				'created' => '1970-01-01 00:00:00',
-				'updated' => '1970-01-01 12:00:00',
-				'modified' => '1970-01-01 12:00:00'
-		));
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->id, 6);
-
-		$result = $TestModel->create(array(
-			'Article' => array_diff_key($data, array(
-				'created' => true,
-				'updated' => true,
-				'modified' => true
-		))), true);
-		$expected = array(
-			'Article' => array(
-				'published' => 'N',
-				'id' => false,
-				'user_id' => 2,
-				'title' => 'My article',
-				'body' => 'Some text'
-		));
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-	}
-/**
- * testCreationWithMultipleData method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleData() {
-		$this->loadFixtures('Article', 'Comment');
-		$Article =& new Article();
-		$Comment =& new Comment();
-
-		$articles = $Article->find('all', array(
-			'fields' => array('id','title'),
-			'recursive' => -1
-		));
-
-		$comments = $Comment->find('all', array(
-			'fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
-
-		$this->assertEqual($articles, array(
-			array('Article' => array(
-				'id' => 1,
-				'title' => 'First Article'
-			)),
-			array('Article' => array(
-				'id' => 2,
-				'title' => 'Second Article'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'title' => 'Third Article'
-		))));
-
-		$this->assertEqual($comments, array(
-			array('Comment' => array(
-				'id' => 1,
-				'article_id' => 1,
-				'user_id' => 2,
-				'comment' => 'First Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 2,
-				'article_id' => 1,
-				'user_id' => 4,
-				'comment' => 'Second Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 3,
-				'article_id' => 1,
-				'user_id' => 1,
-				'comment' => 'Third Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 4,
-				'article_id' => 1,
-				'user_id' => 1,
-				'comment' => 'Fourth Comment for First Article',
-				'published' => 'N'
-			)),
-			array('Comment' => array(
-				'id' => 5,
-				'article_id' => 2,
-				'user_id' => 1,
-				'comment' => 'First Comment for Second Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 6,
-				'article_id' => 2,
-				'user_id' => 2,
-				'comment' => 'Second Comment for Second Article',
-				'published' => 'Y'
-		))));
-
-		$data = array(
-			'Comment' => array(
-				'article_id' => 2,
-				'user_id' => 4,
-				'comment' => 'Brand New Comment',
-				'published' => 'N'
-			),
-			'Article' => array(
-				'id' => 2,
-				'title' => 'Second Article Modified'
-		));
-
-		$result = $Comment->create($data);
-
-		$this->assertTrue($result);
-		$result = $Comment->save();
-		$this->assertTrue($result);
-
-		$articles = $Article->find('all', array(
-			'fields' => array('id','title'),
-			'recursive' => -1
-		));
-
-		$comments = $Comment->find('all', array(
-			'fields' => array('id','article_id','user_id','comment','published'),
-			'recursive' => -1
-		));
-
-		$this->assertEqual($articles, array(
-			array('Article' => array(
-				'id' => 1,
-				'title' => 'First Article'
-			)),
-			array('Article' => array(
-				'id' => 2,
-				'title' => 'Second Article'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'title' => 'Third Article'
-		))));
-
-		$this->assertEqual($comments, array(
-			array('Comment' => array(
-				'id' => 1,
-				'article_id' => 1,
-				'user_id' => 2,
-				'comment' => 'First Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 2,
-				'article_id' => 1,
-				'user_id' => 4,
-				'comment' => 'Second Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 3,
-				'article_id' => 1,
-				'user_id' => 1,
-				'comment' => 'Third Comment for First Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 4,
-				'article_id' => 1,
-				'user_id' => 1,
-				'comment' => 'Fourth Comment for First Article',
-				'published' => 'N'
-			)),
-			array('Comment' => array(
-				'id' => 5,
-				'article_id' => 2,
-				'user_id' => 1,
-				'comment' => 'First Comment for Second Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 6,
-				'article_id' => 2,
-				'user_id' => 2, 'comment' =>
-				'Second Comment for Second Article',
-				'published' => 'Y'
-			)),
-			array('Comment' => array(
-				'id' => 7,
-				'article_id' => 2,
-				'user_id' => 4,
-				'comment' => 'Brand New Comment',
-				'published' => 'N'
-	))));
-
-	}
-/**
- * testCreationWithMultipleDataSameModel method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleDataSameModel() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$SecondaryArticle =& new Article();
-
-		$result = $Article->field('title', array('id' => 1));
-		$this->assertEqual($result, 'First Article');
-
-		$data = array(
-			'Article' => array(
-				'user_id' => 2,
-				'title' => 'Brand New Article',
-				'body' => 'Brand New Article Body',
-				'published' => 'Y'
-			),
-			'SecondaryArticle' => array(
-				'id' => 1
-		));
-
-		$Article->create();
-		$result = $Article->save($data);
-		$this->assertTrue($result);
-
-		$result = $Article->getInsertID();
-		$this->assertTrue(!empty($result));
-
-		$result = $Article->field('title', array('id' => 1));
-		$this->assertEqual($result, 'First Article');
-
-		$articles = $Article->find('all', array(
-			'fields' => array('id','title'),
-			'recursive' => -1
-		));
-
-		$this->assertEqual($articles, array(
-			array('Article' => array(
-				'id' => 1,
-				'title' => 'First Article'
-			)),
-			array('Article' => array(
-				'id' => 2,
-				'title' => 'Second Article'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'title' => 'Third Article'
-			)),
-			array('Article' => array(
-				'id' => 4,
-				'title' => 'Brand New Article'
-		))));
-	}
-/**
- * testCreationWithMultipleDataSameModelManualInstances method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleDataSameModelManualInstances() {
-		$this->loadFixtures('PrimaryModel');
-		$Primary =& new PrimaryModel();
-		$Secondary =& new PrimaryModel();
-
-		$result = $Primary->field('primary_name', array('id' => 1));
-		$this->assertEqual($result, 'Primary Name Existing');
-
-		$data = array(
-			'PrimaryModel' => array(
-				'primary_name' => 'Primary Name New'
-			),
-			'SecondaryModel' => array(
-				'id' => array(1)
-		));
-
-		$Primary->create();
-		$result = $Primary->save($data);
-		$this->assertTrue($result);
-
-		$result = $Primary->field('primary_name', array('id' => 1));
-		$this->assertEqual($result, 'Primary Name Existing');
-
-		$result = $Primary->getInsertID();
-		$this->assertTrue(!empty($result));
-
-		$result = $Primary->field('primary_name', array('id' => $result));
-		$this->assertEqual($result, 'Primary Name New');
-
-		$result = $Primary->find('count');
-		$this->assertEqual($result, 2);
-	}
-/**
- * testReadFakeThread method
- *
- * @access public
- * @return void
- */
-	function testReadFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$TestModel->id = 7;
-		$result = $TestModel->read();
-		$expected = array(
-			'CategoryThread' => array(
-				'id' => 7,
-				'parent_id' => 6,
-				'name' => 'Category 2.1',
-				'created' => '2007-03-18 15:30:23',
-				'updated' => '2007-03-18 15:32:31'
-			),
-			'ParentCategory' => array(
-				'id' => 6,
-				'parent_id' => 5,
-				'name' => 'Category 2',
-				'created' => '2007-03-18 15:30:23',
-				'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array(
-					'id' => 5,
-					'parent_id' => 4,
-					'name' => 'Category 1.1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 4,
-						'parent_id' => 3,
-						'name' => 'Category 1.1.2',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 3,
-							'parent_id' => 2,
-							'name' => 'Category 1.1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 2,
-								'parent_id' => 1,
-								'name' => 'Category 1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-								'ParentCategory' => array(
-									'id' => 1,
-									'parent_id' => 0,
-									'name' => 'Category 1',
-									'created' => '2007-03-18 15:30:23',
-									'updated' => '2007-03-18 15:32:31'
-		)))))));
-
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindFakeThread method
- *
- * @access public
- * @return void
- */
-	function testFindFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$result = $TestModel->find(array('CategoryThread.id' => 7));
-
-		$expected = array(
-			'CategoryThread' => array(
-				'id' => 7,
-				'parent_id' => 6,
-				'name' => 'Category 2.1',
-				'created' => '2007-03-18 15:30:23',
-				'updated' => '2007-03-18 15:32:31'
-			),
-			'ParentCategory' => array(
-				'id' => 6,
-				'parent_id' => 5,
-				'name' => 'Category 2',
-				'created' => '2007-03-18 15:30:23',
-				'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array(
-					'id' => 5,
-					'parent_id' => 4,
-					'name' => 'Category 1.1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 4,
-						'parent_id' => 3,
-						'name' => 'Category 1.1.2',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 3,
-							'parent_id' => 2,
-							'name' => 'Category 1.1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 2,
-								'parent_id' => 1,
-								'name' => 'Category 1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-								'ParentCategory' => array(
-									'id' => 1,
-									'parent_id' => 0,
-									'name' => 'Category 1',
-									'created' => '2007-03-18 15:30:23',
-									'updated' => '2007-03-18 15:32:31'
-		)))))));
-
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllFakeThread method
- *
- * @access public
- * @return void
- */
-	function testFindAllFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$result = $TestModel->find('all', null, null, 'CategoryThread.id ASC');
-		$expected = array(
-			array(
-				'CategoryThread' => array(
-				'id' => 1,
-				'parent_id' => 0,
-				'name' => 'Category 1',
-				'created' => '2007-03-18 15:30:23',
-				'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => null,
-					'parent_id' => null,
-					'name' => null,
-					'created' => null,
-					'updated' => null,
-					'ParentCategory' => array()
-			)),
-			array(
-				'CategoryThread' => array(
-					'id' => 2,
-					'parent_id' => 1,
-					'name' => 'Category 1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 1,
-					'parent_id' => 0,
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array()
-				)),
-			array(
-				'CategoryThread' => array(
-					'id' => 3,
-					'parent_id' => 2,
-					'name' => 'Category 1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 2,
-					'parent_id' => 1,
-					'name' => 'Category 1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 1,
-						'parent_id' => 0,
-						'name' => 'Category 1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array()
-			))),
-			array(
-				'CategoryThread' => array(
-					'id' => 4,
-					'parent_id' => 3,
-					'name' => 'Category 1.1.2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 3,
-					'parent_id' => 2,
-					'name' => 'Category 1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 2,
-						'parent_id' => 1,
-						'name' => 'Category 1.1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 1,
-							'parent_id' => 0,
-							'name' => 'Category 1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array()
-			)))),
-			array(
-				'CategoryThread' => array(
-					'id' => 5,
-					'parent_id' => 4,
-					'name' => 'Category 1.1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 4,
-					'parent_id' => 3,
-					'name' => 'Category 1.1.2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 3,
-						'parent_id' => 2,
-						'name' => 'Category 1.1.1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 2,
-							'parent_id' => 1,
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 1,
-								'parent_id' => 0,
-								'name' => 'Category 1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-								'ParentCategory' => array()
-			))))),
-			array(
-				'CategoryThread' => array(
-					'id' => 6,
-					'parent_id' => 5,
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 5,
-					'parent_id' => 4,
-					'name' => 'Category 1.1.1.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 4,
-						'parent_id' => 3,
-						'name' => 'Category 1.1.2',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 3,
-							'parent_id' => 2,
-							'name' => 'Category 1.1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 2,
-								'parent_id' => 1,
-								'name' => 'Category 1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-								'ParentCategory' => array(
-									'id' => 1,
-									'parent_id' => 0,
-									'name' => 'Category 1',
-									'created' => '2007-03-18 15:30:23',
-									'updated' => '2007-03-18 15:32:31',
-									'ParentCategory' => array()
-			)))))),
-			array(
-				'CategoryThread' => array(
-					'id' => 7,
-					'parent_id' => 6,
-					'name' => 'Category 2.1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'ParentCategory' => array(
-					'id' => 6,
-					'parent_id' => 5,
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array(
-						'id' => 5,
-						'parent_id' => 4,
-						'name' => 'Category 1.1.1.1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array(
-							'id' => 4,
-							'parent_id' => 3,
-							'name' => 'Category 1.1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 3,
-								'parent_id' => 2,
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-							'ParentCategory' => array(
-								'id' => 2,
-								'parent_id' => 1,
-								'name' => 'Category 1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31',
-								'ParentCategory' => array(
-									'id' => 1,
-									'parent_id' => 0,
-									'name' => 'Category 1',
-									'created' => '2007-03-18 15:30:23',
-									'updated' => '2007-03-18 15:32:31'
-		))))))));
-
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testConditionalNumerics method
- *
- * @access public
- * @return void
- */
-	function testConditionalNumerics() {
-		$this->loadFixtures('NumericArticle');
-		$NumericArticle =& new NumericArticle();
-		$data = array('title' => '12345abcde');
-		$result = $NumericArticle->find($data);
-		$this->assertTrue(!empty($result));
-
-		$data = array('title' => '12345');
-		$result = $NumericArticle->find($data);
-		$this->assertTrue(empty($result));
-	}
-
-/**
- * test find('all') method
- *
- * @access public
- * @return void
- */
-	function testFindAll() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-		$TestModel->cacheQueries = false;
-
-		$result = $TestModel->find('all');
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => 'User.id > 2'));
-		$expected = array(
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('User.id !=' => '0', 'User.user LIKE' => '%arr%')));
-		$expected = array(
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('User.id' => '0')));
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('or' => array('User.id' => '0', 'User.user LIKE' => '%a%'))));
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano')),
-				array('User' => array('id' => '2', 'user' => 'nate')),
-				array('User' => array('id' => '3', 'user' => 'larry')),
-				array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user ASC'));
-		$expected = array(
-				array('User' => array('user' => 'garrett')),
-				array('User' => array('user' => 'larry')),
-				array('User' => array('user' => 'mariano')),
-				array('User' => array('user' => 'nate')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user DESC'));
-		$expected = array(
-				array('User' => array('user' => 'nate')),
-				array('User' => array('user' => 'mariano')),
-				array('User' => array('user' => 'larry')),
-				array('User' => array('user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('limit' => 3, 'page' => 1));
-
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')));
-		$this->assertEqual($result, $expected);
-
-		$ids = array(4 => 1, 5 => 3);
-		$result = $TestModel->find('all', array('conditions' => array('User.id' => $ids), 'order' => 'User.id'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-			array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-		);
-		$this->assertEqual($result, $expected);
-
-		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
-		// hack can't handle small record counts.
-		if ($this->db->config['driver'] != 'mssql') {
-			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
-			$expected = array(
-					array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-			$this->assertEqual($result, $expected);
-
-			$result = $TestModel->find('all', array('limit' => 3, 'page' => 3));
-			$expected = array();
-			$this->assertEqual($result, $expected);
-		}
-	}
-/**
- * test find('list') method
- *
- * @access public
- * @return void
- */
-	function testGenerateFindList() {
-		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
-
-		$TestModel =& new Article();
-		$TestModel->displayField = 'title';
-
-		$result = $TestModel->find('list', array(
-			'order' => 'Article.title ASC'
-		));
-
-		$expected = array(
-			1 => 'First Article',
-			2 => 'Second Article',
-			3 => 'Third Article'
-		);
-		$this->assertEqual($result, $expected);
-
-		$db =& ConnectionManager::getDataSource('test_suite');
-		if ($db->config['driver'] == 'mysql') {
-			$result = $TestModel->find('list', array(
-				'order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')
-			));
-			$expected = array(
-				1 => 'First Article',
-				3 => 'Third Article',
-				2 => 'Second Article'
-			);
-			$this->assertEqual($result, $expected);
-		}
-
-		$result = Set::combine(
-			$TestModel->find('all', array(
-				'order' => 'Article.title ASC',
-				'fields' => array('id', 'title')
-			)),
-			'{n}.Article.id', '{n}.Article.title'
-		);
-		$expected = array(
-			1 => 'First Article',
-			2 => 'Second Article',
-			3 => 'Third Article'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine(
-			$TestModel->find('all', array(
-				'order' => 'Article.title ASC'
-			)),
-			'{n}.Article.id', '{n}.Article'
-		);
-		$expected = array(
-			1 => array(
-				'id' => 1,
-				'user_id' => 1,
-				'title' => 'First Article',
-				'body' => 'First Article Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:39:23',
-				'updated' => '2007-03-18 10:41:31'
-			),
-			2 => array(
-				'id' => 2,
-				'user_id' => 3,
-				'title' => 'Second Article',
-				'body' => 'Second Article Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:41:23',
-				'updated' => '2007-03-18 10:43:31'
-			),
-			3 => array(
-				'id' => 3,
-				'user_id' => 1,
-				'title' => 'Third Article',
-				'body' => 'Third Article Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:43:23',
-				'updated' => '2007-03-18 10:45:31'
-		));
-
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine(
-			$TestModel->find('all', array(
-				'order' => 'Article.title ASC'
-			)),
-			'{n}.Article.id', '{n}.Article', '{n}.Article.user_id'
-		);
-		$expected = array(
-			1 => array(
-				1 => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				3 => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				)),
-			3 => array(
-				2 => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-		)));
-
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine(
-			$TestModel->find('all', array(
-				'order' => 'Article.title ASC',
-				'fields' => array('id', 'title', 'user_id')
-			)),
-			'{n}.Article.id', '{n}.Article.title', '{n}.Article.user_id'
-		);
-
-		$expected = array(
-			1 => array(
-				1 => 'First Article',
-				3 => 'Third Article'
-			),
-			3 => array(
-				2 => 'Second Article'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Apple();
-		$expected = array(
-			1 => 'Red Apple 1',
-			2 => 'Bright Red Apple',
-			3 => 'green blue',
-			4 => 'Test Name',
-			5 => 'Blue Green',
-			6 => 'My new apple',
-			7 => 'Some odd color'
-		);
-
-		$this->assertEqual($TestModel->find('list'), $expected);
-		$this->assertEqual($TestModel->Parent->find('list'), $expected);
-
-		$TestModel =& new Post();
-		$result = $TestModel->find('list', array(
-			'fields' => 'Post.title'
-		));
-		$expected = array(
-			1 => 'First Post',
-			2 => 'Second Post',
-			3 => 'Third Post'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => 'title'
-		));
-		$expected = array(
-			1 => 'First Post',
-			2 => 'Second Post',
-			3 => 'Third Post'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => array('title', 'id')
-		));
-		$expected = array(
-			'First Post' => '1',
-			'Second Post' => '2',
-			'Third Post' => '3'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => array('title', 'id', 'created')
-		));
-		$expected = array(
-			'2007-03-18 10:39:23' => array(
-				'First Post' => '1'
-			),
-			'2007-03-18 10:41:23' => array(
-				'Second Post' => '2'
-			),
-			'2007-03-18 10:43:23' => array(
-				'Third Post' => '3'
-			),
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => array('Post.body')
-		));
-		$expected = array(
-			1 => 'First Post Body',
-			2 => 'Second Post Body',
-			3 => 'Third Post Body'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => array('Post.title', 'Post.body')
-		));
-		$expected = array(
-			'First Post' => 'First Post Body',
-			'Second Post' => 'Second Post Body',
-			'Third Post' => 'Third Post Body'
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array(
-			'fields' => array('Post.id', 'Post.title', 'Author.user'),
-			'recursive' => 1
-		));
-		$expected = array(
-			'mariano' => array(
-				1 => 'First Post',
-				3 => 'Third Post'
-			),
-			'larry' => array(
-				2 => 'Second Post'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new User();
-		$result = $TestModel->find('list', array(
-			'fields' => array('User.user', 'User.password')
-		));
-		$expected = array(
-			'mariano' => '5f4dcc3b5aa765d61d8327deb882cf99',
-			'nate' => '5f4dcc3b5aa765d61d8327deb882cf99',
-			'larry' => '5f4dcc3b5aa765d61d8327deb882cf99',
-			'garrett' => '5f4dcc3b5aa765d61d8327deb882cf99'
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new ModifiedAuthor();
-		$result = $TestModel->find('list', array(
-			'fields' => array('Author.id', 'Author.user')
-		));
-		$expected = array(
-			1 => 'mariano (CakePHP)',
-			2 => 'nate (CakePHP)',
-			3 => 'larry (CakePHP)',
-			4 => 'garrett (CakePHP)'
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecordExists method
- *
- * @access public
- * @return void
- */
-	function testRecordExists() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$this->assertFalse($TestModel->exists());
-		$TestModel->read(null, 1);
-		$this->assertTrue($TestModel->exists());
-		$TestModel->create();
-		$this->assertFalse($TestModel->exists());
-		$TestModel->id = 4;
-		$this->assertTrue($TestModel->exists());
-
-		$TestModel =& new TheVoid();
-		$this->assertFalse($TestModel->exists());
-		$TestModel->id = 5;
-		$this->assertFalse($TestModel->exists());
-	}
-/**
- * testFindField method
- *
- * @access public
- * @return void
- */
-	function testFindField() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$TestModel->id = 1;
-		$result = $TestModel->field('user');
-		$this->assertEqual($result, 'mariano');
-
-		$result = $TestModel->field('User.user');
-		$this->assertEqual($result, 'mariano');
-
-		$TestModel->id = false;
-		$result = $TestModel->field('user', array(
-			'user' => 'mariano'
-		));
-		$this->assertEqual($result, 'mariano');
-
-		$result = $TestModel->field('COUNT(*) AS count', true);
-		$this->assertEqual($result, 4);
-
-		$result = $TestModel->field('COUNT(*)', true);
-		$this->assertEqual($result, 4);
-	}
-/**
- * testFindUnique method
- *
- * @access public
- * @return void
- */
-	function testFindUnique() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$this->assertFalse($TestModel->isUnique(array(
-			'user' => 'nate'
-		)));
-		$TestModel->id = 2;
-		$this->assertTrue($TestModel->isUnique(array(
-			'user' => 'nate'
-		)));
-		$this->assertFalse($TestModel->isUnique(array(
-			'user' => 'nate',
-			'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
-		)));
-	}
-/**
- * testUpdateExisting method
- *
- * @access public
- * @return void
- */
-	function testUpdateExisting() {
-		$this->loadFixtures('User', 'Article', 'Comment');
-		$TestModel =& new User();
-		$TestModel->create();
-
-		$TestModel->save(array(
-			'User' => array(
-				'user' => 'some user',
-				'password' => 'some password'
-		)));
-		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
-		$id = $TestModel->id;
-
-		$TestModel->save(array(
-			'User' => array(
-				'user' => 'updated user'
-		)));
-		$this->assertEqual($TestModel->id, $id);
-
-		$result = $TestModel->findById($id);
-		$this->assertEqual($result['User']['user'], 'updated user');
-		$this->assertEqual($result['User']['password'], 'some password');
-
-		$Article =& new Article();
-		$Comment =& new Comment();
-		$data = array(
-			'Comment' => array(
-				'id' => 1,
-				'comment' => 'First Comment for First Article'
-			),
-			'Article' => array(
-				'id' => 2,
-				'title' => 'Second Article'
-		));
-
-		$result = $Article->save($data);
-		$this->assertTrue($result);
-
-		$result = $Comment->save($data);
-		$this->assertTrue($result);
-	}
-/**
- * testUpdateMultiple method
- *
- * @access public
- * @return void
- */
-	function testUpdateMultiple() {
-		$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
-		$TestModel =& new Comment();
-		$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id');
-		$expected = array('2', '4', '1', '1', '1', '2');
-		$this->assertEqual($result, $expected);
-
-		$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
-		$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
-		$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->updateAll(
-			array('Comment.comment' => "'Updated today'"),
-			array('Comment.user_id' => 5)
-		);
-		$this->assertTrue($result);
-		$result = Set::extract(
-			$TestModel->find('all', array(
-				'conditions' => array(
-					'Comment.user_id' => 5
-			))),
-			'{n}.Comment.comment'
-		);
-		$expected = array_fill(0, 2, 'Updated today');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testUpdateWithCalculation method
- *
- * @access public
- * @return void
- */
-	function testUpdateWithCalculation() {
-		$this->loadFixtures('DataTest');
-		$model =& new DataTest();
-		$result = $model->saveAll(array(
-			array('count' => 5, 'float' => 1.1),
-			array('count' => 3, 'float' => 1.2),
-			array('count' => 4, 'float' => 1.3),
-			array('count' => 1, 'float' => 2.0),
-		));
-		$this->assertTrue($result);
-
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(5, 3, 4, 1));
-
-		$this->assertTrue($model->updateAll(array('count' => 'count + 2')));
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(7, 5, 6, 3));
-
-		$this->assertTrue($model->updateAll(array('DataTest.count' => 'DataTest.count - 1')));
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(6, 4, 5, 2));
-	}
-/**
- * testBindUnbind method
- *
- * @access public
- * @return void
- */
-	function testBindUnbind() {
-		$this->loadFixtures('User', 'Comment', 'FeatureSet');
-		$TestModel =& new User();
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Comment')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Comment' => array(
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-					),
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Comment' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett'
-				),
-				'Comment' => array(
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-		))));
-
-		$this->assertEqual($result, $expected);
-
-		$TestModel->resetAssociations();
-		$result = $TestModel->hasMany;
-		$this->assertEqual($result, array());
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Comment')), false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Comment' => array(
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-					),
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Comment' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett'
-				),
-				'Comment' => array(
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-		))));
-
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->hasMany;
-		$expected = array(
-			'Comment' => array(
-				'className' => 'Comment',
-				'foreignKey' => 'user_id',
-				'conditions' => null,
-				'fields' => null,
-				'order' => null,
-				'limit' => null,
-				'offset' => null,
-				'dependent' => null,
-				'exclusive' => null,
-				'finderQuery' => null,
-				'counterQuery' => null
-		));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano')),
-			array('User' => array('id' => '2', 'user' => 'nate')),
-			array('User' => array('id' => '3', 'user' => 'larry')),
-			array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Comment' => array(
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-					),
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Comment' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett'
-				),
-				'Comment' => array(
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' =>
-						'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-		))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')), false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano')),
-			array('User' => array('id' => '2', 'user' => 'nate')),
-			array('User' => array('id' => '3', 'user' => 'larry')),
-			array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array(
-			'Comment' => array('className' => 'Comment', 'conditions' => 'Comment.published = \'Y\'')
-		)));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Comment' => array(
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Comment' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett'
-				),
-				'Comment' => array(
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-		))));
-
-		$this->assertEqual($result, $expected);
-
-		$TestModel2 =& new DeviceType();
-
-		$expected = array(
-			'className' => 'FeatureSet',
-			'foreignKey' => 'feature_set_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'counterCache' => ''
-		);
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('FeatureSet', array(
-			'conditions' => array('active' => true)
-		));
-		$expected['conditions'] = array('active' => true);
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('FeatureSet', array(
-			'foreignKey' => false,
-			'conditions' => array('Feature.name' => 'DeviceType.name')
-		));
-		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
-		$expected['foreignKey'] = false;
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('NewFeatureSet', array(
-			'type' => 'hasMany',
-			'className' => 'FeatureSet',
-			'conditions' => array('active' => true)
-		));
-		$expected = array(
-			'className' => 'FeatureSet',
-			'conditions' => array('active' => true),
-			'foreignKey' => 'device_type_id',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'dependent' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		);
-		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
-		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
-	}
-/**
- * testBindMultipleTimes method
- *
- * @access public
- * @return void
- */
-	function testBindMultipleTimes() {
-		$this->loadFixtures('User', 'Comment', 'Article');
-		$TestModel =& new User();
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array(
-			'hasMany' => array(
-				'Items' => array('className' => 'Comment')
-		)));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Items' => array(
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-					),
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Items' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Items' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '4', 'user' => 'garrett'),
-					'Items' => array(
-						array(
-							'id' => '2',
-							'article_id' => '1',
-							'user_id' => '4',
-							'comment' => 'Second Comment for First Article',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:47:23',
-							'updated' => '2007-03-18 10:49:31'
-		))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array(
-			'hasMany' => array(
-				'Items' => array('className' => 'Article')
-		)));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'User.id, User.user'
-		));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano'
-				),
-				'Items' => array(
-					array(
-						'id' => 1,
-						'user_id' => 1,
-						'title' => 'First Article',
-						'body' => 'First Article Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:39:23',
-						'updated' => '2007-03-18 10:41:31'
-					),
-					array(
-						'id' => 3,
-						'user_id' => 1,
-						'title' => 'Third Article',
-						'body' => 'Third Article Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:43:23',
-						'updated' => '2007-03-18 10:45:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate'
-				),
-				'Items' => array()
-			),
-			array(
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry'
-				),
-				'Items' => array(
-					array(
-						'id' => 2,
-						'user_id' => 3,
-						'title' => 'Second Article',
-						'body' => 'Second Article Body',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:41:23',
-						'updated' => '2007-03-18 10:43:31'
-			))),
-			array(
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett'
-				),
-				'Items' => array()
-		));
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * test that bindModel behaves with Custom primary Key associations
- *
- * @return void
- **/
-	function bindWithCustomPrimaryKey() {
-		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
-		$Model =& ClassRegistry::init('StoriesTag');
-		$Model->bindModel(array(
-			'belongsTo' => array(
-				'Tag' => array(
-					'className' => 'Tag',
-					'foreignKey' => 'story'
-		))));
-
-		$result = $Model->find('all');
-		$this->assertFalse(empty($result));
-	}
-
-/**
- * test find('count') method
- *
- * @access public
- * @return void
- */
-	function testFindCount() {
-		$this->loadFixtures('User', 'Project');
-
-		$TestModel =& new User();
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 4);
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->order = 'User.id';
-		$this->db->_queriesLog = array();
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 4);
-
-		$this->assertTrue(isset($this->db->_queriesLog[0]['query']));
-		$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
-	}
-
-/**
- * test find with COUNT(DISTINCT field)
- *
- * @return void
- **/
-	function testFindCountDistinct() {
-		$skip = $this->skipIf(
-			$this->db->config['driver'] == 'sqlite',
-			'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
-		);
-		if ($skip) {
-			return;
-		}
-		$this->loadFixtures('Project');
-		$TestModel =& new Project();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-
-		$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
-		$this->assertEqual($result, 4);
-	}
-/**
- * Test find(count) with Db::expression
- *
- * @access public
- * @return void
- */
-	function testFindCountWithDbExpressions() {
-		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
-			return;
-		}
-		$this->loadFixtures('Project');
-		$db = ConnectionManager::getDataSource('test_suite');
-		$TestModel =& new Project();
-
-		$result = $TestModel->find('count', array('conditions' => array(
-			$db->expression('Project.name = \'Project 3\'')
-		)));
-		$this->assertEqual($result, 1);
-
-		$result = $TestModel->find('count', array('conditions' => array(
-			'Project.name' => $db->expression('\'Project 3\'')
-		)));
-		$this->assertEqual($result, 1);
-	}
-/**
- * testFindMagic method
- *
- * @access public
- * @return void
- */
-	function testFindMagic() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$result = $TestModel->findByUser('mariano');
-		$expected = array(
-			'User' => array(
-				'id' => '1',
-				'user' => 'mariano',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:16:23',
-				'updated' => '2007-03-17 01:18:31'
-		));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findByPassword('5f4dcc3b5aa765d61d8327deb882cf99');
-		$expected = array('User' => array(
-			'id' => '1',
-			'user' => 'mariano',
-			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-			'created' => '2007-03-17 01:16:23',
-			'updated' => '2007-03-17 01:18:31'
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRead method
- *
- * @access public
- * @return void
- */
-	function testRead() {
-		$this->loadFixtures('User', 'Article');
-		$TestModel =& new User();
-
-		$result = $TestModel->read();
-		$this->assertFalse($result);
-
-		$TestModel->id = 2;
-		$result = $TestModel->read();
-		$expected = array(
-			'User' => array(
-				'id' => '2',
-				'user' => 'nate',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:18:23',
-				'updated' => '2007-03-17 01:20:31'
-		));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->read(null, 2);
-		$expected = array(
-			'User' => array(
-				'id' => '2',
-				'user' => 'nate',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:18:23',
-				'updated' => '2007-03-17 01:20:31'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->read(array('id', 'user'));
-		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->read('id, user', 2);
-		$expected = array(
-			'User' => array(
-				'id' => '2',
-				'user' => 'nate'
-		));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Article')));
-		$this->assertTrue($result);
-
-		$TestModel->id = 1;
-		$result = $TestModel->read('id, user');
-		$expected = array(
-			'User' => array(
-				'id' => '1',
-				'user' => 'mariano'
-			),
-			'Article' => array(
-				array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecursiveRead method
- *
- * @access public
- * @return void
- */
-	function testRecursiveRead() {
-		$this->loadFixtures(
-			'User',
-			'Article',
-			'Comment',
-			'Tag',
-			'ArticlesTag',
-			'Featured',
-			'ArticleFeatured'
-		);
-		$TestModel =& new User();
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Article')), false);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 0;
-		$result = $TestModel->read('id, user', 1);
-		$expected = array(
-			'User' => array('id' => '1', 'user' => 'mariano'),
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 1;
-		$result = $TestModel->read('id, user', 1);
-		$expected = array(
-			'User' => array(
-				'id' => '1',
-				'user' => 'mariano'
-			),
-			'Article' => array(
-				array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read('id, user', 3);
-		$expected = array(
-			'User' => array(
-				'id' => '3',
-				'user' => 'larry'
-			),
-			'Article' => array(
-				array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31',
-					'User' => array(
-						'id' => '3',
-						'user' => 'larry',
-						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-						'created' => '2007-03-17 01:20:23',
-						'updated' => '2007-03-17 01:22:31'
-					),
-					'Comment' => array(
-						array(
-							'id' => '5',
-							'article_id' => '2',
-							'user_id' => '1',
-							'comment' => 'First Comment for Second Article',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:53:23',
-							'updated' => '2007-03-18 10:55:31'
-						),
-						array(
-							'id' => '6',
-							'article_id' => '2',
-							'user_id' => '2',
-							'comment' => 'Second Comment for Second Article',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:55:23',
-							'updated' => '2007-03-18 10:57:31'
-					)),
-					'Tag' => array(
-						array(
-							'id' => '1',
-							'tag' => 'tag1',
-							'created' => '2007-03-18 12:22:23',
-							'updated' => '2007-03-18 12:24:31'
-						),
-						array(
-							'id' => '3',
-							'tag' => 'tag3',
-							'created' => '2007-03-18 12:26:23',
-							'updated' => '2007-03-18 12:28:31'
-		)))));
-		$this->assertEqual($result, $expected);
-	}
-
-	function testRecursiveFindAll() {
-		$this->db->truncate(new Featured());
-
-		$this->loadFixtures(
-			'User',
-			'Article',
-			'Comment',
-			'Tag',
-			'ArticlesTag',
-			'Attachment',
-			'ArticleFeatured',
-			'Featured',
-			'Category'
-		);
-		$TestModel =& new Article();
-
-		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-					),
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-					)
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '2',
-						'tag' => 'tag2',
-						'created' => '2007-03-18 12:24:23',
-						'updated' => '2007-03-18 12:26:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array(
-			'conditions' => array('Article.user_id' => 3),
-			'limit' => 1,
-			'recursive' => 2
-		));
-
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23',
-					'updated' => '2007-03-17 01:22:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31',
-						'Article' => array(
-							'id' => '2',
-							'user_id' => '3',
-							'title' => 'Second Article',
-							'body' => 'Second Article Body',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-						),
-						'User' => array(
-							'id' => '1',
-							'user' => 'mariano',
-							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-							'created' => '2007-03-17 01:16:23',
-							'updated' => '2007-03-17 01:18:31'
-						),
-						'Attachment' => array(
-							'id' => '1',
-							'comment_id' => 5,
-							'attachment' => 'attachment.zip',
-							'created' => '2007-03-18 10:51:23',
-							'updated' => '2007-03-18 10:53:31'
-						)
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31',
-						'Article' => array(
-							'id' => '2',
-							'user_id' => '3',
-							'title' => 'Second Article',
-							'body' => 'Second Article Body',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-						),
-						'User' => array(
-							'id' => '2',
-							'user' => 'nate',
-							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-							'created' => '2007-03-17 01:18:23',
-							'updated' => '2007-03-17 01:20:31'
-						),
-						'Attachment' => false
-					)
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '3',
-						'tag' => 'tag3',
-						'created' => '2007-03-18 12:26:23',
-						'updated' => '2007-03-18 12:28:31'
-		))));
-
-		$this->assertEqual($result, $expected);
-
-		$Featured = new Featured();
-
-		$Featured->recursive = 2;
-		$Featured->bindModel(array(
-			'belongsTo' => array(
-				'ArticleFeatured' => array(
-					'conditions' => "ArticleFeatured.published = 'Y'",
-					'fields' => 'id, title, user_id, published'
-				)
-			)
-		));
-
-		$Featured->ArticleFeatured->unbindModel(array(
-			'hasMany' => array('Attachment', 'Comment'),
-			'hasAndBelongsToMany' => array('Tag'))
-		);
-
-		$orderBy = 'ArticleFeatured.id ASC';
-		$result = $Featured->find('all', array(
-			'order' => $orderBy, 'limit' => 3
-		));
-
-		$expected = array(
-			array(
-				'Featured' => array(
-					'id' => '1',
-					'article_featured_id' => '1',
-					'category_id' => '1',
-					'published_date' => '2007-03-31 10:39:23',
-					'end_date' => '2007-05-15 10:39:23',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'ArticleFeatured' => array(
-					'id' => '1',
-					'title' => 'First Article',
-					'user_id' => '1',
-					'published' => 'Y',
-					'User' => array(
-						'id' => '1',
-						'user' => 'mariano',
-						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-						'created' => '2007-03-17 01:16:23',
-						'updated' => '2007-03-17 01:18:31'
-					),
-					'Category' => array(),
-					'Featured' => array(
-						'id' => '1',
-						'article_featured_id' => '1',
-						'category_id' => '1',
-						'published_date' => '2007-03-31 10:39:23',
-						'end_date' => '2007-05-15 10:39:23',
-						'created' => '2007-03-18 10:39:23',
-						'updated' => '2007-03-18 10:41:31'
-				)),
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				)),
-			array(
-				'Featured' => array(
-					'id' => '2',
-					'article_featured_id' => '2',
-					'category_id' => '1',
-					'published_date' => '2007-03-31 10:39:23',
-					'end_date' => '2007-05-15 10:39:23',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'ArticleFeatured' => array(
-					'id' => '2',
-					'title' => 'Second Article',
-					'user_id' => '3',
-					'published' => 'Y',
-					'User' => array(
-						'id' => '3',
-						'user' => 'larry',
-						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-						'created' => '2007-03-17 01:20:23',
-						'updated' => '2007-03-17 01:22:31'
-					),
-					'Category' => array(),
-					'Featured' => array(
-						'id' => '2',
-						'article_featured_id' => '2',
-						'category_id' => '1',
-						'published_date' => '2007-03-31 10:39:23',
-						'end_date' => '2007-05-15 10:39:23',
-						'created' => '2007-03-18 10:39:23',
-						'updated' => '2007-03-18 10:41:31'
-				)),
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecursiveFindAllWithLimit method
- *
- * @access public
- * @return void
- */
-	function testRecursiveFindAllWithLimit() {
-		$this->loadFixtures('Article', 'User', 'Tag', 'ArticlesTag', 'Comment', 'Attachment');
-		$TestModel =& new Article();
-
-		$TestModel->hasMany['Comment']['limit'] = 2;
-
-		$result = $TestModel->find('all', array(
-			'conditions' => array('Article.user_id' => 1)
-		));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-					),
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '2',
-						'tag' => 'tag2',
-						'created' => '2007-03-18 12:24:23',
-						'updated' => '2007-03-18 12:26:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasMany['Comment']['limit'] = 1;
-
-		$result = $TestModel->find('all', array(
-			'conditions' => array('Article.user_id' => 3),
-			'limit' => 1,
-			'recursive' => 2
-		));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23',
-					'updated' => '2007-03-17 01:22:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31',
-						'Article' => array(
-							'id' => '2',
-							'user_id' => '3',
-							'title' => 'Second Article',
-							'body' => 'Second Article Body',
-							'published' => 'Y',
-							'created' => '2007-03-18 10:41:23',
-							'updated' => '2007-03-18 10:43:31'
-						),
-						'User' => array(
-							'id' => '1',
-							'user' => 'mariano',
-							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-							'created' => '2007-03-17 01:16:23',
-							'updated' => '2007-03-17 01:18:31'
-						),
-						'Attachment' => array(
-							'id' => '1',
-							'comment_id' => 5,
-							'attachment' => 'attachment.zip',
-							'created' => '2007-03-18 10:51:23',
-							'updated' => '2007-03-18 10:53:31'
-						)
-					)
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '3',
-						'tag' => 'tag3',
-						'created' => '2007-03-18 12:26:23',
-						'updated' => '2007-03-18 12:28:31'
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testAssociationAfterFind method
- *
- * @access public
- * @return void
- */
-	function testAssociationAfterFind() {
-		$this->loadFixtures('Post', 'Author', 'Comment');
-		$TestModel =& new Post();
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Post' => array(
-					'id' => '1',
-					'author_id' => '1',
-					'title' => 'First Post',
-					'body' => 'First Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'Author' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31',
-					'test' => 'working'
-			)),
-			array(
-				'Post' => array(
-					'id' => '2',
-					'author_id' => '3',
-					'title' => 'Second Post',
-					'body' => 'Second Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'Author' => array(
-					'id' => '3',
-					'user' => 'larry',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23',
-					'updated' => '2007-03-17 01:22:31',
-					'test' => 'working'
-			)),
-			array(
-				'Post' => array(
-					'id' => '3',
-					'author_id' => '1',
-					'title' => 'Third Post',
-					'body' => 'Third Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'Author' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31',
-					'test' => 'working'
-		)));
-		$this->assertEqual($result, $expected);
-		unset($TestModel);
-
-		$Author =& new Author();
-		$Author->Post->bindModel(array(
-			'hasMany' => array(
-				'Comment' => array(
-					'className' => 'ModifiedComment',
-					'foreignKey' => 'article_id',
-				)
-		)));
-		$result = $Author->find('all', array(
-			'conditions' => array('Author.id' => 1),
-			'recursive' => 2
-		));
-		$expected = array(
-			'id' => 1,
-			'article_id' => 1,
-			'user_id' => 2,
-			'comment' => 'First Comment for First Article',
-			'published' => 'Y',
-			'created' => '2007-03-18 10:45:23',
-			'updated' => '2007-03-18 10:47:31',
-			'callback' => 'Fire'
-		);
-		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
-	}
-/**
- * Tests that callbacks can be properly disabled
- *
- * @access public
- * @return void
- */
-	function testCallbackDisabling() {
-		$this->loadFixtures('Author');
-		$TestModel = new ModifiedAuthor();
-
-		$result = Set::extract($TestModel->find('all'), '/Author/user');
-		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => 'after')), '/Author/user');
-		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => 'before')), '/Author/user');
-		$expected = array('mariano', 'nate', 'larry', 'garrett');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => false)), '/Author/user');
-		$expected = array('mariano', 'nate', 'larry', 'garrett');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testValidatesBackwards method
- *
- * @access public
- * @return void
- */
-	function testValidatesBackwards() {
-		$TestModel =& new TestValidate();
-
-		$TestModel->validate = array(
-			'user_id' => VALID_NUMBER,
-			'title' => VALID_NOT_EMPTY,
-			'body' => VALID_NOT_EMPTY
-		);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => '',
-			'body' => ''
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 'title',
-			'body' => ''
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '',
-			'title' => 'title',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => 'not a number',
-			'title' => 'title',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 'title',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-	}
-/**
- * testValidates method
- *
- * @access public
- * @return void
- */
-	function testValidates() {
-		$TestModel =& new TestValidate();
-
-		$TestModel->validate = array(
-			'user_id' => 'numeric',
-			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
-			'body' => 'notEmpty'
-		);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => '',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 'title',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data) && $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => '0',
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate['modified'] = array('allowEmpty' => true, 'rule' => 'date');
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'modified' => ''
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'modified' => '2007-05-01'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'modified' => 'invalid-date-here'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'modified' => 0
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'modified' => '0'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate['modified'] = array('allowEmpty' => false, 'rule' => 'date');
-
-		$data = array('TestValidate' => array('modified' => null));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('modified' => false));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('modified' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'modified' => '2007-05-01'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate['slug'] = array('allowEmpty' => false, 'rule' => array('maxLength', 45));
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'slug' => ''
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'slug' => 'slug-right-here'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'user_id' => '1',
-			'title' => 0,
-			'body' => 'body',
-			'slug' => 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate = array(
-			'number' => array(
-				'rule' => 'validateNumber',
-				'min' => 3,
-				'max' => 5
-			),
-			'title' => array(
-				'allowEmpty' => false,
-				'rule' => 'notEmpty'
-		));
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => '0'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => 0
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => '3'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => 3
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'number' => array(
-				'rule' => 'validateNumber',
-				'min' => 5,
-				'max' => 10
-			),
-			'title' => array(
-				'allowEmpty' => false,
-				'rule' => 'notEmpty'
-		));
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => '3'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'title' => 'title',
-			'number' => 3
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'allowEmpty' => false,
-				'rule' => 'validateTitle'
-		));
-
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'new title'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'title-new'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array('title' => array(
-			'allowEmpty' => true,
-			'rule' => 'validateTitle'
-		));
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'length' => array(
-					'allowEmpty' => true,
-					'rule' => array('maxLength', 10)
-		)));
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'rule' => array('userDefined', 'Article', 'titleDuplicate')
-		));
-		$data = array('TestValidate' => array('title' => 'My Article Title'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array(
-			'title' => 'My Article With a Different Title'
-		));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'tooShort' => array('rule' => array('minLength', 50)),
-				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
-			),
-		);
-		$data = array('TestValidate' => array(
-			'title' => 'I am a short string'
-		));
-		$TestModel->create($data);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-		$result = $TestModel->validationErrors;
-		$expected = array(
-			'title' => 'onlyLetters'
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'tooShort' => array(
-					'rule' => array('minLength', 50),
-					'last' => true
-				),
-				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
-			),
-		);
-		$data = array('TestValidate' => array(
-			'title' => 'I am a short string'
-		));
-		$TestModel->create($data);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-		$result = $TestModel->validationErrors;
-		$expected = array(
-			'title' => 'tooShort'
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveField method
- *
- * @access public
- * @return void
- */
-	function testSaveField() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', 'New First Article');
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1',
-			'user_id' => '1',
-			'title' => 'New First Article',
-			'body' => 'First Article Body'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', '');
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1',
-			'user_id' => '1',
-			'title' => '',
-			'body' => 'First Article Body'
-		));
-		$result['Article']['title'] = trim($result['Article']['title']);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$TestModel->set('body', 'Messed up data');
-		$this->assertTrue($TestModel->saveField('title', 'First Article'));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1',
-			'user_id' => '1',
-			'title' => 'First Article',
-			'body' => 'First Article Body'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', '', true);
-		$this->assertFalse($result);
-
-		$this->loadFixtures('Node', 'Dependency');
-		$Node =& new Node();
-		$Node->set('id', 1);
-		$result = $Node->read();
-		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
-
-		$Node->saveField('state', 10);
-		$result = $Node->read();
-		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
-	}
-/**
- * testSaveWithCreate method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCreate() {
-		$this->loadFixtures(
-			'User',
-			'Article',
-			'User',
-			'Comment',
-			'Tag',
-			'ArticlesTag',
-			'Attachment'
-		);
-		$TestModel =& new User();
-
-		$data = array('User' => array(
-			'user' => 'user',
-			'password' => ''
-		));
-		$result = $TestModel->save($data);
-		$this->assertFalse($result);
-		$this->assertTrue(!empty($TestModel->validationErrors));
-
-		$TestModel =& new Article();
-
-		$data = array('Article' => array(
-			'user_id' => '',
-			'title' => '',
-			'body' => ''
-		));
-		$result = $TestModel->create($data) && $TestModel->save();
-		$this->assertFalse($result);
-		$this->assertTrue(!empty($TestModel->validationErrors));
-
-		$data = array('Article' => array(
-			'id' => 1,
-			'user_id' => '1',
-			'title' => 'New First Article',
-			'body' => ''
-		));
-		$result = $TestModel->create($data) && $TestModel->save();
-		$this->assertFalse($result);
-
-		$data = array('Article' => array(
-			'id' => 1,
-			'title' => 'New First Article'
-		));
-		$result = $TestModel->create() && $TestModel->save($data, false);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
-		$expected = array('Article' => array(
-			'id' => '1',
-			'user_id' => '1',
-			'title' => 'New First Article',
-			'body' => 'First Article Body',
-			'published' => 'N'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array(
-			'id' => 1,
-			'user_id' => '2',
-			'title' => 'First Article',
-			'body' => 'New First Article Body',
-			'published' => 'Y'
-		));
-		$result = $TestModel->create() && $TestModel->save($data, true, array('id', 'title', 'published'));
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
-		$expected = array('Article' => array(
-			'id' => '1',
-			'user_id' => '1',
-			'title' => 'First Article',
-			'body' => 'First Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array(
-				'user_id' => '2',
-				'title' => 'New Article',
-				'body' => 'New Article Body',
-				'created' => '2007-03-18 14:55:23',
-				'updated' => '2007-03-18 14:57:31'
-			),
-			'Tag' => array('Tag' => array(1, 3))
-		);
-		$TestModel->create();
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 4);
-		$expected = array(
-			'Article' => array(
-				'id' => '4',
-				'user_id' => '2',
-				'title' => 'New Article',
-				'body' => 'New Article Body',
-				'published' => 'N',
-				'created' => '2007-03-18 14:55:23',
-				'updated' => '2007-03-18 14:57:31'
-			),
-			'User' => array(
-				'id' => '2',
-				'user' => 'nate',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:18:23',
-				'updated' => '2007-03-17 01:20:31'
-			),
-			'Comment' => array(),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Comment' => array(
-			'article_id' => '4',
-			'user_id' => '1',
-			'comment' => 'Comment New Article',
-			'published' => 'Y',
-			'created' => '2007-03-18 14:57:23',
-			'updated' => '2007-03-18 14:59:31'
-		));
-		$result = $TestModel->Comment->create() && $TestModel->Comment->save($data);
-		$this->assertTrue($result);
-
-		$data = array('Attachment' => array(
-			'comment_id' => '7',
-			'attachment' => 'newattachment.zip',
-			'created' => '2007-03-18 15:02:23',
-			'updated' => '2007-03-18 15:04:31'
-		));
-		$result = $TestModel->Comment->Attachment->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 4);
-		$expected = array(
-			'Article' => array(
-				'id' => '4',
-				'user_id' => '2',
-				'title' => 'New Article',
-				'body' => 'New Article Body',
-				'published' => 'N',
-				'created' => '2007-03-18 14:55:23',
-				'updated' => '2007-03-18 14:57:31'
-			),
-			'User' => array(
-				'id' => '2',
-				'user' => 'nate',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:18:23',
-				'updated' => '2007-03-17 01:20:31'
-			),
-			'Comment' => array(
-				array(
-					'id' => '7',
-					'article_id' => '4',
-					'user_id' => '1',
-					'comment' => 'Comment New Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 14:57:23',
-					'updated' => '2007-03-18 14:59:31',
-					'Article' => array(
-						'id' => '4',
-						'user_id' => '2',
-						'title' => 'New Article',
-						'body' => 'New Article Body',
-						'published' => 'N',
-						'created' => '2007-03-18 14:55:23',
-						'updated' => '2007-03-18 14:57:31'
-					),
-					'User' => array(
-						'id' => '1',
-						'user' => 'mariano',
-						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-						'created' => '2007-03-17 01:16:23',
-						'updated' => '2007-03-17 01:18:31'
-					),
-					'Attachment' => array(
-						'id' => '2',
-						'comment_id' => '7',
-						'attachment' => 'newattachment.zip',
-						'created' => '2007-03-18 15:02:23',
-						'updated' => '2007-03-18 15:04:31'
-			))),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithSet method
- *
- * @access public
- * @return void
- */
-	function testSaveWithSet() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		// Create record we will be updating later
-
-		$data = array('Article' => array(
-			'user_id' => '1',
-			'title' => 'Fourth Article',
-			'body' => 'Fourth Article Body',
-			'published' => 'Y'
-		));
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		// Check record we created
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array(
-			'id' => '4',
-			'user_id' => '1',
-			'title' => 'Fourth Article',
-			'body' => 'Fourth Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		// Create new record just to overlap Model->id on previously created record
-
-		$data = array('Article' => array(
-			'user_id' => '4',
-			'title' => 'Fifth Article',
-			'body' => 'Fifth Article Body',
-			'published' => 'Y'
-		));
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array(
-			'id' => '5',
-			'user_id' => '4',
-			'title' => 'Fifth Article',
-			'body' => 'Fifth Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		// Go back and edit the first article we created, starting by checking it's still there
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array(
-			'id' => '4',
-			'user_id' => '1',
-			'title' => 'Fourth Article',
-			'body' => 'Fourth Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		// And now do the update with set()
-
-		$data = array('Article' => array(
-			'id' => '4',
-			'title' => 'Fourth Article - New Title',
-			'published' => 'N'
-		));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array(
-			'id' => '4',
-			'user_id' => '1',
-			'title' => 'Fourth Article - New Title',
-			'body' => 'Fourth Article Body',
-			'published' => 'N'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array(
-			'id' => '5',
-			'user_id' => '4',
-			'title' => 'Fifth Article',
-			'body' => 'Fifth Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array('id' => '5', 'title' => 'Fifth Article - New Title 5'));
-		$result = ($TestModel->set($data) && $TestModel->save());
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array(
-			'id' => '5',
-			'user_id' => '4',
-			'title' => 'Fifth Article - New Title 5',
-			'body' => 'Fifth Article Body',
-			'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'title' => 'First Article' )),
-			array('Article' => array('id' => 2, 'title' => 'Second Article' )),
-			array('Article' => array('id' => 3, 'title' => 'Third Article' )),
-			array('Article' => array('id' => 4, 'title' => 'Fourth Article - New Title' )),
-			array('Article' => array('id' => 5, 'title' => 'Fifth Article - New Title 5' ))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithNonExistentFields method
- *
- * @access public
- * @return void
- */
-	function testSaveWithNonExistentFields() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-		$TestModel->recursive = -1;
-
-		$data = array(
-			'non_existent' => 'This field does not exist',
-			'user_id' => '1',
-			'title' => 'Fourth Article - New Title',
-			'body' => 'Fourth Article Body',
-			'published' => 'N'
-		);
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$expected = array('Article' => array(
-			'id' => '4',
-			'user_id' => '1',
-			'title' => 'Fourth Article - New Title',
-			'body' => 'Fourth Article Body',
-			'published' => 'N'
-		));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'user_id' => '1',
-			'non_existent' => 'This field does not exist',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
-			'published' => 'N'
-		);
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$expected = array('Article' => array(
-			'id' => '5',
-			'user_id' => '1',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
-			'published' => 'N'
-		));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveFromXml method
- *
- * @access public
- * @return void
- */
-	function testSaveFromXml() {
-		$this->loadFixtures('Article');
-		App::import('Core', 'Xml');
-
-		$Article = new Article();
-		$Article->save(new Xml('<article title="test xml" user_id="5" />'));
-		$this->assertTrue($Article->save(new Xml('<article title="test xml" user_id="5" />')));
-
-		$results = $Article->find(array('Article.title' => 'test xml'));
-		$this->assertTrue($results);
-	}
-/**
- * testSaveHabtm method
- *
- * @access public
- * @return void
- */
-	function testSaveHabtm() {
-		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
-		$TestModel =& new Article();
-
-		$result = $TestModel->findById(2);
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'Second Article',
-				'body' => 'Second Article Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:41:23',
-				'updated' => '2007-03-18 10:43:31'
-			),
-			'User' => array(
-				'id' => '3',
-				'user' => 'larry',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-				'created' => '2007-03-17 01:20:23',
-				'updated' => '2007-03-17 01:22:31'
-			),
-			'Comment' => array(
-				array(
-					'id' => '5',
-					'article_id' => '2',
-					'user_id' => '1',
-					'comment' => 'First Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:53:23',
-					'updated' => '2007-03-18 10:55:31'
-				),
-				array(
-					'id' => '6',
-					'article_id' => '2',
-					'user_id' => '2',
-					'comment' => 'Second Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:55:23',
-					'updated' => '2007-03-18 10:57:31'
-			)),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array(
-				'id' => '2',
-				'title' => 'New Second Article'
-			),
-			'Tag' => array('Tag' => array(1, 2))
-		);
-
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
-		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array('id' => '2'), 'Tag' => array('Tag' => array(2, 3)));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(1, 2, 3)));
-
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array()));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Tag' => array('Tag' => ''));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array()
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(2, 3)));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Tag' => array(
-				'Tag' => array(1, 2)
-			),
-			'Article' => array(
-				'id' => '2',
-				'title' => 'New Second Article'
-		));
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Tag' => array(
-				'Tag' => array(1, 2)
-			),
-			'Article' => array(
-				'id' => '2',
-				'title' => 'New Second Article Title'
-		));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'New Second Article Title',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Tag' => array(
-				'Tag' => array(2, 3)
-			),
-			'Article' => array(
-				'id' => '2',
-				'title' => 'Changed Second Article'
-		));
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'Changed Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '2',
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Tag' => array(
-				'Tag' => array(1, 3)
-			),
-			'Article' => array('id' => '2'),
-		);
-
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2',
-				'user_id' => '3',
-				'title' => 'Changed Second Article',
-				'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array(
-					'id' => '1',
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				array(
-					'id' => '3',
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array(
-				'id' => 10,
-				'user_id' => '2',
-				'title' => 'New Article With Tags and fieldList',
-				'body' => 'New Article Body with Tags and fieldList',
-				'created' => '2007-03-18 14:55:23',
-				'updated' => '2007-03-18 14:57:31'
-			),
-			'Tag' => array(
-				'Tag' => array(1, 2, 3)
-		));
-		$result =  $TestModel->create()
-				&& $TestModel->save($data, true, array('user_id', 'title', 'published'));
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
-		$result = $TestModel->read();
-		$expected = array(
-			'Article' => array(
-				'id' => 4,
-				'user_id' => 2,
-				'title' => 'New Article With Tags and fieldList',
-				'body' => '',
-				'published' => 'N',
-				'created' => '',
-				'updated' => ''
-			),
-			'Tag' => array(
-				0 => array(
-					'id' => 1,
-					'tag' => 'tag1',
-					'created' => '2007-03-18 12:22:23',
-					'updated' => '2007-03-18 12:24:31'
-				),
-				1 => array(
-					'id' => 2,
-					'tag' => 'tag2',
-					'created' => '2007-03-18 12:24:23',
-					'updated' => '2007-03-18 12:26:31'
-				),
-				2 => array(
-					'id' => 3,
-					'tag' => 'tag3',
-					'created' => '2007-03-18 12:26:23',
-					'updated' => '2007-03-18 12:28:31'
-		)));
-		$this->assertEqual($result, $expected);
-
-
-		$this->loadFixtures('JoinA', 'JoinC', 'JoinAC', 'JoinB', 'JoinAB');
-		$TestModel = new JoinA();
-		$TestModel->hasBelongsToMany['JoinC']['unique'] = true;
-		$data = array(
-			'JoinA' => array(
-				'id' => 1,
-				'name' => 'Join A 1',
-				'body' => 'Join A 1 Body',
-			),
-			'JoinC' => array(
-				'JoinC' => array(
-					array('join_c_id' => 2, 'other' => 'new record'),
-					array('join_c_id' => 3, 'other' => 'new record')
-				)
-			)
-		);
-		$TestModel->save($data);
-		$result = $TestModel->read(null, 1);
-		$time = date('Y-M-D H:i:s');
-		$expected = array(4, 5);
-		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
-		$expected = array('new record', 'new record');
-		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
-	}
-/**
- * testSaveHabtmCustomKeys method
- *
- * @access public
- * @return void
- */
-	function testSaveHabtmCustomKeys() {
-		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
-		$Story =& new Story();
-
-		$data = array(
-			'Story' => array('story' => '1'),
-			'Tag' => array(
-				'Tag' => array(2, 3)
-		));
-		$result = $Story->set($data);
-		$this->assertTrue($result);
-
-		$result = $Story->save();
-		$this->assertTrue($result);
-
-		$result = $Story->find('all');
-		$expected = array(
-			array(
-				'Story' => array(
-					'story' => 1,
-					'title' => 'First Story'
-				),
-				'Tag' => array(
-					array(
-						'id' => 2,
-						'tag' => 'tag2',
-						'created' => '2007-03-18 12:24:23',
-						'updated' => '2007-03-18 12:26:31'
-					),
-					array(
-						'id' => 3,
-						'tag' => 'tag3',
-						'created' => '2007-03-18 12:26:23',
-						'updated' => '2007-03-18 12:28:31'
-			))),
-			array(
-				'Story' => array(
-					'story' => 2,
-					'title' => 'Second Story'
-				),
-				'Tag' => array()
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmSaveKeyResolution method
- *
- * @access public
- * @return void
- */
-	function testHabtmSaveKeyResolution() {
-		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
-		$ThePaper =& new ThePaper();
-
-		$ThePaper->id = 1;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(1, 2, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array(
-				'id' => '1',
-				'device_type_id' => '1',
-				'name' => 'Device 1',
-				'typ' => '1'
-			),
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(1, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array(
-				'id' => '1',
-				'device_type_id' => '1',
-				'name' => 'Device 1',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-			));
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-	}
-/**
- * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
- *
- * @access public
- * @return void
- */
-	function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
-
-		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
-		$ThePaper =& new ThePaper();
-		$ThePaper->id = 1;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper =& new ThePaper();
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->delete(1);
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array(
-				'id' => '2',
-				'device_type_id' => '1',
-				'name' => 'Device 2',
-				'typ' => '1'
-			),
-			array(
-				'id' => '3',
-				'device_type_id' => '1',
-				'name' => 'Device 3',
-				'typ' => '2'
-		));
-		$this->assertEqual($result['Monkey'], $expected);
-	}
-/**
- * test that Caches are getting cleared on save().
- * ensure that both inflections of controller names are getting cleared
- * as url for controller could be either overallFavorites/index or overall_favorites/index
- *
- * @return void
- **/
-	function testCacheClearOnSave() {
-		$_back = array(
-			'check' => Configure::read('Cache.check'),
-			'disable' => Configure::read('Cache.disable'),
-		);
-		Configure::write('Cache.check', true);
-		Configure::write('Cache.disable', false);
-
-		$this->loadFixtures('OverallFavorite');
-		$OverallFavorite =& new OverallFavorite();
-
-		touch(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php');
-		touch(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php');
-
-		$data = array(
-			'OverallFavorite' => array(
-		 		'model_type' => '8-track',
-				'model_id' => '3',
-				'priority' => '1'
-			)
-		);
-		$OverallFavorite->create($data);
-		$OverallFavorite->save();
-
-		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php'));
-		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php'));
-
-		Configure::write('Cache.check', $_back['check']);
-		Configure::write('Cache.disable', $_back['disable']);
-	}
-/**
- * testSaveAll method
- *
- * @access public
- * @return void
- */
-	function testSaveAll() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$result = $TestModel->find('all');
-		$this->assertEqual(count($result), 3);
-		$this->assertFalse(isset($result[3]));
-		$ts = date('Y-m-d H:i:s');
-
-		$TestModel->saveAll(array(
-			'Post' => array(
-				'title' => 'Post with Author',
-				'body' => 'This post will be saved with an author'
-			),
-			'Author' => array(
-				'user' => 'bob',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf90'
-		)));
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			'Post' => array(
-				'id' => '4',
-				'author_id' => '5',
-				'title' => 'Post with Author',
-				'body' => 'This post will be saved with an author',
-				'published' => 'N',
-				'created' => $ts,
-				'updated' => $ts
-			),
-			'Author' => array(
-				'id' => '5',
-				'user' => 'bob',
-				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
-				'created' => $ts,
-				'updated' => $ts,
-				'test' => 'working'
-		));
-		$this->assertEqual($result[3], $expected);
-		$this->assertEqual(count($result), 4);
-
-		$TestModel->deleteAll(true);
-		$this->assertEqual($TestModel->find('all'), array());
-
-		// SQLite seems to reset the PK counter when that happens, so we need this to make the tests pass
-		$this->db->truncate($TestModel);
-
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->saveAll(array(
-			array(
-				'title' => 'Multi-record post 1',
-				'body' => 'First multi-record post',
-				'author_id' => 2
-			),
-			array(
-				'title' => 'Multi-record post 2',
-				'body' => 'Second multi-record post',
-				'author_id' => 2
-		)));
-
-		$result = $TestModel->find('all', array(
-			'recursive' => -1,
-			'order' => 'Post.id ASC'
-		));
-		$expected = array(
-			array(
-				'Post' => array(
-					'id' => '1',
-					'author_id' => '2',
-					'title' => 'Multi-record post 1',
-					'body' => 'First multi-record post',
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-			)),
-			array(
-				'Post' => array(
-					'id' => '2',
-					'author_id' => '2',
-					'title' => 'Multi-record post 2',
-					'body' => 'Second multi-record post',
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-		)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Comment();
-		$ts = date('Y-m-d H:i:s');
-		$result = $TestModel->saveAll(array(
-			'Comment' => array(
-				'article_id' => 2,
-				'user_id' => 2,
-				'comment' => 'New comment with attachment',
-				'published' => 'Y'
-			),
-			'Attachment' => array(
-				'attachment' => 'some_file.tgz'
-			)));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			'id' => '7',
-			'article_id' => '2',
-			'user_id' => '2',
-			'comment' => 'New comment with attachment',
-			'published' => 'Y',
-			'created' => $ts,
-			'updated' => $ts
-		);
-		$this->assertEqual($result[6]['Comment'], $expected);
-
-		$expected = array(
-			'id' => '7',
-			'article_id' => '2',
-			'user_id' => '2',
-			'comment' => 'New comment with attachment',
-			'published' => 'Y',
-			'created' => $ts,
-			'updated' => $ts
-		);
-		$this->assertEqual($result[6]['Comment'], $expected);
-
-		$expected = array(
-			'id' => '2',
-			'comment_id' => '7',
-			'attachment' => 'some_file.tgz',
-			'created' => $ts,
-			'updated' => $ts
-		);
-		$this->assertEqual($result[6]['Attachment'], $expected);
-	}
-/**
- * Test SaveAll with Habtm relations
- *
- * @access public
- * @return void
- */
-	function testSaveAllHabtm() {
-		$this->loadFixtures('Article', 'Tag', 'Comment', 'User');
-		$data = array(
-			'Article' => array(
-				'user_id' => 1,
-				'title' => 'Article Has and belongs to Many Tags'
-			),
-			'Tag' => array(
-				'Tag' => array(1, 2)
-			),
-			'Comment' => array(
-				array(
-					'comment' => 'Article comment',
-					'user_id' => 1
-		)));
-		$Article =& new Article();
-		$result = $Article->saveAll($data);
-		$this->assertTrue($result);
-
-		$result = $Article->read();
-		$this->assertEqual(count($result['Tag']), 2);
-		$this->assertEqual($result['Tag'][0]['tag'], 'tag1');
-		$this->assertEqual(count($result['Comment']), 1);
-		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
-	}
-/**
- * Test SaveAll with Habtm relations and extra join table fields
- *
- * @access public
- * @return void
- */
-	function testSaveAllHabtmWithExtraJoinTableFields() {
-		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
-
-		$data = array(
-			'Something' => array(
-				'id' => 4,
-				'title' => 'Extra Fields',
-				'body' => 'Extra Fields Body',
-				'published' => '1'
-			),
-			'SomethingElse' => array(
-				array('something_else_id' => 1, 'doomed' => '1'),
-				array('something_else_id' => 2, 'doomed' => '0'),
-				array('something_else_id' => 3, 'doomed' => '1')
-			)
-		);
-
-		$Something =& new Something();
-		$result = $Something->saveAll($data);
-		$this->assertTrue($result);
-		$result = $Something->read();
-
-		$this->assertEqual(count($result['SomethingElse']), 3);
-		$this->assertTrue(Set::matches('/Something[id=4]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[something_else_id=1]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[doomed=1]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[something_else_id=2]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[doomed=0]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
-	}
-/**
- * testSaveAllHasOne method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasOne() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Attachment->deleteAll(true);
-		$this->assertEqual($model->Attachment->find('all'), array());
-
-		$this->assertTrue($model->saveAll(array(
-			'Comment' => array(
-				'comment' => 'Comment with attachment',
-				'article_id' => 1,
-				'user_id' => 1
-			),
-			'Attachment' => array(
-				'attachment' => 'some_file.zip'
-		))));
-		$result = $model->find('all', array('fields' => array(
-			'Comment.id', 'Comment.comment', 'Attachment.id',
-			'Attachment.comment_id', 'Attachment.attachment'
-		)));
-		$expected = array(array(
-			'Comment' => array(
-				'id' => '1',
-				'comment' => 'Comment with attachment'
-			),
-			'Attachment' => array(
-				'id' => '1',
-				'comment_id' => '1',
-				'attachment' => 'some_file.zip'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllBelongsTo method
- *
- * @access public
- * @return void
- */
-	function testSaveAllBelongsTo() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Article->deleteAll(true);
-		$this->assertEqual($model->Article->find('all'), array());
-
-		$this->assertTrue($model->saveAll(array(
-			'Comment' => array(
-				'comment' => 'Article comment',
-				'article_id' => 1,
-				'user_id' => 1
-			),
-			'Article' => array(
-				'title' => 'Model Associations 101',
-				'user_id' => 1
-		))));
-		$result = $model->find('all', array('fields' => array(
-			'Comment.id', 'Comment.comment', 'Comment.article_id', 'Article.id', 'Article.title'
-		)));
-		$expected = array(array(
-			'Comment' => array(
-				'id' => '1',
-				'article_id' => '1',
-				'comment' => 'Article comment'
-			),
-			'Article' => array(
-				'id' => '1',
-				'title' => 'Model Associations 101'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllHasOneValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasOneValidation() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Attachment->deleteAll(true);
-		$this->assertEqual($model->Attachment->find('all'), array());
-
-		$model->validate = array('comment' => 'notEmpty');
-		$model->Attachment->validate = array('attachment' => 'notEmpty');
-		$model->Attachment->bind('Comment');
-
-		$this->assertFalse($model->saveAll(
-			array(
-				'Comment' => array(
-					'comment' => '',
-					'article_id' => 1,
-					'user_id' => 1
-				),
-				'Attachment' => array('attachment' => '')
-			),
-			array('validate' => 'first')
-		));
-		$expected = array(
-			'Comment' => array('comment' => 'This field cannot be left blank'),
-			'Attachment' => array('attachment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($model->validationErrors, $expected['Comment']);
-		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
-
-		$this->assertFalse($model->saveAll(
-			array(
-				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
-				'Attachment' => array('attachment' => '')
-			),
-			array('validate' => 'only')
-		));
-		$this->assertEqual($model->validationErrors, $expected['Comment']);
-		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
-	}
-/**
- * testSaveAllAtomic method
- *
- * @access public
- * @return void
- */
-	function testSaveAllAtomic() {
-		$this->loadFixtures('Article', 'User');
-		$TestModel =& new Article();
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array(
-				'title' => 'Post with Author',
-				'body' => 'This post will be saved with an author',
-				'user_id' => 2
-			),
-			'Comment' => array(
-				array('comment' => 'First new comment', 'user_id' => 2))
-		), array('atomic' => false));
-
-		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true)));
-
-		$result = $TestModel->saveAll(array(
-			array(
-				'id' => '1',
-				'title' => 'Baleeted First Post',
-				'body' => 'Baleeted!',
-				'published' => 'N'
-			),
-			array(
-				'id' => '2',
-				'title' => 'Just update the title'
-			),
-			array(
-				'title' => 'Creating a fourth post',
-				'body' => 'Fourth post body',
-				'user_id' => 2
-			)
-		), array('atomic' => false));
-		$this->assertIdentical($result, array(true, true, true));
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$result = $TestModel->saveAll(array(
-			array(
-				'id' => '1',
-				'title' => 'Un-Baleeted First Post',
-				'body' => 'Not Baleeted!',
-				'published' => 'Y'
-			),
-			array(
-				'id' => '2',
-				'title' => '',
-				'body' => 'Trying to get away with an empty title'
-			)
-		), array('atomic' => false));
-		$this->assertIdentical($result, array(true, false));
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array(
-					'comment' => 'First new comment',
-					'published' => 'Y',
-					'user_id' => 1
-				),
-				array(
-					'comment' => 'Second new comment',
-					'published' => 'Y',
-					'user_id' => 2
-			))
-		), array('atomic' => false));
-		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
-	}
-/**
- * testSaveAllHasMany method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasMany() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
-				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
-			)
-		));
-		$this->assertTrue($result);
-
-		$result = $TestModel->findById(2);
-		$expected = array(
-			'First Comment for Second Article',
-			'Second Comment for Second Article',
-			'First new comment',
-			'Second new comment'
-		);
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array(
-						'comment' => 'Third new comment',
-						'published' => 'Y',
-						'user_id' => 1
-			))),
-			array('atomic' => false)
-		);
-		$this->assertTrue($result);
-
-		$result = $TestModel->findById(2);
-		$expected = array(
-			'First Comment for Second Article',
-			'Second Comment for Second Article',
-			'First new comment',
-			'Second new comment',
-			'Third new comment'
-		);
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-
-		$TestModel->beforeSaveReturn = false;
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array(
-						'comment' => 'Fourth new comment',
-						'published' => 'Y',
-						'user_id' => 1
-			))),
-			array('atomic' => false)
-		);
-		$this->assertEqual($result, array('Article' => false));
-
-		$result = $TestModel->findById(2);
-		$expected = array(
-			'First Comment for Second Article',
-			'Second Comment for Second Article',
-			'First new comment',
-			'Second new comment',
-			'Third new comment'
-		);
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-	}
-/**
- * testSaveAllHasManyValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasManyValidation() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
-			)
-		));
-		$expected = array('Comment' => array(false));
-		$this->assertEqual($result, $expected);
-
-		$expected = array('Comment' => array(
-			array('comment' => 'This field cannot be left blank')
-		));
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$expected = array(
-			array('comment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array(
-					'comment' => '',
-					'published' => 'Y',
-					'user_id' => 1
-			))
-		), array('validate' => 'only'));
-	}
-/**
- * testSaveAllTransaction method
- *
- * @access public
- * @return void
- */
-	function testSaveAllTransaction() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$TestModel->validate = array('title' => 'notEmpty');
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => 'New Fifth Post'),
-			array('author_id' => 1, 'title' => '')
-		);
-		$ts = date('Y-m-d H:i:s');
-		$this->assertFalse($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$expected = array(
-			array('Post' => array(
-				'id' => '1',
-				'author_id' => 1,
-				'title' => 'First Post',
-				'body' => 'First Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:39:23',
-				'updated' => '2007-03-18 10:41:31'
-			)),
-			array('Post' => array(
-				'id' => '2',
-				'author_id' => 3,
-				'title' => 'Second Post',
-				'body' => 'Second Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:41:23',
-				'updated' => '2007-03-18 10:43:31'
-			)),
-			array('Post' => array(
-				'id' => '3',
-				'author_id' => 1,
-				'title' => 'Third Post',
-				'body' => 'Third Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:43:23',
-				'updated' => '2007-03-18 10:45:31'
-		)));
-
-		if (count($result) != 3) {
-			// Database doesn't support transactions
-			$expected[] = array(
-				'Post' => array(
-					'id' => '4',
-					'author_id' => 1,
-					'title' => 'New Fourth Post',
-					'body' => null,
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-			));
-
-			$expected[] = array(
-				'Post' => array(
-					'id' => '5',
-					'author_id' => 1,
-					'title' => 'New Fifth Post',
-					'body' => null,
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-			));
-
-			$this->assertEqual($result, $expected);
-			// Skip the rest of the transactional tests
-			return;
-		}
-
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => ''),
-			array('author_id' => 1, 'title' => 'New Sixth Post')
-		);
-		$ts = date('Y-m-d H:i:s');
-		$this->assertFalse($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$expected = array(
-			array('Post' => array(
-				'id' => '1',
-				'author_id' => 1,
-				'title' => 'First Post',
-				'body' => 'First Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:39:23',
-				'updated' => '2007-03-18 10:41:31'
-			)),
-			array('Post' => array(
-				'id' => '2',
-				'author_id' => 3,
-				'title' => 'Second Post',
-				'body' => 'Second Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:41:23',
-				'updated' => '2007-03-18 10:43:31'
-			)),
-			array('Post' => array(
-				'id' => '3',
-				'author_id' => 1,
-				'title' => 'Third Post',
-				'body' => 'Third Post Body',
-				'published' => 'Y',
-				'created' => '2007-03-18 10:43:23',
-				'updated' => '2007-03-18 10:45:31'
-		)));
-
-		if (count($result) != 3) {
-			// Database doesn't support transactions
-			$expected[] = array(
-				'Post' => array(
-					'id' => '4',
-					'author_id' => 1,
-					'title' => 'New Fourth Post',
-					'body' => 'Third Post Body',
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-			));
-
-			$expected[] = array(
-				'Post' => array(
-					'id' => '5',
-					'author_id' => 1,
-					'title' => 'Third Post',
-					'body' => 'Third Post Body',
-					'published' => 'N',
-					'created' => $ts,
-					'updated' => $ts
-			));
-		}
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array('title' => 'notEmpty');
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => 'New Fifth Post'),
-			array('author_id' => 1, 'title' => 'New Sixth Post')
-		);
-		$this->assertTrue($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array(
-			'recursive' => -1,
-			'fields' => array('author_id', 'title','body','published')
-		));
-
-		$expected = array(
-			array('Post' => array(
-				'author_id' => 1,
-				'title' => 'First Post',
-				'body' => 'First Post Body',
-				'published' => 'Y'
-			)),
-			array('Post' => array(
-				'author_id' => 3,
-				'title' => 'Second Post',
-				'body' => 'Second Post Body',
-				'published' => 'Y'
-			)),
-			array('Post' => array(
-				'author_id' => 1,
-				'title' => 'Third Post',
-				'body' => 'Third Post Body',
-				'published' => 'Y'
-			)),
-			array('Post' => array(
-				'author_id' => 1,
-				'title' => 'New Fourth Post',
-				'body' => '',
-				'published' => 'N'
-			)),
-			array('Post' => array(
-				'author_id' => 1,
-				'title' => 'New Fifth Post',
-				'body' => '',
-				'published' => 'N'
-			)),
-			array('Post' => array(
-				'author_id' => 1,
-				'title' => 'New Sixth Post',
-				'body' => '',
-				'published' => 'N'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * testSaveAllValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidation() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$data = array(
-			array('id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
-			array('id' => '2', 'title' => 'Just update the title'),
-			array('title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'author_id' => 2)
-		);
-		$this->assertTrue($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
-		$ts = date('Y-m-d H:i:s');
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)),
-			array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
-			array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
-			array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$data = array(
-			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$result = $TestModel->saveAll($data);
-		$this->assertEqual($result, false);
-
-		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
-		$errors = array(1 => array('title' => 'This field cannot be left blank'));
-		$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
-		if (!$transactionWorked) {
-			$this->assertTrue(Set::matches('/Post[1][title=Un-Baleeted First Post]', $result));
-			$this->assertTrue(Set::matches('/Post[2][title=Just update the title]', $result));
-		}
-
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$data = array(
-			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$result = $TestModel->saveAll($data, array('atomic' => false));
-		$this->assertEqual($result, array(true, false));
-		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
-		$errors = array(1 => array('title' => 'This field cannot be left blank'));
-		$newTs = date('Y-m-d H:i:s');
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => $newTs)),
-			array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
-			array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
-			array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
-		);
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$data = array(
-			array('id' => '1', 'title' => 'Re-Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
-
-		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$data = array(
-			array(
-				'title' => 'First new post',
-				'body' => 'Woohoo!',
-				'published' => 'Y'
-			),
-			array(
-				'title' => 'Empty body',
-				'body' => ''
-		));
-
-		$TestModel->validate['body'] = 'notEmpty';
-	}
-/**
- * testSaveAllValidationOnly method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidationOnly() {
-		$TestModel =& new Comment();
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
-
-		$data = array(
-			'Comment' => array(
-				'comment' => 'This is the comment'
-			),
-			'Attachment' => array(
-				'attachment' => ''
-			)
-		);
-
-		$result = $TestModel->saveAll($data, array('validate' => 'only'));
-		$this->assertFalse($result);
-
-		$TestModel =& new Article();
-		$TestModel->validate = array('title' => 'notEmpty');
-		$result = $TestModel->saveAll(
-			array(
-				0 => array('title' => ''),
-				1 => array('title' => 'title 1'),
-				2 => array('title' => 'title 2'),
-			),
-			array('validate'=>'only')
-		);
-		$this->assertFalse($result);
-		$expected = array(
-			0 => array('title' => 'This field cannot be left blank'),
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-
-		$result = $TestModel->saveAll(
-			array(
-				0 => array('title' => 'title 0'),
-				1 => array('title' => ''),
-				2 => array('title' => 'title 2'),
-			),
-			array('validate'=>'only')
-		);
-		$this->assertFalse($result);
-		$expected = array(
-			1 => array('title' => 'This field cannot be left blank'),
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-	}
-/**
- * testSaveAllValidateFirst method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidateFirst() {
-		$model =& new Article();
-		$model->deleteAll(true);
-
-		$model->Comment->validate = array('comment' => 'notEmpty');
-		$result = $model->saveAll(array(
-			'Article' => array(
-				'title' => 'Post with Author',
-				'body' => 'This post will be saved  author'
-			),
-			'Comment' => array(
-				array('comment' => 'First new comment'),
-				array('comment' => '')
-			)
-		), array('validate' => 'first'));
-
-		$this->assertFalse($result);
-
-		$result = $model->find('all');
-		$this->assertEqual($result, array());
-		$expected = array('Comment' => array(
-			1 => array('comment' => 'This field cannot be left blank')
-		));
-
-		$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
-
-		$this->assertIdentical($model->Comment->find('count'), 0);
-
-		$result = $model->saveAll(
-			array(
-				'Article' => array(
-					'title' => 'Post with Author',
-					'body' => 'This post will be saved with an author',
-					'user_id' => 2
-				),
-				'Comment' => array(
-					array(
-						'comment' => 'Only new comment',
-						'user_id' => 2
-			))),
-			array('validate' => 'first')
-		);
-
-		$this->assertIdentical($result, true);
-
-		$result = $model->Comment->find('all');
-		$this->assertIdentical(count($result), 1);
-		$result = Set::extract('/Comment/article_id', $result);
-		$this->assertTrue($result[0] === 1 || $result[0] === '1');
-
-
-		$model->deleteAll(true);
-		$data = array(
-			'Article' => array(
-				'title' => 'Post with Author saveAlled from comment',
-				'body' => 'This post will be saved with an author',
-				'user_id' => 2
-			),
-			'Comment' => array(
-				'comment' => 'Only new comment', 'user_id' => 2
-		));
-
-		$result = $model->Comment->saveAll($data, array('validate' => 'first'));
-		$this->assertTrue($result);
-
-		$result = $model->find('all');
-		$this->assertEqual($result[0]['Article']['title'], 'Post with Author saveAlled from comment');
-		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
-	}
-/**
- * testSaveWithCounterCache method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCounterCache() {
-		$this->loadFixtures('Syfile', 'Item');
-		$TestModel =& new Syfile();
-		$TestModel2 =& new Item();
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], null);
-
-		$TestModel2->save(array(
-			'name' => 'Item 7',
-			'syfile_id' => 1,
-			'published' => false
-		));
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$TestModel2->delete(1);
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-
-		$TestModel2->id = 2;
-		$TestModel2->saveField('syfile_id', 1);
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$result = $TestModel->findById(2);
-		$this->assertIdentical($result['Syfile']['item_count'], '0');
-	}
-/**
- * Tests that counter caches are updated when records are added
- *
- * @access public
- * @return void
- */
-	function testCounterCacheIncrease() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-		$data = array('Post' => array(
-			'title' => 'New Post',
-			'user_id' => 66
-		));
-
-		$Post->save($data);
-		$user = $User->find('first', array(
-			'conditions' => array('id' => 66),
-			'recursive' => -1
-		));
-
-		$result = $user[$User->alias]['post_count'];
-		$expected = 3;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * Tests that counter caches are updated when records are deleted
- *
- * @access public
- * @return void
- */
-	function testCounterCacheDecrease() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-
-		$Post->del(2);
-		$user = $User->find('first', array(
-			'conditions' => array('id' => 66),
-			'recursive' => -1
-		));
-
-		$result = $user[$User->alias]['post_count'];
-		$expected = 1;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * Tests that counter caches are updated when foreign keys of counted records change
- *
- * @access public
- * @return void
- */
-	function testCounterCacheUpdated() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-
-		$data = $Post->find('first', array(
-			'conditions' => array('id' => 1),
-			'recursive' => -1
-		));
-		$data[$Post->alias]['user_id'] = 301;
-		$Post->save($data);
-
-		$users = $User->find('all',array('order' => 'User.id'));
-		$this->assertEqual($users[0]['User']['post_count'], 1);
-		$this->assertEqual($users[1]['User']['post_count'], 2);
-	}
-/**
- * Test counter cache with models that use a non-standard (i.e. not using 'id')
- * as their primary key.
- *
- * @access public
- * @return void
- */
-    function testCounterCacheWithNonstandardPrimaryKey() {
-        $this->loadFixtures(
-			'CounterCacheUserNonstandardPrimaryKey',
-			'CounterCachePostNonstandardPrimaryKey'
-		);
-
-        $User = new CounterCacheUserNonstandardPrimaryKey();
-        $Post = new CounterCachePostNonstandardPrimaryKey();
-
-		$data = $Post->find('first', array(
-			'conditions' => array('pid' => 1),
-			'recursive' => -1
-		));
-		$data[$Post->alias]['uid'] = 301;
-		$Post->save($data);
-
-		$users = $User->find('all',array('order' => 'User.uid'));
-		$this->assertEqual($users[0]['User']['post_count'], 1);
-		$this->assertEqual($users[1]['User']['post_count'], 2);
-    }
-
-/**
- * test Counter Cache With Self Joining table
- *
- * @return void
- * @access public
- */
-	function testCounterCacheWithSelfJoin() {
-		$skip = $this->skipIf(
-			($this->db->config['driver'] == 'sqlite'),
-			'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
-		);
-		if ($skip) {
-			return;
-		}
-
-		$this->loadFixtures('CategoryThread');
-		$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD COLUMN child_count INTEGER");
-		$Category =& new CategoryThread();
-		$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
-		$this->assertTrue($result);
-
-		$Category =& new CategoryThread();
-		$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
-		$Category->updateCounterCache(array('parent_id' => 5));
-		$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
-		$expected = array_fill(0, 1, 1);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithCounterCacheScope method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCounterCacheScope() {
-		$this->loadFixtures('Syfile', 'Item');
-		$TestModel =& new Syfile();
-		$TestModel2 =& new Item();
-		$TestModel2->belongsTo['Syfile']['counterCache'] = true;
-		$TestModel2->belongsTo['Syfile']['counterScope'] = array('published' => true);
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], null);
-
-		$TestModel2->save(array(
-			'name' => 'Item 7',
-			'syfile_id' => 1,
-			'published'=> true
-		));
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-
-		$TestModel2->id = 1;
-		$TestModel2->saveField('published', true);
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$TestModel2->save(array(
-			'id' => 1,
-			'syfile_id' => 1,
-			'published'=> false
-		));
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-	}
-/**
- * testDel method
- *
- * @access public
- * @return void
- */
-	function testDel() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$result = $TestModel->del(2);
-		$this->assertTrue($result);
-
-		$result = $TestModel->read(null, 2);
-		$this->assertFalse($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array(
-			'fields' => array('id', 'title')
-		));
-		$expected = array(
-			array('Article' => array(
-				'id' => 1,
-				'title' => 'First Article'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'title' => 'Third Article'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->del(3);
-		$this->assertTrue($result);
-
-		$result = $TestModel->read(null, 3);
-		$this->assertFalse($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array(
-			'fields' => array('id', 'title')
-		));
-		$expected = array(
-			array('Article' => array(
-				'id' => 1,
-				'title' => 'First Article'
-		)));
-
-		$this->assertEqual($result, $expected);
-
-
-		// make sure deleting a non-existent record doesn't break save()
-		// ticket #6293
-		$this->loadFixtures('Uuid');
-		$Uuid =& new Uuid();
-		$data = array(
-			'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3',
-			'52C8865C-10EE-4302-AE6C-6E7D8E12E2C8',
-			'8208C7FE-E89C-47C5-B378-DED6C271F9B8');
-		foreach ($data as $id) {
-			$Uuid->save(array('id' => $id));
-		}
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
-		foreach ($data as $id) {
-			$Uuid->save(array('id' => $id));
-		}
-		$result = $Uuid->find('all', array(
-			'conditions' => array('id' => $data),
-			'fields' => array('id'),
-			'order' => 'id'));
-		$expected = array(
-			array('Uuid' => array(
-				'id' => '52C8865C-10EE-4302-AE6C-6E7D8E12E2C8')),
-			array('Uuid' => array(
-				'id' => '8208C7FE-E89C-47C5-B378-DED6C271F9B8')),
-			array('Uuid' => array(
-				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDeleteAll method
- *
- * @access public
- * @return void
- */
-	function testDeleteAll() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$data = array('Article' => array(
-			'user_id' => 2,
-			'id' => 4,
-			'title' => 'Fourth Article',
-			'published' => 'N'
-		));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Article' => array(
-			'user_id' => 2,
-			'id' => 5,
-			'title' => 'Fifth Article',
-			'published' => 'Y'
-		));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Article' => array(
-			'user_id' => 1,
-			'id' => 6,
-			'title' => 'Sixth Article',
-			'published' => 'N'
-		));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array(
-			'fields' => array('id', 'user_id', 'title', 'published')
-		));
-
-		$expected = array(
-			array('Article' => array(
-				'id' => 1,
-				'user_id' => 1,
-				'title' => 'First Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 2,
-				'user_id' => 3,
-				'title' => 'Second Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'user_id' => 1,
-				'title' => 'Third Article',
-				'published' => 'Y')),
-			array('Article' => array(
-				'id' => 4,
-				'user_id' => 2,
-				'title' => 'Fourth Article',
-				'published' => 'N'
-			)),
-			array('Article' => array(
-				'id' => 5,
-				'user_id' => 2,
-				'title' => 'Fifth Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 6,
-				'user_id' => 1,
-				'title' => 'Sixth Article',
-				'published' => 'N'
-		)));
-
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->deleteAll(array('Article.published' => 'N'));
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array(
-			'fields' => array('id', 'user_id', 'title', 'published')
-		));
-		$expected = array(
-			array('Article' => array(
-				'id' => 1,
-				'user_id' => 1,
-				'title' => 'First Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 2,
-				'user_id' => 3,
-				'title' => 'Second Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'user_id' => 1,
-				'title' => 'Third Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 5,
-				'user_id' => 2,
-				'title' => 'Fifth Article',
-				'published' => 'Y'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article.user_id' => array(2, 3));
-		$result = $TestModel->deleteAll($data, true, true);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array(
-			'fields' => array('id', 'user_id', 'title', 'published')
-		));
-		$expected = array(
-			array('Article' => array(
-				'id' => 1,
-				'user_id' => 1,
-				'title' => 'First Article',
-				'published' => 'Y'
-			)),
-			array('Article' => array(
-				'id' => 3,
-				'user_id' => 1,
-				'title' => 'Third Article',
-				'published' => 'Y'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
-		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
-	}
-/**
- * testRecursiveDel method
- *
- * @access public
- * @return void
- */
-	function testRecursiveDel() {
-		$this->loadFixtures('Article', 'Comment', 'Attachment');
-		$TestModel =& new Article();
-
-		$result = $TestModel->del(2);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 2);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->read(null, 5);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->read(null, 6);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->Attachment->read(null, 1);
-		$this->assertFalse($result);
-
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 2);
-
-		$result = $TestModel->Comment->find('count');
-		$this->assertEqual($result, 4);
-
-		$result = $TestModel->Comment->Attachment->find('count');
-		$this->assertEqual($result, 0);
-	}
-/**
- * testDependentExclusiveDelete method
- *
- * @access public
- * @return void
- */
-	function testDependentExclusiveDelete() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article10();
-
-		$result = $TestModel->find('all');
-		$this->assertEqual(count($result[0]['Comment']), 4);
-		$this->assertEqual(count($result[1]['Comment']), 2);
-		$this->assertEqual($TestModel->Comment->find('count'), 6);
-
-		$TestModel->delete(1);
-		$this->assertEqual($TestModel->Comment->find('count'), 2);
-	}
-/**
- * testDeleteLinks method
- *
- * @access public
- * @return void
- */
-	function testDeleteLinks() {
-		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
-		$TestModel =& new Article();
-
-		$result = $TestModel->ArticlesTag->find('all');
-		$expected = array(
-			array('ArticlesTag' => array(
-				'article_id' => '1',
-				'tag_id' => '1'
-			)),
-			array('ArticlesTag' => array(
-				'article_id' => '1',
-				'tag_id' => '2'
-			)),
-			array('ArticlesTag' => array(
-				'article_id' => '2',
-				'tag_id' => '1'
-			)),
-			array('ArticlesTag' => array(
-				'article_id' => '2',
-				'tag_id' => '3'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->delete(1);
-		$result = $TestModel->ArticlesTag->find('all');
-
-		$expected = array(
-			array('ArticlesTag' => array(
-				'article_id' => '2',
-				'tag_id' => '1'
-			)),
-			array('ArticlesTag' => array(
-				'article_id' => '2',
-				'tag_id' => '3'
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllThreaded method
- *
- * @access public
- * @return void
- */
-	function testFindAllThreaded() {
-		$this->loadFixtures('Category');
-		$TestModel =& new Category();
-
-		$result = $TestModel->find('threaded');
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'conditions' => array('Category.name LIKE' => 'Category 1%')
-		));
-
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'fields' => 'id, parent_id, name'
-		));
-
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('order' => 'id DESC'));
-
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => 5,
-					'parent_id' => 0,
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => 6,
-							'parent_id' => 5,
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => 4,
-					'parent_id' => 0,
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => 1,
-					'parent_id' => 0,
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => 3,
-							'parent_id' => 1,
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					),
-					array(
-						'Category' => array(
-							'id' => 2,
-							'parent_id' => 1,
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'conditions' => array('Category.name LIKE' => 'Category 3%')
-		));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'conditions' => array('Category.name LIKE' => 'Category 1.1%')
-		));
-		$expected = array(
-				array('Category' =>
-					array(
-						'id' => '2',
-						'parent_id' => '1',
-						'name' => 'Category 1.1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31'),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'fields' => 'id, parent_id, name',
-			'conditions' => array('Category.id !=' => 2)
-		));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array(
-			'fields' => 'id, name, parent_id',
-			'conditions' => array('Category.id !=' => 1)
-		));
-		$expected = array (
-			array ('Category' => array(
-				'id' => '2',
-				'name' => 'Category 1.1',
-				'parent_id' => '1'
-			)),
-			array ('Category' => array(
-				'id' => '3',
-				'name' => 'Category 1.2',
-				'parent_id' => '1'
-			)),
-			array ('Category' => array(
-				'id' => '4',
-				'name' => 'Category 2',
-				'parent_id' => '0'
-			)),
-			array ('Category' => array(
-				'id' => '5',
-				'name' => 'Category 3',
-				'parent_id' => '0'
-			)),
-			array ('Category' => array(
-				'id' => '6',
-				'name' => 'Category 3.1',
-				'parent_id' => '5'
-			)),
-			array ('Category' => array(
-				'id' => '7',
-				'name' => 'Category 1.1.1',
-				'parent_id' => '2'
-			)),
-			array ('Category' => array(
-				'id' => '8',
-				'name' => 'Category 1.1.2',
-				'parent_id' => '2'
-		)));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array(
-			'fields' => 'id, parent_id, name',
-			'conditions' => array('Category.id !=' => 1)
-		));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '2',
-					'parent_id' => '1',
-					'name' => 'Category 1.1'
-				),
-				'children' => array(
-					array('Category' => array(
-						'id' => '7',
-						'parent_id' => '2',
-						'name' => 'Category 1.1.1'),
-						'children' => array()),
-					array('Category' => array(
-						'id' => '8',
-						'parent_id' => '2',
-						'name' => 'Category 1.1.2'),
-						'children' => array()))
-			),
-			array(
-				'Category' => array(
-					'id' => '3',
-					'parent_id' => '1',
-					'name' => 'Category 1.2'
-				),
-				'children' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * test find('neighbors')
- *
- * @return void
- * @access public
- */
-	function testFindNeighbors() {
-		$this->loadFixtures('User', 'Article');
-		$TestModel =& new Article();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('fields' => array('id')));
-		$expected = array(
-			'prev' => null,
-			'next' => array(
-				'Article' => array('id' => 2)
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array(
-			'fields' => array('id')
-		));
-
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 1
-			)),
-			'next' => array(
-				'Article' => array(
-					'id' => 3
-		)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('fields' => array('id')));
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 2
-			)),
-			'next' => null
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => null,
-			'next' => array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			'next' => array(
-				'Article' => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			),
-			'next' => null
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 0;
-		$TestModel->id = 1;
-		$one = $TestModel->read();
-		$TestModel->id = 2;
-		$two = $TestModel->read();
-		$TestModel->id = 3;
-		$three = $TestModel->read();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => null, 'next' => $two);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => $one, 'next' => $three);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => $two, 'next' => null);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 2;
-		$TestModel->id = 1;
-		$one = $TestModel->read();
-		$TestModel->id = 2;
-		$two = $TestModel->read();
-		$TestModel->id = 3;
-		$three = $TestModel->read();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => null, 'next' => $two);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => $one, 'next' => $three);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => $two, 'next' => null);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindCombinedRelations method
- *
- * @access public
- * @return void
- */
-	function testFindCombinedRelations() {
-		$this->loadFixtures('Apple', 'Sample');
-		$TestModel =& new Apple();
-
-		$result = $TestModel->find('all');
-
-		$expected = array(
-			array(
-				'Apple' => array(
-					'id' => '1',
-					'apple_id' => '2',
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '2',
-					'apple_id' => '1',
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => null,
-					'apple_id' => null,
-					'name' => null
-				),
-				'Child' => array(
-					array(
-						'id' => '2',
-						'apple_id' => '1',
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => '2',
-					'apple_id' => '1',
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '1',
-					'apple_id' => '2',
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => '2',
-					'apple_id' => '2',
-					'name' => 'sample2'
-				),
-				'Child' => array(
-					array(
-						'id' => '1',
-						'apple_id' => '2',
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => '3',
-						'apple_id' => '2',
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => '4',
-						'apple_id' => '2',
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => '3',
-					'apple_id' => '2',
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '2',
-					'apple_id' => '1',
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => '1',
-					'apple_id' => '3',
-					'name' => 'sample1'
-				),
-				'Child' => array()
-			),
-			array(
-				'Apple' => array(
-					'id' => '4',
-					'apple_id' => '2',
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '2',
-					'apple_id' => '1',
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => '3',
-					'apple_id' => '4',
-					'name' => 'sample3'
-				),
-				'Child' => array(
-					array(
-						'id' => '6',
-						'apple_id' => '4',
-						'color' => 'My new appleOrange',
-						'name' => 'My new apple',
-						'created' => '2006-12-25 05:29:39',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:39',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => '5',
-					'apple_id' => '5',
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '5',
-					'apple_id' => '5',
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => '4',
-					'apple_id' => '5',
-					'name' => 'sample4'
-				),
-				'Child' => array(
-					array(
-						'id' => '5',
-						'apple_id' => '5',
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => '6',
-					'apple_id' => '4',
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '4',
-					'apple_id' => '2',
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => null,
-					'apple_id' => null,
-					'name' => null
-				),
-				'Child' => array(
-					array(
-						'id' => '7',
-						'apple_id' => '6',
-						'color' => 'Some wierd color',
-						'name' => 'Some odd color',
-						'created' => '2006-12-25 05:34:21',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:34:21',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => '7',
-					'apple_id' => '6',
-					'color' => 'Some wierd color',
-					'name' => 'Some odd color',
-					'created' => '2006-12-25 05:34:21',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:34:21',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => '6',
-					'apple_id' => '4',
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'
-				),
-				'Sample' => array(
-					'id' => null,
-					'apple_id' => null,
-					'name' => null
-				),
-				'Child' => array()
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveEmpty method
- *
- * @access public
- * @return void
- */
-	function testSaveEmpty() {
-		$this->loadFixtures('Thread');
-		$TestModel =& new Thread();
-		$data = array();
-		$expected = $TestModel->save($data);
-		$this->assertFalse($expected);
-	}
-	// function testBasicValidation() {
-	// 	$TestModel =& new ValidationTest1();
-	// 	$TestModel->testing = true;
-	// 	$TestModel->set(array('title' => '', 'published' => 1));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('title' => 'This field cannot be left blank'));
-	//
-	// 	$TestModel->create();
-	// 	$TestModel->set(array('title' => 'Hello', 'published' => 0));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('published' => 'This field cannot be left blank'));
-	//
-	// 	$TestModel->create();
-	// 	$TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => ''));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank'));
-	// }
-
-/**
- * testFindAllWithConditionInChildQuery
- *
- * @todo external conditions like this are going to need to be revisited at some point
- * @access public
- * @return void
- */
-	function testFindAllWithConditionInChildQuery() {
-		$this->loadFixtures('Basket', 'FilmFile');
-
-		$TestModel =& new Basket();
-		$recursive = 3;
-		$result = $TestModel->find('all', compact('conditions', 'recursive'));
-
-		$expected = array(
-			array(
-				'Basket' => array(
-					'id' => 1,
-					'type' => 'nonfile',
-					'name' => 'basket1',
-					'object_id' => 1,
-					'user_id' => 1,
-				),
-				'FilmFile' => array(
-					'id' => '',
-					'name' => '',
-				)
-			),
-			array(
-				'Basket' => array(
-					'id' => 2,
-					'type' => 'file',
-					'name' => 'basket2',
-					'object_id' => 2,
-					'user_id' => 1,
-				),
-				'FilmFile' => array(
-					'id' => 2,
-					'name' => 'two',
-				)
-			),
-		);
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * testFindAllWithConditionsHavingMixedDataTypes method
- *
- * @access public
- * @return void
- */
-	function testFindAllWithConditionsHavingMixedDataTypes() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			)
-		);
-		$conditions = array('id' => array('1', 2));
-		$recursive = -1;
-		$order = 'Article.id ASC';
-		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
-		$this->assertEqual($result, $expected);
-
-
-		$conditions = array('id' => array('1', 2, '3.0'));
-		$order = 'Article.id ASC';
-		$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testValidationParams() {
-		$TestModel =& new ValidationTest1();
-		$TestModel->validate['title'] = array(
-			'rule' => 'customValidatorWithParams',
-			'required' => true
-		);
-		$TestModel->create(array('title' => 'foo'));
-		$TestModel->invalidFields();
-
-		$expected = array(
-			'data' => array(
-				'title' => 'foo'
-			),
-			'validator' => array(
-				'rule' => 'customValidatorWithParams',
-				'on' => null,
-				'last' => false,
-				'allowEmpty' => false,
-				'required' => true
-			),
-			'or' => true,
-			'ignore_on_same' => 'id'
-		);
-		$this->assertEqual($TestModel->validatorParams, $expected);
-
-		$TestModel->validate['title'] = array(
-			'rule' => 'customValidatorWithMessage',
-			'required' => true
-		);
-		$expected = array(
-			'title' => 'This field will *never* validate! Muhahaha!'
-		);
-
-		$this->assertEqual($TestModel->invalidFields(), $expected);
-	}
-/**
- * Tests validation parameter fieldList in invalidFields
- *
- * @access public
- * @return void
- */
-	function testInvalidFieldsWithFieldListParams() {
-		$TestModel =& new ValidationTest1();
-		$TestModel->validate = $validate = array(
-			'title' => array(
-				'rule' => 'customValidator',
-				'required' => true
-			),
-			'name' => array(
-				'rule' => 'allowEmpty',
-				'required' => true
-		));
-		$TestModel->invalidFields(array('fieldList' => array('title')));
-		$expected = array(
-			'title' => 'This field cannot be left blank'
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->invalidFields(array('fieldList' => array('name')));
-		$expected = array(
-			'name' => 'This field cannot be left blank'
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->invalidFields(array('fieldList' => array('name', 'title')));
-		$expected = array(
-			'name' => 'This field cannot be left blank',
-			'title' => 'This field cannot be left blank'
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->whitelist = array('name');
-		$TestModel->invalidFields();
-		$expected = array('name' => 'This field cannot be left blank');
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$this->assertEqual($TestModel->validate, $validate);
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testAllowSimulatedFields() {
-		$TestModel =& new ValidationTest1();
-
-		$TestModel->create(array(
-			'title' => 'foo',
-			'bar' => 'baz'
-		));
-		$expected = array(
-			'ValidationTest1' => array(
-				'title' => 'foo',
-				'bar' => 'baz'
-		));
-		$this->assertEqual($TestModel->data, $expected);
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testInvalidAssociation() {
-		$TestModel =& new ValidationTest1();
-		$this->assertNull($TestModel->getAssociated('Foo'));
-	}
-/**
- * testLoadModelSecondIteration method
- *
- * @access public
- * @return void
- */
-	function testLoadModelSecondIteration() {
-		$model = new ModelA();
-		$this->assertIsA($model,'ModelA');
-
-		$this->assertIsA($model->ModelB, 'ModelB');
-		$this->assertIsA($model->ModelB->ModelD, 'ModelD');
-
-		$this->assertIsA($model->ModelC, 'ModelC');
-		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
-	}
-/**
- * testRecursiveUnbind method
- *
- * @access public
- * @return void
- */
-	function testRecursiveUnbind() {
-		$this->loadFixtures('Apple', 'Sample');
-		$TestModel =& new Apple();
-		$TestModel->recursive = 2;
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Apple' => array (
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-					))),
-					'Sample' => array(
-						'id' =>'',
-						'apple_id' => '',
-						'name' => ''
-					),
-					'Child' => array(
-						array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 1,
-								'apple_id' => 2,
-								'color' => 'Red 1',
-								'name' => 'Red Apple 1',
-								'created' => '2006-11-22 10:38:58',
-								'date' => '1951-01-04',
-								'modified' => '2006-12-01 13:31:26',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(
-								'id' => 2,
-								'apple_id' => 2,
-								'name' => 'sample2'
-							),
-							'Child' => array(
-								array(
-									'id' => 1,
-									'apple_id' => 2,
-									'color' => 'Red 1',
-									'name' => 'Red Apple 1',
-									'created' => '2006-11-22 10:38:58',
-									'date' => '1951-01-04',
-									'modified' => '2006-12-01 13:31:26',
-									'mytime' => '22:57:17'
-								),
-								array(
-									'id' => 3,
-									'apple_id' => 2,
-									'color' => 'blue green',
-									'name' => 'green blue',
-									'created' => '2006-12-25 05:13:36',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:23:24',
-									'mytime' => '22:57:17'
-								),
-								array(
-									'id' => 4,
-									'apple_id' => 2,
-									'color' => 'Blue Green',
-									'name' => 'Test Name',
-									'created' => '2006-12-25 05:23:36',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:23:36',
-									'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(),
-						'Child' => array(
-							array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01',
-								'modified' => '2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-					))),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2',
-						'Apple' => array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-					)),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01',
-								'modified' => '2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(),
-							'Child' => array(
-								array(
-									'id' => 2,
-									'apple_id' => 1,
-									'color' => 'Bright Red 1',
-									'name' => 'Bright Red Apple',
-									'created' => '2006-11-22 10:43:13',
-									'date' => '2014-01-01',
-									'modified' => '2006-11-30 18:38:10',
-									'mytime' => '22:57:17'
-						))),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01',
-								'modified' => '2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(
-								'id' => 1,
-								'apple_id' => 3,
-								'name' => 'sample1'
-						)),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01',
-								'modified' => '2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(
-								'id' => 3,
-								'apple_id' => 4,
-								'name' => 'sample3'
-							),
-							'Child' => array(
-								array(
-									'id' => 6,
-									'apple_id' => 4,
-									'color' => 'My new appleOrange',
-									'name' => 'My new apple',
-									'created' => '2006-12-25 05:29:39',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:29:39',
-									'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 3,
-					'apple_id' => 2,
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 1,
-					'apple_id' => 3,
-					'name' => 'sample1',
-					'Apple' => array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array()
-			),
-			array(
-				'Apple' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array(
-								'id' => 1,
-								'apple_id' => 2,
-								'color' => 'Red 1',
-								'name' => 'Red Apple 1',
-								'created' => '2006-11-22 10:38:58',
-								'date' => '1951-01-04',
-								'modified' => '2006-12-01 13:31:26',
-								'mytime' => '22:57:17'
-							),
-							array(
-								'id' => 3,
-								'apple_id' => 2,
-								'color' => 'blue green',
-								'name' => 'green blue',
-								'created' => '2006-12-25 05:13:36',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:23:24',
-								'mytime' => '22:57:17'
-							),
-							array(
-								'id' => 4,
-								'apple_id' => 2,
-								'color' => 'Blue Green',
-								'name' => 'Test Name',
-								'created' => '2006-12-25 05:23:36',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:23:36',
-								'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 3,
-					'apple_id' => 4,
-					'name' => 'sample3',
-					'Apple' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array(
-					array(
-						'id' => 6,
-						'apple_id' => 4,
-						'color' => 'My new appleOrange',
-						'name' => 'My new apple',
-						'created' => '2006-12-25 05:29:39',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:39',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(),
-						'Child' => array(
-							array(
-								'id' => 7,
-								'apple_id' => 6,
-								'color' => 'Some wierd color',
-								'name' => 'Some odd color',
-								'created' => '2006-12-25 05:34:21',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:34:21',
-								'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 4,
-						'apple_id' => 5,
-						'name' => 'sample4'
-					),
-					'Child' => array(
-						array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 4,
-					'apple_id' => 5,
-					'name' => 'sample4',
-					'Apple' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-					)),
-					'Child' => array(
-						array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 5,
-								'apple_id' => 5,
-								'color' => 'Green',
-								'name' => 'Blue Green',
-								'created' => '2006-12-25 05:24:06',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:29:16',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(
-								'id' => 4,
-								'apple_id' => 5,
-								'name' => 'sample4'
-							),
-							'Child' => array(
-								array(
-									'id' => 5,
-									'apple_id' => 5,
-									'color' => 'Green',
-									'name' => 'Blue Green',
-									'created' => '2006-12-25 05:24:06',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:29:16',
-									'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 3,
-						'apple_id' => 4,
-						'name' => 'sample3'
-					),
-					'Child' => array(
-						array(
-							'id' => 6,
-							'apple_id' => 4,
-							'color' => 'My new appleOrange',
-							'name' => 'My new apple',
-							'created' => '2006-12-25 05:29:39',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:39',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-				),
-				'Child' => array(
-					array(
-						'id' => 7,
-						'apple_id' => 6,
-						'color' => 'Some wierd color',
-						'name' => 'Some odd color',
-						'created' => '2006-12-25 05:34:21',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:34:21',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 6,
-							'apple_id' => 4,
-							'color' => 'My new appleOrange',
-							'name' => 'My new apple',
-							'created' => '2006-12-25 05:29:39',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:39',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array()
-			))),
-			array(
-				'Apple' => array(
-					'id' => 7,
-					'apple_id' => 6,
-					'color' =>
-					'Some wierd color',
-					'name' => 'Some odd color',
-					'created' => '2006-12-25 05:34:21',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:34:21',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(),
-					'Child' => array(
-						array(
-							'id' => 7,
-							'apple_id' => 6,
-							'color' => 'Some wierd color',
-							'name' => 'Some odd color',
-							'created' => '2006-12-25 05:34:21',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:34:21',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-				),
-				'Child' => array()));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Apple' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'),
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						'Child' => array(
-							array(
-								'id' => 1,
-								'apple_id' => 2,
-								'color' => 'Red 1',
-								'name' => 'Red Apple 1',
-								'created' => '2006-11-22 10:38:58',
-								'date' => '1951-01-04',
-								'modified' => '2006-12-01 13:31:26',
-								'mytime' => '22:57:17'
-							),
-							array(
-								'id' => 3,
-								'apple_id' => 2,
-								'color' => 'blue green',
-								'name' => 'green blue',
-								'created' => '2006-12-25 05:13:36',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:23:24',
-								'mytime' => '22:57:17'
-							),
-							array(
-								'id' => 4,
-								'apple_id' => 2,
-								'color' => 'Blue Green',
-								'name' => 'Test Name',
-								'created' => '2006-12-25 05:23:36',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:23:36',
-								'mytime' => '22:57:17'
-					))),
-					'Sample' => array(
-						'id' =>'',
-						'apple_id' => '',
-						'name' => ''
-					),
-					'Child' => array(
-						array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17',
-							'Parent' => array(
-								'id' => 1,
-								'apple_id' => 2,
-								'color' => 'Red 1',
-								'name' => 'Red Apple 1',
-								'created' => '2006-11-22 10:38:58',
-								'date' => '1951-01-04',
-								'modified' => '2006-12-01 13:31:26',
-								'mytime' => '22:57:17'
-							),
-							'Sample' => array(
-								'id' => 2,
-								'apple_id' => 2,
-								'name' => 'sample2'
-							),
-							'Child' => array(
-								array(
-									'id' => 1,
-									'apple_id' => 2,
-									'color' => 'Red 1',
-									'name' => 'Red Apple 1',
-									'created' => '2006-11-22 10:38:58',
-									'date' => '1951-01-04',
-									'modified' => '2006-12-01 13:31:26',
-									'mytime' => '22:57:17'
-								),
-								array(
-									'id' => 3,
-									'apple_id' => 2,
-									'color' => 'blue green',
-									'name' => 'green blue',
-									'created' => '2006-12-25 05:13:36',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:23:24',
-									'mytime' => '22:57:17'
-								),
-								array(
-									'id' => 4,
-									'apple_id' => 2,
-									'color' => 'Blue Green',
-									'name' => 'Test Name',
-									'created' => '2006-12-25 05:23:36',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:23:36',
-									'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 2,
-					'apple_id' => 2,
-					'name' => 'sample2',
-					'Apple' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array(
-					array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(),
-						'Child' => array(
-							array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01', 'modified' =>
-								'2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-					))),
-					array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(
-							'id' => 1,
-							'apple_id' => 3,
-							'name' => 'sample1'
-					)),
-					array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(
-							'id' => 3,
-							'apple_id' => 4,
-							'name' => 'sample3'
-						),
-						'Child' => array(
-							array(
-								'id' => 6,
-								'apple_id' => 4,
-								'color' => 'My new appleOrange',
-								'name' => 'My new apple',
-								'created' => '2006-12-25 05:29:39',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:29:39',
-								'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 3,
-					'apple_id' => 2,
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 1,
-					'apple_id' => 3,
-					'name' => 'sample1',
-					'Apple' => array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array()
-			),
-			array(
-				'Apple' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 3,
-					'apple_id' => 4,
-					'name' => 'sample3',
-					'Apple' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array(
-					array(
-						'id' => 6,
-						'apple_id' => 4,
-						'color' => 'My new appleOrange',
-						'name' => 'My new apple',
-						'created' => '2006-12-25 05:29:39',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:39',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(),
-							'Child' => array(
-								array(
-									'id' => 7,
-									'apple_id' => 6,
-									'color' => 'Some wierd color',
-									'name' => 'Some odd color',
-									'created' => '2006-12-25 05:34:21',
-									'date' => '2006-12-25',
-									'modified' => '2006-12-25 05:34:21',
-									'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 4,
-					'apple_id' => 5,
-					'name' => 'sample4',
-					'Apple' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-				)),
-				'Child' => array(
-					array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array(
-							'id' => 4,
-							'apple_id' => 5,
-							'name' => 'sample4'
-						),
-						'Child' => array(
-							array(
-								'id' => 5,
-								'apple_id' => 5,
-								'color' => 'Green',
-								'name' => 'Blue Green',
-								'created' => '2006-12-25 05:24:06',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:29:16',
-								'mytime' => '22:57:17'
-			))))),
-			array(
-				'Apple' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 6,
-							'apple_id' => 4,
-							'color' => 'My new appleOrange',
-							'name' => 'My new apple',
-							'created' => '2006-12-25 05:29:39',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:39',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-				),
-				'Child' => array(
-					array(
-						'id' => 7,
-						'apple_id' => 6,
-						'color' => 'Some wierd color',
-						'name' => 'Some odd color',
-						'created' => '2006-12-25 05:34:21',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:34:21',
-						'mytime' => '22:57:17',
-						'Parent' => array(
-							'id' => 6,
-							'apple_id' => 4,
-							'color' => 'My new appleOrange',
-							'name' => 'My new apple',
-							'created' => '2006-12-25 05:29:39',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:39',
-							'mytime' => '22:57:17'
-						),
-						'Sample' => array()
-			))),
-			array(
-				'Apple' => array(
-					'id' => 7,
-					'apple_id' => 6,
-					'color' => 'Some wierd color',
-					'name' => 'Some odd color',
-					'created' => '2006-12-25 05:34:21',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:34:21',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 7,
-							'apple_id' => 6,
-							'color' => 'Some wierd color',
-							'name' => 'Some odd color',
-							'created' => '2006-12-25 05:34:21',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:34:21',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-				),
-				'Child' => array()
-		));
-
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Apple' => array (
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' =>'',
-					'apple_id' => '',
-					'name' => ''
-			)),
-			array(
-				'Apple' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Child' => array(
-						array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 2,
-					'apple_id' => 2,
-					'name' => 'sample2',
-					'Apple' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-				'id' => 3,
-				'apple_id' => 2,
-				'color' => 'blue green',
-				'name' => 'green blue',
-				'created' => '2006-12-25 05:13:36',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:23:24',
-				'mytime' => '22:57:17'
-			),
-			'Parent' => array(
-				'id' => 2,
-				'apple_id' => 1,
-				'color' => 'Bright Red 1',
-				'name' => 'Bright Red Apple',
-				'created' => '2006-11-22 10:43:13',
-				'date' => '2014-01-01',
-				'modified' => '2006-11-30 18:38:10',
-				'mytime' => '22:57:17',
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Child' => array(
-					array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-			))),
-			'Sample' => array(
-				'id' => 1,
-				'apple_id' => 3,
-				'name' => 'sample1',
-				'Apple' => array(
-					'id' => 3,
-					'apple_id' => 2,
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-		))),
-		array(
-			'Apple' => array(
-				'id' => 4,
-				'apple_id' => 2,
-				'color' => 'Blue Green',
-				'name' => 'Test Name',
-				'created' => '2006-12-25 05:23:36',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:23:36',
-				'mytime' => '22:57:17'
-			),
-			'Parent' => array(
-				'id' => 2,
-				'apple_id' => 1,
-				'color' => 'Bright Red 1',
-				'name' => 'Bright Red Apple',
-				'created' => '2006-11-22 10:43:13',
-				'date' => '2014-01-01',
-				'modified' => '2006-11-30 18:38:10',
-				'mytime' => '22:57:17',
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Child' => array(
-					array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-					),
-					array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-			))),
-			'Sample' => array(
-				'id' => 3,
-				'apple_id' => 4,
-				'name' => 'sample3',
-				'Apple' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-		))),
-		array(
-			'Apple' => array(
-				'id' => 5,
-				'apple_id' => 5,
-				'color' => 'Green',
-				'name' => 'Blue Green',
-				'created' => '2006-12-25 05:24:06',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:29:16',
-				'mytime' => '22:57:17'
-			),
-			'Parent' => array(
-				'id' => 5,
-				'apple_id' => 5,
-				'color' => 'Green',
-				'name' => 'Blue Green',
-				'created' => '2006-12-25 05:24:06',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:29:16',
-				'mytime' => '22:57:17',
-				'Parent' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Child' => array(
-					array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-			))),
-			'Sample' => array(
-				'id' => 4,
-				'apple_id' => 5,
-				'name' => 'sample4',
-				'Apple' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-		))),
-		array(
-			'Apple' => array(
-				'id' => 6,
-				'apple_id' => 4,
-				'color' => 'My new appleOrange',
-				'name' => 'My new apple',
-				'created' => '2006-12-25 05:29:39',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:29:39',
-				'mytime' => '22:57:17'
-			),
-			'Parent' => array(
-				'id' => 4,
-				'apple_id' => 2,
-				'color' => 'Blue Green',
-				'name' => 'Test Name',
-				'created' => '2006-12-25 05:23:36',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:23:36',
-				'mytime' => '22:57:17',
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Child' => array(
-					array(
-						'id' => 6,
-						'apple_id' => 4,
-						'color' => 'My new appleOrange',
-						'name' => 'My new apple',
-						'created' => '2006-12-25 05:29:39',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:39',
-						'mytime' => '22:57:17'
-			))),
-			'Sample' => array(
-				'id' => '',
-				'apple_id' => '',
-				'name' => ''
-		)),
-		array(
-			'Apple' => array(
-				'id' => 7,
-				'apple_id' => 6,
-				'color' => 'Some wierd color',
-				'name' => 'Some odd color',
-				'created' => '2006-12-25 05:34:21',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:34:21',
-				'mytime' => '22:57:17'
-			),
-			'Parent' => array(
-				'id' => 6,
-				'apple_id' => 4,
-				'color' => 'My new appleOrange',
-				'name' => 'My new apple',
-				'created' => '2006-12-25 05:29:39',
-				'date' => '2006-12-25',
-				'modified' => '2006-12-25 05:29:39',
-				'mytime' => '22:57:17',
-				'Parent' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Child' => array(
-					array(
-						'id' => 7,
-						'apple_id' => 6,
-						'color' => 'Some wierd color',
-						'name' => 'Some odd color',
-						'created' => '2006-12-25 05:34:21',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:34:21',
-						'mytime' => '22:57:17'
-			))),
-			'Sample' => array(
-				'id' => '',
-				'apple_id' => '',
-				'name' => ''
-		)));
-
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->Sample->unbindModel(array('belongsTo' => array('Apple')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Apple' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' =>'',
-					'apple_id' => '',
-					'name' => ''
-			)),
-			array(
-				'Apple' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(),
-					'Child' => array(
-						array(
-							'id' => 2,
-							'apple_id' => 1,
-							'color' => 'Bright Red 1',
-							'name' => 'Bright Red Apple',
-							'created' => '2006-11-22 10:43:13',
-							'date' => '2014-01-01',
-							'modified' => '2006-11-30 18:38:10',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 2,
-					'apple_id' => 2,
-					'name' => 'sample2'
-			)),
-			array(
-				'Apple' => array(
-					'id' => 3,
-					'apple_id' => 2,
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 1,
-					'apple_id' => 3,
-					'name' => 'sample1'
-			)),
-			array(
-				'Apple' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 1,
-						'apple_id' => 2,
-						'color' => 'Red 1',
-						'name' => 'Red Apple 1',
-						'created' => '2006-11-22 10:38:58',
-						'date' => '1951-01-04',
-						'modified' => '2006-12-01 13:31:26',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 3,
-					'apple_id' => 4,
-					'name' => 'sample3'
-			)),
-			array(
-				'Apple' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 4,
-						'apple_id' => 5,
-						'name' => 'sample4'
-					),
-					'Child' => array(
-						array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 4,
-					'apple_id' => 5,
-					'name' => 'sample4'
-			)),
-			array(
-				'Apple' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(
-						'id' => 3,
-						'apple_id' => 4,
-						'name' => 'sample3'
-					),
-					'Child' => array(
-						array(
-							'id' => 6,
-							'apple_id' => 4,
-							'color' => 'My new appleOrange',
-							'name' => 'My new apple',
-							'created' => '2006-12-25 05:29:39',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:39',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-			)),
-			array(
-				'Apple' => array(
-					'id' => 7,
-					'apple_id' => 6,
-					'color' => 'Some wierd color',
-					'name' => 'Some odd color',
-					'created' => '2006-12-25 05:34:21',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:34:21',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17',
-					'Parent' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-					),
-					'Sample' => array(),
-					'Child' => array(
-						array(
-							'id' => 7,
-							'apple_id' => 6,
-							'color' => 'Some wierd color',
-							'name' => 'Some odd color',
-							'created' => '2006-12-25 05:34:21',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:34:21',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-		)));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('belongsTo' => array('Parent')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Apple' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' =>'',
-					'apple_id' => '',
-					'name' => ''
-			)),
-			array(
-				'Apple' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 1,
-					'apple_id' => 2,
-					'color' => 'Red 1',
-					'name' => 'Red Apple 1',
-					'created' => '2006-11-22 10:38:58',
-					'date' => '1951-01-04',
-					'modified' => '2006-12-01 13:31:26',
-					'mytime' => '22:57:17',
-					'Sample' => array(),
-						'Child' => array(
-							array(
-								'id' => 2,
-								'apple_id' => 1,
-								'color' => 'Bright Red 1',
-								'name' => 'Bright Red Apple',
-								'created' => '2006-11-22 10:43:13',
-								'date' => '2014-01-01',
-								'modified' => '2006-11-30 18:38:10',
-								'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 2,
-					'apple_id' => 2,
-					'name' => 'sample2',
-					'Apple' => array(
-						'id' => 2,
-						'apple_id' => 1,
-						'color' => 'Bright Red 1',
-						'name' => 'Bright Red Apple',
-						'created' => '2006-11-22 10:43:13',
-						'date' => '2014-01-01',
-						'modified' => '2006-11-30 18:38:10',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => 3,
-					'apple_id' => 2,
-					'color' => 'blue green',
-					'name' => 'green blue',
-					'created' => '2006-12-25 05:13:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:24',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 1,
-					'apple_id' => 3,
-					'name' => 'sample1',
-					'Apple' => array(
-						'id' => 3,
-						'apple_id' => 2,
-						'color' => 'blue green',
-						'name' => 'green blue',
-						'created' => '2006-12-25 05:13:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:24',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => 4,
-					'apple_id' => 2,
-					'color' => 'Blue Green',
-					'name' => 'Test Name',
-					'created' => '2006-12-25 05:23:36',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:23:36',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 2,
-					'apple_id' => 1,
-					'color' => 'Bright Red 1',
-					'name' => 'Bright Red Apple',
-					'created' => '2006-11-22 10:43:13',
-					'date' => '2014-01-01',
-					'modified' => '2006-11-30 18:38:10',
-					'mytime' => '22:57:17',
-					'Sample' => array(
-						'id' => 2,
-						'apple_id' => 2,
-						'name' => 'sample2'
-					),
-					'Child' => array(
-						array(
-							'id' => 1,
-							'apple_id' => 2,
-							'color' => 'Red 1',
-							'name' => 'Red Apple 1',
-							'created' => '2006-11-22 10:38:58',
-							'date' => '1951-01-04',
-							'modified' => '2006-12-01 13:31:26',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 3,
-							'apple_id' => 2,
-							'color' => 'blue green',
-							'name' => 'green blue',
-							'created' => '2006-12-25 05:13:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:24',
-							'mytime' => '22:57:17'
-						),
-						array(
-							'id' => 4,
-							'apple_id' => 2,
-							'color' => 'Blue Green',
-							'name' => 'Test Name',
-							'created' => '2006-12-25 05:23:36',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:23:36',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 3,
-					'apple_id' => 4,
-					'name' => 'sample3',
-					'Apple' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' =>
-					'2006-12-25 05:29:16',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 5,
-					'apple_id' => 5,
-					'color' => 'Green',
-					'name' => 'Blue Green',
-					'created' => '2006-12-25 05:24:06',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:16',
-					'mytime' => '22:57:17',
-					'Sample' => array(
-						'id' => 4,
-						'apple_id' => 5,
-						'name' => 'sample4'
-					),
-					'Child' => array(
-						array(
-							'id' => 5,
-							'apple_id' => 5,
-							'color' => 'Green',
-							'name' => 'Blue Green',
-							'created' => '2006-12-25 05:24:06',
-							'date' => '2006-12-25',
-							'modified' => '2006-12-25 05:29:16',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => 4,
-					'apple_id' => 5,
-					'name' => 'sample4',
-					'Apple' => array(
-						'id' => 5,
-						'apple_id' => 5,
-						'color' => 'Green',
-						'name' => 'Blue Green',
-						'created' => '2006-12-25 05:24:06',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:29:16',
-						'mytime' => '22:57:17'
-			))),
-			array(
-				'Apple' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17'),
-					'Parent' => array(
-						'id' => 4,
-						'apple_id' => 2,
-						'color' => 'Blue Green',
-						'name' => 'Test Name',
-						'created' => '2006-12-25 05:23:36',
-						'date' => '2006-12-25',
-						'modified' => '2006-12-25 05:23:36',
-						'mytime' => '22:57:17',
-						'Sample' => array(
-							'id' => 3,
-							'apple_id' => 4,
-							'name' => 'sample3'
-						),
-						'Child' => array(
-							array(
-								'id' => 6,
-								'apple_id' => 4,
-								'color' => 'My new appleOrange',
-								'name' => 'My new apple',
-								'created' => '2006-12-25 05:29:39',
-								'date' => '2006-12-25',
-								'modified' => '2006-12-25 05:29:39',
-								'mytime' => '22:57:17'
-					))),
-					'Sample' => array(
-						'id' => '',
-						'apple_id' => '',
-						'name' => ''
-			)),
-			array(
-				'Apple' => array(
-					'id' => 7,
-					'apple_id' => 6,
-					'color' => 'Some wierd color',
-					'name' => 'Some odd color',
-					'created' => '2006-12-25 05:34:21',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:34:21',
-					'mytime' => '22:57:17'
-				),
-				'Parent' => array(
-					'id' => 6,
-					'apple_id' => 4,
-					'color' => 'My new appleOrange',
-					'name' => 'My new apple',
-					'created' => '2006-12-25 05:29:39',
-					'date' => '2006-12-25',
-					'modified' => '2006-12-25 05:29:39',
-					'mytime' => '22:57:17',
-					'Sample' => array(),
-					'Child' => array(
-						array(
-							'id' => 7,
-							'apple_id' => 6,
-							'color' => 'Some wierd color',
-							'name' => 'Some odd color',
-							'created' => '2006-12-25 05:34:21',
-							'date' => '2006-12-25', 'modified' =>
-							'2006-12-25 05:34:21',
-							'mytime' => '22:57:17'
-				))),
-				'Sample' => array(
-					'id' => '',
-					'apple_id' => '',
-					'name' => ''
-		)));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSelfAssociationAfterFind method
- *
- * @access public
- * @return void
- */
-	function testSelfAssociationAfterFind() {
-		$this->loadFixtures('Apple');
-		$afterFindModel = new NodeAfterFind();
-		$afterFindModel->recursive = 3;
-		$afterFindData = $afterFindModel->find('all');
-
-		$duplicateModel = new NodeAfterFind();
-		$duplicateModel->recursive = 3;
-		$duplicateModelData = $duplicateModel->find('all');
-
-		$noAfterFindModel = new NodeNoAfterFind();
-		$noAfterFindModel->recursive = 3;
-		$noAfterFindData = $noAfterFindModel->find('all');
-
-		$this->assertFalse($afterFindModel == $noAfterFindModel);
-		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
-		if (PHP_VERSION === '5.1.6') {
-			$this->assertFalse($afterFindModel != $duplicateModel);
-		}
-		$this->assertEqual($afterFindData, $noAfterFindData);
-	}
-/**
- * testAutoSaveUuid method
- *
- * @access public
- * @return void
- */
-	function testAutoSaveUuid() {
-		// SQLite does not support non-integer primary keys, and SQL Server
-		// is still having problems with custom PK's
-		$this->skipIf(
-			   $this->db->config['driver'] == 'sqlite'
-			|| $this->db->config['driver'] == 'mssql'
-		);
-
-		$this->loadFixtures('Uuid');
-		$TestModel =& new Uuid();
-
-		$TestModel->save(array('title' => 'Test record'));
-		$result = $TestModel->findByTitle('Test record');
-		$this->assertEqual(
-			array_keys($result['Uuid']),
-			array('id', 'title', 'count', 'created', 'updated')
-		);
-		$this->assertEqual(strlen($result['Uuid']['id']), 36);
-	}
-/**
- * testZeroDefaultFieldValue method
- *
- * @access public
- * @return void
- */
-	function testZeroDefaultFieldValue() {
-		$this->skipIf(
-			$this->db->config['driver'] == 'sqlite',
-			'%s SQLite uses loose typing, this operation is unsupported'
-		);
-		$this->loadFixtures('DataTest');
-		$TestModel =& new DataTest();
-
-		$TestModel->create(array());
-		$TestModel->save();
-		$result = $TestModel->findById($TestModel->id);
-		$this->assertIdentical($result['DataTest']['count'], '0');
-		$this->assertIdentical($result['DataTest']['float'], '0');
-	}
-/**
- * testNonNumericHabtmJoinKey method
- *
- * @access public
- * @return void
- */
-	function testNonNumericHabtmJoinKey() {
-		$this->loadFixtures('Post', 'Tag', 'PostsTag');
-		$Post =& new Post();
-		$Post->bind('Tag', array('type' => 'hasAndBelongsToMany'));
-		$Post->Tag->primaryKey = 'tag';
-
-		$result = $Post->find('all');
-		$expected = array(
-			array(
-				'Post' => array(
-					'id' => '1',
-					'author_id' => '1',
-					'title' => 'First Post',
-					'body' => 'First Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'Author' => array(
-					'id' => null,
-					'user' => null,
-					'password' => null,
-					'created' => null,
-					'updated' => null,
-					'test' => 'working'
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '2',
-						'tag' => 'tag2',
-						'created' => '2007-03-18 12:24:23',
-						'updated' => '2007-03-18 12:26:31'
-			))),
-			array(
-				'Post' => array(
-					'id' => '2',
-					'author_id' => '3',
-					'title' => 'Second Post',
-					'body' => 'Second Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'Author' => array(
-					'id' => null,
-					'user' => null,
-					'password' => null,
-					'created' => null,
-					'updated' => null,
-					'test' => 'working'
-				),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-						),
-					array(
-						'id' => '3',
-						'tag' => 'tag3',
-						'created' => '2007-03-18 12:26:23',
-						'updated' => '2007-03-18 12:28:31'
-			))),
-			array(
-				'Post' => array(
-					'id' => '3',
-					'author_id' => '1',
-					'title' => 'Third Post',
-					'body' => 'Third Post Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'Author' => array(
-					'id' => null,
-					'user' => null,
-					'password' => null,
-					'created' => null,
-					'updated' => null,
-					'test' => 'working'
-				),
-				'Tag' => array()
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDeconstructFields method
- *
- * @access public
- * @return void
- */
-	function testDeconstructFields() {
-		$this->loadFixtures('Apple');
-		$TestModel =& new Apple();
-
-		//test null/empty values first
-		$data['Apple']['created']['year'] = '';
-		$data['Apple']['created']['month'] = '';
-		$data['Apple']['created']['day'] = '';
-		$data['Apple']['created']['hour'] = '';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['date']['year'] = '';
-		$data['Apple']['date']['month'] = '';
-		$data['Apple']['date']['day'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('date'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '';
-		$data['Apple']['mytime']['min'] = '';
-		$data['Apple']['mytime']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		//test other data variations
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '2007-08-20 00:00:00'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:00'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '';
-		$data['Apple']['created']['day'] = '12';
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '33';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '33';
-		$data['Apple']['created']['sec'] = '33';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '13';
-		$data['Apple']['created']['min'] = '00';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array(
-			'Apple'=> array(
-			'created'=> '',
-			'date'=> '2006-12-25'
-		));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '09';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array(
-			'Apple'=> array(
-				'created'=> '2007-08-20 10:12:09',
-				'date'=> '2006-12-25'
-		));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '--';
-		$data['Apple']['created']['month'] = '--';
-		$data['Apple']['created']['day'] = '--';
-		$data['Apple']['created']['hour'] = '--';
-		$data['Apple']['created']['min'] = '--';
-		$data['Apple']['created']['sec'] = '--';
-		$data['Apple']['date']['year'] = '--';
-		$data['Apple']['date']['month'] = '--';
-		$data['Apple']['date']['day'] = '--';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '', 'date'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '--';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '09';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '03';
-		$data['Apple']['mytime']['min'] = '04';
-		$data['Apple']['mytime']['sec'] = '04';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '3';
-		$data['Apple']['mytime']['min'] = '4';
-		$data['Apple']['mytime']['sec'] = '4';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple' => array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '03';
-		$data['Apple']['mytime']['min'] = '4';
-		$data['Apple']['mytime']['sec'] = '4';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$db = ConnectionManager::getDataSource('test_suite');
-		$data = array();
-		$data['Apple']['modified'] = $db->expression('NOW()');
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$this->assertEqual($TestModel->data, $data);
-
-		$data = array();
-		$data['Apple']['mytime'] = $db->expression('NOW()');
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$this->assertEqual($TestModel->data, $data);
-	}
-/**
- * testTablePrefixSwitching method
- *
- * @access public
- * @return void
- */
-	function testTablePrefixSwitching() {
-		ConnectionManager::create('database1',
-				array_merge($this->db->config, array('prefix' => 'aaa_')
-		));
-		ConnectionManager::create('database2',
-			array_merge($this->db->config, array('prefix' => 'bbb_')
-		));
-
-		$db1 = ConnectionManager::getDataSource('database1');
-		$db2 = ConnectionManager::getDataSource('database2');
-
-		$TestModel = new Apple();
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
-
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'bbb_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'bbb_apples');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'bbb_apples');
-
-		$TestModel = new Apple();
-		$TestModel->tablePrefix = 'custom_';
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'custom_apples');
-
-		$TestModel = new Apple();
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
-		$TestModel->tablePrefix = '';
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
-
-		$TestModel->tablePrefix = null;
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
-
-		$TestModel->tablePrefix = false;
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
-	}
-/**
- * testDynamicBehaviorAttachment method
- *
- * @access public
- * @return void
- */
-	function testDynamicBehaviorAttachment() {
-		$this->loadFixtures('Apple');
-		$TestModel =& new Apple();
-		$this->assertEqual($TestModel->Behaviors->attached(), array());
-
-		$TestModel->Behaviors->attach('Tree', array('left' => 'left_field', 'right' => 'right_field'));
-		$this->assertTrue(is_object($TestModel->Behaviors->Tree));
-		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
-
-		$expected = array(
-			'parent' => 'parent_id',
-			'left' => 'left_field',
-			'right' => 'right_field',
-			'scope' => '1 = 1',
-			'type' => 'nested',
-			'__parentChange' => false,
-			'recursive' => -1
-		);
-
-		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
-
-		$expected['enabled'] = false;
-		$TestModel->Behaviors->attach('Tree', array('enabled' => false));
-		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
-		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
-
-		$TestModel->Behaviors->detach('Tree');
-		$this->assertEqual($TestModel->Behaviors->attached(), array());
-		$this->assertFalse(isset($TestModel->Behaviors->Tree));
-	}
-/**
- * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
- * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
- * or one connection will step on the other.
- */
-	function testCrossDatabaseJoins() {
-		$config = new DATABASE_CONFIG();
-
-		$skip = $this->skipIf(
-			!isset($config->test) || !isset($config->test2),
-			 '%s Primary and secondary test databases not configured, skipping cross-database '
-			.'join tests.'
-			.' To run these tests, you must define $test and $test2 in your database configuration.'
-		);
-
-		if ($skip) {
-			return;
-		}
-
-		$this->loadFixtures('Article', 'Tag', 'ArticlesTag', 'User', 'Comment');
-		$TestModel =& new Article();
-
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '1',
-						'article_id' => '1',
-						'user_id' => '2',
-						'comment' => 'First Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:45:23',
-						'updated' => '2007-03-18 10:47:31'
-					),
-					array(
-						'id' => '2',
-						'article_id' => '1',
-						'user_id' => '4',
-						'comment' => 'Second Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:47:23',
-						'updated' => '2007-03-18 10:49:31'
-					),
-					array(
-						'id' => '3',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Third Comment for First Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:49:23',
-						'updated' => '2007-03-18 10:51:31'
-					),
-					array(
-						'id' => '4',
-						'article_id' => '1',
-						'user_id' => '1',
-						'comment' => 'Fourth Comment for First Article',
-						'published' => 'N',
-						'created' => '2007-03-18 10:51:23',
-						'updated' => '2007-03-18 10:53:31'
-				)),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '2',
-						'tag' => 'tag2',
-						'created' => '2007-03-18 12:24:23',
-						'updated' => '2007-03-18 12:26:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				),
-				'User' => array(
-					'id' => '3',
-					'user' => 'larry',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23',
-					'updated' => '2007-03-17 01:22:31'
-				),
-				'Comment' => array(
-					array(
-						'id' => '5',
-						'article_id' => '2',
-						'user_id' => '1',
-						'comment' => 'First Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:53:23',
-						'updated' => '2007-03-18 10:55:31'
-					),
-					array(
-						'id' => '6',
-						'article_id' => '2',
-						'user_id' => '2',
-						'comment' => 'Second Comment for Second Article',
-						'published' => 'Y',
-						'created' => '2007-03-18 10:55:23',
-						'updated' => '2007-03-18 10:57:31'
-				)),
-				'Tag' => array(
-					array(
-						'id' => '1',
-						'tag' => 'tag1',
-						'created' => '2007-03-18 12:22:23',
-						'updated' => '2007-03-18 12:24:31'
-					),
-					array(
-						'id' => '3',
-						'tag' => 'tag3',
-						'created' => '2007-03-18 12:26:23',
-						'updated' => '2007-03-18 12:28:31'
-			))),
-			array(
-				'Article' => array(
-					'id' => '3',
-					'user_id' => '1',
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Comment' => array(),
-				'Tag' => array()
-		));
-		$this->assertEqual($TestModel->find('all'), $expected);
-
-		$db2 =& ConnectionManager::getDataSource('test2');
-
-		foreach (array('User', 'Comment') as $class) {
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->create($db2);
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->insert($db2);
-			$this->db->truncate(Inflector::pluralize(Inflector::underscore($class)));
-		}
-
-		$this->assertEqual($TestModel->User->find('all'), array());
-		$this->assertEqual($TestModel->Comment->find('all'), array());
-		$this->assertEqual($TestModel->find('count'), 3);
-
-		$TestModel->User->setDataSource('test2');
-		$TestModel->Comment->setDataSource('test2');
-
-		foreach ($expected as $key => $value) {
-			unset($value['Comment'], $value['Tag']);
-			$expected[$key] = $value;
-		}
-
-		$TestModel->recursive = 0;
-		$result = $TestModel->find('all');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->User->find('all'), '{n}.User.id');
-		$this->assertEqual($result, array('1', '2', '3', '4'));
-		$this->assertEqual($TestModel->find('all'), $expected);
-
-		$TestModel->Comment->unbindModel(array('hasOne' => array('Attachment')));
-		$expected = array(
-			array(
-				'Comment' => array(
-					'id' => '1',
-					'article_id' => '1',
-					'user_id' => '2',
-					'comment' => 'First Comment for First Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:45:23',
-					'updated' => '2007-03-18 10:47:31'
-				),
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:18:23',
-					'updated' => '2007-03-17 01:20:31'
-				),
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-			)),
-			array(
-				'Comment' => array(
-					'id' => '2',
-					'article_id' => '1',
-					'user_id' => '4',
-					'comment' => 'Second Comment for First Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:47:23',
-					'updated' => '2007-03-18 10:49:31'
-				),
-				'User' => array(
-					'id' => '4',
-					'user' => 'garrett',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:22:23',
-					'updated' => '2007-03-17 01:24:31'
-				),
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-			)),
-			array(
-				'Comment' => array(
-					'id' => '3',
-					'article_id' => '1',
-					'user_id' => '1',
-					'comment' => 'Third Comment for First Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:49:23',
-					'updated' => '2007-03-18 10:51:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-			)),
-			array(
-				'Comment' => array(
-					'id' => '4',
-					'article_id' => '1',
-					'user_id' => '1',
-					'comment' => 'Fourth Comment for First Article',
-					'published' => 'N',
-					'created' => '2007-03-18 10:51:23',
-					'updated' => '2007-03-18 10:53:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Article' => array(
-					'id' => '1',
-					'user_id' => '1',
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-			)),
-			array(
-				'Comment' => array(
-					'id' => '5',
-					'article_id' => '2',
-					'user_id' => '1',
-					'comment' => 'First Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:53:23',
-					'updated' => '2007-03-18 10:55:31'
-				),
-				'User' => array(
-					'id' => '1',
-					'user' => 'mariano',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23',
-					'updated' => '2007-03-17 01:18:31'
-				),
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-			)),
-			array(
-				'Comment' => array(
-					'id' => '6',
-					'article_id' => '2',
-					'user_id' => '2',
-					'comment' => 'Second Comment for Second Article',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:55:23',
-					'updated' => '2007-03-18 10:57:31'
-				),
-				'User' => array(
-					'id' => '2',
-					'user' => 'nate',
-					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:18:23',
-					'updated' => '2007-03-17 01:20:31'
-				),
-				'Article' => array(
-					'id' => '2',
-					'user_id' => '3',
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-		)));
-		$this->assertEqual($TestModel->Comment->find('all'), $expected);
-
-		foreach (array('User', 'Comment') as $class) {
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
-		}
-	}
-/**
- * testDisplayField method
- *
- * @access public
- * @return void
- */
-	function testDisplayField() {
-		$this->loadFixtures('Post', 'Comment', 'Person');
-		$Post = new Post();
-		$Comment = new Comment();
-		$Person = new Person();
-
-		$this->assertEqual($Post->displayField, 'title');
-		$this->assertEqual($Person->displayField, 'name');
-		$this->assertEqual($Comment->displayField, 'id');
-	}
-/**
- * testSchema method
- *
- * @access public
- * @return void
- */
-	function testSchema() {
-		$Post = new Post();
-
-		$result = $Post->schema();
-		$columns = array('id', 'author_id', 'title', 'body', 'published', 'created', 'updated');
-		$this->assertEqual(array_keys($result), $columns);
-
-		$types = array('integer', 'integer', 'string', 'text', 'string', 'datetime', 'datetime');
-		$this->assertEqual(Set::extract(array_values($result), '{n}.type'), $types);
-
-		$result = $Post->schema('body');
-		$this->assertEqual($result['type'], 'text');
-		$this->assertNull($Post->schema('foo'));
-
-		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
-	}
-/**
- * testOldQuery method
- *
- * @access public
- * @return void
- */
-	function testOldQuery() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query  = 'SELECT title FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id IN (1,2)';
-
-		$results = $Article->query($query);
-		$this->assertTrue(is_array($results));
-		$this->assertEqual(count($results), 2);
-
-		$query  = 'SELECT title, body FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id = 1';
-
-		$results = $Article->query($query, false);
-		$this->assertTrue(!isset($this->db->_queryCache[$query]));
-		$this->assertTrue(is_array($results));
-
-		$query  = 'SELECT title, id FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles');
-		$query .= '.published = ' . $this->db->value('Y');
-
-		$results = $Article->query($query, true);
-		$this->assertTrue(isset($this->db->_queryCache[$query]));
-		$this->assertTrue(is_array($results));
-	}
-/**
- * testPreparedQuery method
- *
- * @access public
- * @return void
- */
-	function testPreparedQuery() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$this->db->_queryCache = array();
-
-		$finalQuery = 'SELECT title, published FROM ';
-		$finalQuery .= $this->db->fullTableName('articles');
-		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
-		$finalQuery .= '.id = ' . $this->db->value(1);
-		$finalQuery .= ' AND ' . $this->db->fullTableName('articles');
-		$finalQuery .= '.published = ' . $this->db->value('Y');
-
-		$query = 'SELECT title, published FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles');
-		$query .= '.id = ? AND ' . $this->db->fullTableName('articles') . '.published = ?';
-
-		$params = array(1, 'Y');
-		$result = $Article->query($query, $params);
-		$expected = array(
-			'0' => array(
-				$this->db->fullTableName('articles', false) => array(
-					'title' => 'First Article', 'published' => 'Y')
-		));
-
-		if (isset($result[0][0])) {
-			$expected[0][0] = $expected[0][$this->db->fullTableName('articles', false)];
-			unset($expected[0][$this->db->fullTableName('articles', false)]);
-		}
-
-		$this->assertEqual($result, $expected);
-		$this->assertTrue(isset($this->db->_queryCache[$finalQuery]));
-
-		$finalQuery = 'SELECT id, created FROM ';
-		$finalQuery .= $this->db->fullTableName('articles');
-		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
-		$finalQuery .= '.title = ' . $this->db->value('First Article');
-
-		$query  = 'SELECT id, created FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= '  WHERE ' . $this->db->fullTableName('articles') . '.title = ?';
-
-		$params = array('First Article');
-		$result = $Article->query($query, $params, false);
-		$this->assertTrue(is_array($result));
-		$this->assertTrue(
-			   isset($result[0][$this->db->fullTableName('articles', false)])
-			|| isset($result[0][0])
-		);
-		$this->assertFalse(isset($this->db->_queryCache[$finalQuery]));
-
-		$query  = 'SELECT title FROM ';
-		$query .= $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.title LIKE ?';
-
-		$params = array('%First%');
-		$result = $Article->query($query, $params);
-		$this->assertTrue(is_array($result));
-		$this->assertTrue(
-			   isset($result[0][$this->db->fullTableName('articles', false)]['title'])
-			|| isset($result[0][0]['title'])
-		);
-
-		//related to ticket #5035
-		$query  = 'SELECT title FROM ';
-		$query .= $this->db->fullTableName('articles') . ' WHERE title = ? AND published = ?';
-		$params = array('First? Article', 'Y');
-		$Article->query($query, $params);
-
-		$expected  = 'SELECT title FROM ';
-		$expected .= $this->db->fullTableName('articles');
-		$expected .= " WHERE title = 'First? Article' AND published = 'Y'";
-		$this->assertTrue(isset($this->db->_queryCache[$expected]));
-
-	}
-/**
- * testParameterMismatch method
- *
- * @access public
- * @return void
- */
-	function testParameterMismatch() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query  = 'SELECT * FROM ' . $this->db->fullTableName('articles');
-		$query .= ' WHERE ' . $this->db->fullTableName('articles');
-		$query .= '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
-		$params = array('Y');
-		$this->expectError();
-
-		ob_start();
-		$result = $Article->query($query, $params);
-		ob_end_clean();
-		$this->assertEqual($result, null);
-	}
-/**
- * testVeryStrangeUseCase method
- *
- * @access public
- * @return void
- */
-	function testVeryStrangeUseCase() {
-		$message = "%s skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
-		$message .= " MSSQL is incompatible with this test.";
-
-		if ($this->skipIf($this->db->config['driver'] == 'mssql', $message)) {
-			return;
-		}
-
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query = 'SELECT * FROM ? WHERE ? = ? AND ? = ?';
-		$param = array(
-			$this->db->fullTableName('articles'),
-			$this->db->fullTableName('articles') . '.user_id', '3',
-			$this->db->fullTableName('articles') . '.published', 'Y'
-		);
-		$this->expectError();
-
-		ob_start();
-		$result = $Article->query($query, $param);
-		ob_end_clean();
-	}
-/**
- * testUnderscoreFieldSave method
- *
- * @access public
- * @return void
- */
-	function testUnderscoreFieldSave() {
-		$this->loadFixtures('UnderscoreField');
-		$UnderscoreField =& new UnderscoreField();
-
-		$currentCount = $UnderscoreField->find('count');
-		$this->assertEqual($currentCount, 3);
-		$data = array('UnderscoreField' => array(
-			'user_id' => '1',
-			'my_model_has_a_field' => 'Content here',
-			'body' => 'Body',
-			'published' => 'Y',
-			'another_field' => 4
-		));
-		$ret = $UnderscoreField->save($data);
-		$this->assertTrue($ret);
-
-		$currentCount = $UnderscoreField->find('count');
-		$this->assertEqual($currentCount, 4);
-	}
-/**
- * testGroupBy method
- *
- * These tests will never pass with Postgres or Oracle as all fields in a select must be
- * part of an aggregate function or in the GROUP BY statement.
- *
- * @access public
- * @return void
- */
-	function testGroupBy() {
-		$db = ConnectionManager::getDataSource('test_suite');
-		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle'));
-		$message = '%s Postgresql and Oracle have strict GROUP BY and are incompatible with this test.';
-
-		if ($this->skipIf($isStrictGroupBy, $message )) {
-			return;
-		}
-
-		$this->loadFixtures('Project', 'Product', 'Thread', 'Message', 'Bid');
-		$Thread =& new Thread();
-		$Product =& new Product();
-
-		$result = $Thread->find('all', array(
-			'group' => 'Thread.project_id',
-			'order' => 'Thread.id ASC'
-		));
-
-		$expected = array(
-			array(
-				'Thread' => array(
-					'id' => 1,
-					'project_id' => 1,
-					'name' => 'Project 1, Thread 1'
-				),
-				'Project' => array(
-					'id' => 1,
-					'name' => 'Project 1'
-				),
-				'Message' => array(
-					array(
-						'id' => 1,
-						'thread_id' => 1,
-						'name' => 'Thread 1, Message 1'
-			))),
-			array(
-				'Thread' => array(
-					'id' => 3,
-					'project_id' => 2,
-					'name' => 'Project 2, Thread 1'
-				),
-				'Project' => array(
-					'id' => 2,
-					'name' => 'Project 2'
-				),
-				'Message' => array(
-					array(
-						'id' => 3,
-						'thread_id' => 3,
-						'name' => 'Thread 3, Message 1'
-		))));
-		$this->assertEqual($result, $expected);
-
-		$rows = $Thread->find('all', array(
-			'group' => 'Thread.project_id',
-			'fields' => array('Thread.project_id', 'COUNT(*) AS total')
-		));
-		$result = array();
-		foreach($rows as $row) {
-			$result[$row['Thread']['project_id']] = $row[0]['total'];
-		}
-		$expected = array(
-			1 => 2,
-			2 => 1
-		);
-		$this->assertEqual($result, $expected);
-
-		$rows = $Thread->find('all', array(
-			'group' => 'Thread.project_id',
-			'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
-			'order'=> 'Thread.project_id'
-		));
-		$result = array();
-		foreach($rows as $row) {
-			$result[$row['Thread']['project_id']] = $row[0]['total'];
-		}
-		$expected = array(
-			1 => 2,
-			2 => 1
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => 'Thread.project_id'
-		));
-		$expected = array(
-			array(
-				'Thread' => array(
-					'id' => 1,
-					'project_id' => 1,
-					'name' => 'Project 1, Thread 1'
-				),
-				'Project' => array(
-					'id' => 1,
-					'name' => 'Project 1'
-				),
-				'Message' => array(
-					array(
-						'id' => 1,
-						'thread_id' => 1,
-						'name' => 'Thread 1, Message 1'
-		))));
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => 'Thread.project_id, Project.id'
-		));
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => 'project_id'
-		));
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => array('project_id')
-		));
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => array('project_id', 'Project.id')
-		));
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1),
-			'group' => array('Thread.project_id', 'Project.id')
-		));
-		$this->assertEqual($result, $expected);
-
-
-		$expected = array(
-			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
-			array('Product' => array('type' => 'Food'), array('price' => 9)),
-			array('Product' => array('type' => 'Music'), array( 'price' => 4)),
-			array('Product' => array('type' => 'Toy'), array('price' => 3))
-		);
-		$result = $Product->find('all',array(
-			'fields'=>array('Product.type','MIN(Product.price) as price'),
-			'group'=> 'Product.type',
-			'order' => 'Product.type ASC'
-			));
-		$this->assertEqual($result, $expected);
-
-		$result = $Product->find('all', array(
-			'fields'=>array('Product.type','MIN(Product.price) as price'),
-			'group'=> array('Product.type'),
-			'order' => 'Product.type ASC'));
-		$this->assertEqual($result, $expected);
-	}
-	/**
- * testSaveDateAsFirstEntry method
- *
- * @access public
- * @return void
- */
-	function testSaveDateAsFirstEntry() {
-		$this->loadFixtures('Article');
-
-		$Article =& new Article();
-
-		$data = array(
-			'Article' => array(
-				'created' => array(
-					'day' => '1',
-					'month' => '1',
-					'year' => '2008'
-				),
-				'title' => 'Test Title',
-				'user_id' => 1
-		));
-		$Article->create();
-		$this->assertTrue($Article->save($data));
-
-		$testResult = $Article->find(array('Article.title' => 'Test Title'));
-
-		$this->assertEqual($testResult['Article']['title'], $data['Article']['title']);
-		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
-
-	}
-/**
- * testDeleteDependentWithConditions method
- *
- * @access public
- * @return void
- */
-	function testDeleteDependentWithConditions() {
-		$this->loadFixtures('Cd','Book','OverallFavorite');
-
-		$Cd =& new Cd();
-		$OverallFavorite =& new OverallFavorite();
-
-		$Cd->del(1);
-
-		$result = $OverallFavorite->find('all', array(
-			'fields' => array('model_type', 'model_id', 'priority')
-		));
-		$expected = array(
-			array(
-				'OverallFavorite' => array(
-					'model_type' => 'Book',
-					'model_id' => 1,
-					'priority' => 2
-		)));
-
-		$this->assertTrue(is_array($result));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllHasManyValidationOnly method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasManyValidationOnly() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array(
-						'id' => 1,
-						'comment' => '',
-						'published' => 'Y',
-						'user_id' => 1),
-					array(
-						'id' => 2,
-						'comment' =>
-						'comment',
-						'published' => 'Y',
-						'user_id' => 1
-			))),
-			array('validate' => 'only')
-		);
-		$this->assertFalse($result);
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array(
-						'id' => 1,
-						'comment' => '',
-						'published' => 'Y',
-						'user_id' => 1
-					),
-					array(
-						'id' => 2,
-						'comment' => 'comment',
-						'published' => 'Y',
-						'user_id' => 1
-					),
-					array(
-						'id' => 3,
-						'comment' => '',
-						'published' => 'Y',
-						'user_id' => 1
-			))),
-			array(
-				'validate' => 'only',
-				'atomic' => false
-		));
-		$expected = array(
-			'Article' => true,
-			'Comment' => array(false, true, false)
-		);
-		$this->assertIdentical($result, $expected);
-
-		$expected = array('Comment' => array(
-			0 => array('comment' => 'This field cannot be left blank'),
-			2 => array('comment' => 'This field cannot be left blank')
-		));
-		$this->assertEqual($TestModel->validationErrors, $expected);
-
-		$expected = array(
-			0 => array('comment' => 'This field cannot be left blank'),
-			2 => array('comment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
-	}
-/**
- * testPkInHabtmLinkModel method
- *
- * @access public
-	 * @return void
- */
-	function testPkInHabtmLinkModel() {
-		//Test Nonconformant Models
-		$this->loadFixtures('Content', 'ContentAccount', 'Account');
-		$TestModel =& new Content();
-		$this->assertEqual($TestModel->ContentAccount->primaryKey, 'iContentAccountsId');
-
-		//test conformant models with no PK in the join table
-		$this->loadFixtures('Article', 'Tag');
-		$TestModel2 =& new Article();
-		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
-
-		//test conformant models with PK in join table
-		$this->loadFixtures('Item', 'Portfolio', 'ItemsPortfolio');
-		$TestModel3 =& new Portfolio();
-		$this->assertEqual($TestModel3->ItemsPortfolio->primaryKey, 'id');
-
-		//test conformant models with PK in join table - join table contains extra field
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
-		$TestModel4 =& new JoinA();
-		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
-
-	}
-/**
- * testInsertAnotherHabtmRecordWithSameForeignKey method
- *
- * @access public
- * @return void
- */
-	function testInsertAnotherHabtmRecordWithSameForeignKey() {
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
-		$TestModel = new JoinA();
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$expected = array(
-			'JoinAsJoinB' => array(
-				'id' => 1,
-				'join_a_id' => 1,
-				'join_b_id' => 2,
-				'other' => 'Data for Join A 1 Join B 2',
-				'created' => '2008-01-03 10:56:33',
-				'updated' => '2008-01-03 10:56:33'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->JoinAsJoinB->create();
-		$result = $TestModel->JoinAsJoinB->save(array(
-			'join_a_id' => 1,
-			'join_b_id' => 1,
-			'other' => 'Data for Join A 1 Join B 1',
-			'created' => '2008-01-03 10:56:44',
-			'updated' => '2008-01-03 10:56:44'
-		));
-		$this->assertTrue($result);
-		$lastInsertId = $TestModel->JoinAsJoinB->getLastInsertID();
-		$this->assertTrue($lastInsertId != null);
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$expected = array(
-			'JoinAsJoinB' => array(
-				'id' => 1,
-				'join_a_id' => 1,
-				'join_b_id' => 2,
-				'other' => 'Data for Join A 1 Join B 2',
-				'created' => '2008-01-03 10:56:33',
-				'updated' => '2008-01-03 10:56:33'
-		));
-		$this->assertEqual($result, $expected);
-
-		$updatedValue = 'UPDATED Data for Join A 1 Join B 2';
-		$TestModel->JoinAsJoinB->id = 1;
-		$result = $TestModel->JoinAsJoinB->saveField('other', $updatedValue, false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
-	}
-/**
- * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
- *
- * @access public
- * @return void
- */
-	function testCacheSourcesDisabling() {
-		$this->db->cacheSources = true;
-		$TestModel = new JoinA();
-		$TestModel->cacheSources = false;
-		$TestModel->setSource('join_as');
-		$this->assertFalse($this->db->cacheSources);
-
-		$this->db->cacheSources = false;
-		$TestModel = new JoinA();
-		$TestModel->cacheSources = true;
-		$TestModel->setSource('join_as');
-		$this->assertFalse($this->db->cacheSources);
-	}
-/**
- * testDeleteHabtmReferenceWithConditions method
- *
- * @access public
- * @return void
- */
-	function testDeleteHabtmReferenceWithConditions() {
-		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio');
-
-		$Portfolio =& new Portfolio();
-		$Portfolio->hasAndBelongsToMany['Item']['conditions'] = array('ItemsPortfolio.item_id >' => 1);
-
-		$result = $Portfolio->find('first', array(
-			'conditions' => array('Portfolio.id' => 1)
-		));
-		$expected = array(
-			array(
-				'id' => 3,
-				'syfile_id' => 3,
-				'published' => 0,
-				'name' => 'Item 3',
-				'ItemsPortfolio' => array(
-					'id' => 3,
-					'item_id' => 3,
-					'portfolio_id' => 1
-			)),
-			array(
-				'id' => 4,
-				'syfile_id' => 4,
-				'published' => 0,
-				'name' => 'Item 4',
-				'ItemsPortfolio' => array(
-					'id' => 4,
-					'item_id' => 4,
-					'portfolio_id' => 1
-			)),
-			array(
-				'id' => 5,
-				'syfile_id' => 5,
-				'published' => 0,
-				'name' => 'Item 5',
-				'ItemsPortfolio' => array(
-					'id' => 5,
-					'item_id' => 5,
-					'portfolio_id' => 1
-		)));
-		$this->assertEqual($result['Item'], $expected);
-
-		$result = $Portfolio->ItemsPortfolio->find('all', array(
-			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
-		));
-		$expected = array(
-			array(
-				'ItemsPortfolio' => array(
-					'id' => 1,
-					'item_id' => 1,
-					'portfolio_id' => 1
-			)),
-			array(
-				'ItemsPortfolio' => array(
-					'id' => 3,
-					'item_id' => 3,
-					'portfolio_id' => 1
-			)),
-			array(
-				'ItemsPortfolio' => array(
-					'id' => 4,
-					'item_id' => 4,
-					'portfolio_id' => 1
-			)),
-			array(
-				'ItemsPortfolio' => array(
-					'id' => 5,
-					'item_id' => 5,
-					'portfolio_id' => 1
-		)));
-		$this->assertEqual($result, $expected);
-
-		$Portfolio->delete(1);
-
-		$result = $Portfolio->find('first', array(
-			'conditions' => array('Portfolio.id' => 1)
-		));
-		$this->assertFalse($result);
-
-		$result = $Portfolio->ItemsPortfolio->find('all', array(
-			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
-		));
-		$this->assertFalse($result);
-	}
-/**
- * testDeleteArticleBLinks method
- *
- * @access public
- * @return void
- */
-	function testDeleteArticleBLinks() {
-		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
-		$TestModel =& new ArticleB();
-
-		$result = $TestModel->ArticlesTag->find('all');
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-			);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->delete(1);
-		$result = $TestModel->ArticlesTag->find('all');
-
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testPkInHAbtmLinkModelArticleB
- *
- * @access public
- * @return void
- */
-	function testPkInHabtmLinkModelArticleB() {
-		$this->loadFixtures('Article', 'Tag');
-		$TestModel2 =& new ArticleB();
-		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
-	}
-/**
- * testFetchingNonUniqueFKJoinTableRecords()
- *
- * Tests if the results are properly returned in the case there are non-unique FK's
- * in the join table but another fields value is different. For example:
- * something_id | something_else_id | doomed = 1
- * something_id | something_else_id | doomed = 0
- * Should return both records and not just one.
- *
- * @access public
- * @return void
- */
-	function testFetchingNonUniqueFKJoinTableRecords() {
-		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
-		$Something = new Something();
-
-		$joinThingData = array(
-			'JoinThing' => array(
-				'something_id' => 1,
-				'something_else_id' => 2,
-				'doomed' => '0',
-				'created' => '2007-03-18 10:39:23',
-				'updated' => '2007-03-18 10:41:31'
-			)
-		);
-		$Something->JoinThing->create($joinThingData);
-		$Something->JoinThing->save();
-
-		$result = $Something->JoinThing->find('all', array('conditions' => array('something_else_id' => 2)));
-		$this->assertEqual($result[0]['JoinThing']['doomed'], 1);
-		$this->assertEqual($result[1]['JoinThing']['doomed'], 0);
-
-		$result = $Something->find('first');
-		$this->assertEqual(count($result['SomethingElse']), 2);
-		$this->assertEqual($result['SomethingElse'][0]['JoinThing']['doomed'], 1);
-		$this->assertEqual($result['SomethingElse'][1]['JoinThing']['doomed'], 0);
-	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php
index a3f45b888..3e1c13fea 100644
--- a/cake/tests/cases/libs/model/model_behavior.test.php
+++ b/cake/tests/cases/libs/model/model_behavior.test.php
@@ -21,6 +21,7 @@
  */
 App::import('Model', 'AppModel');
 require_once dirname(__FILE__) . DS . 'models.php';
+
 /**
  * TestBehavior class
  *
@@ -28,6 +29,7 @@ require_once dirname(__FILE__) . DS . 'models.php';
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestBehavior extends ModelBehavior {
+
 /**
  * mapMethods property
  *
@@ -35,6 +37,7 @@ class TestBehavior extends ModelBehavior {
  * @access public
  */
 	var $mapMethods = array('/test(\w+)/' => 'testMethod', '/look for\s+(.+)/' => 'speakEnglish');
+
 /**
  * setup method
  *
@@ -50,6 +53,7 @@ class TestBehavior extends ModelBehavior {
 		}
 		$this->settings[$model->alias] = array_merge(array('beforeFind' => 'on', 'afterFind' => 'off'), $config);
 	}
+
 /**
  * beforeFind method
  *
@@ -77,6 +81,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * afterFind method
  *
@@ -106,6 +111,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * beforeSave method
  *
@@ -131,6 +137,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * afterSave method
  *
@@ -163,6 +170,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * beforeValidate method
  *
@@ -193,6 +201,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * beforeDelete method
  *
@@ -221,6 +230,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * afterDelete method
  *
@@ -239,6 +249,7 @@ class TestBehavior extends ModelBehavior {
 			break;
 		}
 	}
+
 /**
  * onError method
  *
@@ -264,6 +275,7 @@ class TestBehavior extends ModelBehavior {
 		$model->beforeTestResult[] = get_class($this);
 		return get_class($this);
 	}
+
 /**
  * testMethod method
  *
@@ -277,6 +289,7 @@ class TestBehavior extends ModelBehavior {
 			return 'working';
 		}
 	}
+
 /**
  * testData method
  *
@@ -291,6 +304,7 @@ class TestBehavior extends ModelBehavior {
 		$model->data['Apple']['field_2'] = true;
 		return true;
 	}
+
 /**
  * validateField method
  *
@@ -302,6 +316,7 @@ class TestBehavior extends ModelBehavior {
 	function validateField(&$model, $field) {
 		return current($field) === 'Orange';
 	}
+
 /**
  * speakEnglish method
  *
@@ -317,6 +332,7 @@ class TestBehavior extends ModelBehavior {
 		return $method . '\' AND ' . $query . '\'';
 	}
 }
+
 /**
  * Test2Behavior class
  *
@@ -325,6 +341,7 @@ class TestBehavior extends ModelBehavior {
  */
 class Test2Behavior extends TestBehavior{
 }
+
 /**
  * Test3Behavior class
  *
@@ -333,6 +350,63 @@ class Test2Behavior extends TestBehavior{
  */
 class Test3Behavior extends TestBehavior{
 }
+
+/**
+ * Test4Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test4Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasMany' => array('Comment'))
+		);
+	}
+}
+
+/**
+ * Test5Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test5Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('belongsTo' => array('User'))
+		);
+	}
+}
+
+/**
+ * Test6Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test6Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasAndBelongsToMany' => array('Tag'))
+		);
+	}
+}
+
+/**
+ * Test7Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test7Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasOne' => array('Attachment'))
+		);
+	}
+}
+
 /**
  * BehaviorTest class
  *
@@ -340,13 +414,18 @@ class Test3Behavior extends TestBehavior{
  * @subpackage    cake.tests.cases.libs.model
  */
 class BehaviorTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
  * @var array
  * @access public
  */
-	var $fixtures = array('core.apple', 'core.sample');
+	var $fixtures = array(
+		'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment',
+		'core.attachment', 'core.tag', 'core.articles_tag'
+	);
+
 /**
  * tearDown method
  *
@@ -356,6 +435,7 @@ class BehaviorTest extends CakeTestCase {
 	function tearDown() {
 		ClassRegistry::flush();
 	}
+
 /**
  * testBehaviorBinding method
  *
@@ -422,6 +502,7 @@ class BehaviorTest extends CakeTestCase {
 		$expected = array_merge($current, array('mangle' => 'trigger mangled'));
 		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
 	}
+
 /**
  * testBehaviorToggling method
  *
@@ -456,6 +537,7 @@ class BehaviorTest extends CakeTestCase {
 		$Apple->Behaviors->detach('Test');
 		$this->assertIdentical($Apple->Behaviors->enabled(), array());
 	}
+
 /**
  * testBehaviorFindCallbacks method
  *
@@ -512,6 +594,7 @@ class BehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($Apple->find('all'), $expected);
 	}
+
 /**
  * testBehaviorHasManyFindCallbacks method
  *
@@ -720,6 +803,7 @@ class BehaviorTest extends CakeTestCase {
 		);
 		//$this->assertEqual($Apple->find('all'), $expected);
 	}
+
 /**
  * testBehaviorSaveCallbacks method
  *
@@ -782,6 +866,7 @@ class BehaviorTest extends CakeTestCase {
 		$Sample->create();
 		$this->assertIdentical($Sample->save($record2), $expected);
 	}
+
 /**
  * testBehaviorDeleteCallbacks method
  *
@@ -864,6 +949,7 @@ class BehaviorTest extends CakeTestCase {
 		$Apple->validates();
 		$this->assertIdentical($Apple->whitelist, array('unknown', 'name'));
 	}
+
 /**
  * testBehaviorValidateMethods method
  *
@@ -882,6 +968,7 @@ class BehaviorTest extends CakeTestCase {
 		$result = $Apple->save(array('name' => 'Regular Apple', 'color' => 'Red'));
 		$this->assertFalse($result);
 	}
+
 /**
  * testBehaviorMethodDispatching method
  *
@@ -903,6 +990,7 @@ class BehaviorTest extends CakeTestCase {
 		$expected = "Item.name = 'the remote' AND Location.name = 'the couch'";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testBehaviorMethodDispatchingWithData method
  *
@@ -917,6 +1005,7 @@ class BehaviorTest extends CakeTestCase {
 		$this->assertTrue($Apple->testData());
 		$this->assertTrue($Apple->data['Apple']['field_2']);
 	}
+
 /**
  * testBehaviorTrigger method
  *
@@ -944,6 +1033,55 @@ class BehaviorTest extends CakeTestCase {
 		$expected = array('TestBehavior', 'Test2Behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testBindModelCallsInBehaviors() {
+		$this->loadFixtures('Article', 'Comment');
+
+		// hasMany
+		$Article = new Article();
+		$Article->unbindModel(array('hasMany' => array('Comment')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Comment', $result));
+
+		$Article->Behaviors->attach('Test4');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// belongsTo
+		$Article->unbindModel(array('belongsTo' => array('User')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('User', $result));
+
+		$Article->Behaviors->attach('Test5');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('User', $result));
+
+		// hasAndBelongsToMany
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Tag', $result));
+
+		$Article->Behaviors->attach('Test6');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// hasOne
+		$Comment = new Comment();
+		$Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$result = $Comment->find('first');
+		$this->assertFalse(array_key_exists('Attachment', $result));
+
+		$Comment->Behaviors->attach('Test7');
+		$result = $Comment->find('first');
+		$this->assertTrue(array_key_exists('Attachment', $result));
+	}
+
 /**
  * Test attach and detaching
  *
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
new file mode 100644
index 000000000..6d30d2bdf
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -0,0 +1,571 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+/**
+ * ModelDeleteTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_delete.test.php';
+/**
+ * ModelDeleteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelDeleteTest extends BaseModelTest {
+/**
+ * testDeleteHabtmReferenceWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteHabtmReferenceWithConditions() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio');
+
+		$Portfolio =& new Portfolio();
+		$Portfolio->hasAndBelongsToMany['Item']['conditions'] = array('ItemsPortfolio.item_id >' => 1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$expected = array(
+			array(
+				'id' => 3,
+				'syfile_id' => 3,
+				'published' => 0,
+				'name' => 'Item 3',
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 4,
+				'syfile_id' => 4,
+				'published' => 0,
+				'name' => 'Item 4',
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 5,
+				'syfile_id' => 5,
+				'published' => 0,
+				'name' => 'Item 5',
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result['Item'], $expected);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$expected = array(
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 1,
+					'item_id' => 1,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result, $expected);
+
+		$Portfolio->delete(1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$this->assertFalse($result);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$this->assertFalse($result);
+	}
+/**
+ * testDeleteArticleBLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteArticleBLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new ArticleB();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+			);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDeleteDependentWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteDependentWithConditions() {
+		$this->loadFixtures('Cd','Book','OverallFavorite');
+
+		$Cd =& new Cd();
+		$OverallFavorite =& new OverallFavorite();
+
+		$Cd->del(1);
+
+		$result = $OverallFavorite->find('all', array(
+			'fields' => array('model_type', 'model_id', 'priority')
+		));
+		$expected = array(
+			array(
+				'OverallFavorite' => array(
+					'model_type' => 'Book',
+					'model_id' => 1,
+					'priority' => 2
+		)));
+
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testDel() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$result = $TestModel->del(2);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->del(3);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 3);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+
+		// make sure deleting a non-existent record doesn't break save()
+		// ticket #6293
+		$this->loadFixtures('Uuid');
+		$Uuid =& new Uuid();
+		$data = array(
+			'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3',
+			'52C8865C-10EE-4302-AE6C-6E7D8E12E2C8',
+			'8208C7FE-E89C-47C5-B378-DED6C271F9B8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$result = $Uuid->find('all', array(
+			'conditions' => array('id' => $data),
+			'fields' => array('id'),
+			'order' => 'id'));
+		$expected = array(
+			array('Uuid' => array(
+				'id' => '52C8865C-10EE-4302-AE6C-6E7D8E12E2C8')),
+			array('Uuid' => array(
+				'id' => '8208C7FE-E89C-47C5-B378-DED6C271F9B8')),
+			array('Uuid' => array(
+				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDeleteAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteAll() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 4,
+			'title' => 'Fourth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 5,
+			'title' => 'Fifth Article',
+			'published' => 'Y'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 1,
+			'id' => 6,
+			'title' => 'Sixth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y')),
+			array('Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'Fourth Article',
+				'published' => 'N'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 6,
+				'user_id' => 1,
+				'title' => 'Sixth Article',
+				'published' => 'N'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.published' => 'N'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article.user_id' => array(2, 3));
+		$result = $TestModel->deleteAll($data, true, true);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+	}
+/**
+ * testRecursiveDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveDel() {
+		$this->loadFixtures('Article', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$result = $TestModel->del(2);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 5);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 6);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->Attachment->read(null, 1);
+		$this->assertFalse($result);
+
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 2);
+
+		$result = $TestModel->Comment->find('count');
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->Comment->Attachment->find('count');
+		$this->assertEqual($result, 0);
+	}
+/**
+ * testDependentExclusiveDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDependentExclusiveDelete() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article10();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result[0]['Comment']), 4);
+		$this->assertEqual(count($result[1]['Comment']), 2);
+		$this->assertEqual($TestModel->Comment->find('count'), 6);
+
+		$TestModel->delete(1);
+		$this->assertEqual($TestModel->Comment->find('count'), 2);
+	}
+/**
+ * testDeleteLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '2'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+	}
+/**
+ * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
+
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->delete(1);
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
new file mode 100644
index 000000000..e213187b6
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -0,0 +1,1837 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+/**
+ * ModelDeleteTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_integration.test.php';
+
+/**
+ * ModelIntegrationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelIntegrationTest extends BaseModelTest {
+/**
+ * testPkInHAbtmLinkModelArticleB
+ *
+ * @access public
+ * @return void
+ */
+	function testPkInHabtmLinkModelArticleB() {
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new ArticleB();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+	}
+/**
+ * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheSourcesDisabling() {
+		$this->db->cacheSources = true;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = false;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+
+		$this->db->cacheSources = false;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = true;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+	}
+/**
+ * testPkInHabtmLinkModel method
+ *
+ * @access public
+	 * @return void
+ */
+	function testPkInHabtmLinkModel() {
+		//Test Nonconformant Models
+		$this->loadFixtures('Content', 'ContentAccount', 'Account');
+		$TestModel =& new Content();
+		$this->assertEqual($TestModel->ContentAccount->primaryKey, 'iContentAccountsId');
+
+		//test conformant models with no PK in the join table
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new Article();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+
+		//test conformant models with PK in join table
+		$this->loadFixtures('Item', 'Portfolio', 'ItemsPortfolio');
+		$TestModel3 =& new Portfolio();
+		$this->assertEqual($TestModel3->ItemsPortfolio->primaryKey, 'id');
+
+		//test conformant models with PK in join table - join table contains extra field
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel4 =& new JoinA();
+		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
+
+	}
+/**
+ * testDynamicBehaviorAttachment method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicBehaviorAttachment() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+
+		$TestModel->Behaviors->attach('Tree', array('left' => 'left_field', 'right' => 'right_field'));
+		$this->assertTrue(is_object($TestModel->Behaviors->Tree));
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$expected = array(
+			'parent' => 'parent_id',
+			'left' => 'left_field',
+			'right' => 'right_field',
+			'scope' => '1 = 1',
+			'type' => 'nested',
+			'__parentChange' => false,
+			'recursive' => -1
+		);
+
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+
+		$expected['enabled'] = false;
+		$TestModel->Behaviors->attach('Tree', array('enabled' => false));
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$TestModel->Behaviors->detach('Tree');
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+		$this->assertFalse(isset($TestModel->Behaviors->Tree));
+	}
+/**
+ * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
+ * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
+ * or one connection will step on the other.
+ */
+	function testCrossDatabaseJoins() {
+		$config = new DATABASE_CONFIG();
+
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag', 'User', 'Comment');
+		$TestModel =& new Article();
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+		));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$db2 =& ConnectionManager::getDataSource('test2');
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->create($db2);
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->insert($db2);
+			$this->db->truncate(Inflector::pluralize(Inflector::underscore($class)));
+		}
+
+		$this->assertEqual($TestModel->User->find('all'), array());
+		$this->assertEqual($TestModel->Comment->find('all'), array());
+		$this->assertEqual($TestModel->find('count'), 3);
+
+		$TestModel->User->setDataSource('test2');
+		$TestModel->Comment->setDataSource('test2');
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->User->find('all'), '{n}.User.id');
+		$this->assertEqual($result, array('1', '2', '3', '4'));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$TestModel->Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$expected = array(
+			array(
+				'Comment' => array(
+					'id' => '1',
+					'article_id' => '1',
+					'user_id' => '2',
+					'comment' => 'First Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:45:23',
+					'updated' => '2007-03-18 10:47:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '2',
+					'article_id' => '1',
+					'user_id' => '4',
+					'comment' => 'Second Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:47:23',
+					'updated' => '2007-03-18 10:49:31'
+				),
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '3',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Third Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:49:23',
+					'updated' => '2007-03-18 10:51:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '4',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Fourth Comment for First Article',
+					'published' => 'N',
+					'created' => '2007-03-18 10:51:23',
+					'updated' => '2007-03-18 10:53:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+		$this->assertEqual($TestModel->Comment->find('all'), $expected);
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
+		}
+	}
+/**
+ * testDisplayField method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisplayField() {
+		$this->loadFixtures('Post', 'Comment', 'Person');
+		$Post = new Post();
+		$Comment = new Comment();
+		$Person = new Person();
+
+		$this->assertEqual($Post->displayField, 'title');
+		$this->assertEqual($Person->displayField, 'name');
+		$this->assertEqual($Comment->displayField, 'id');
+	}
+/**
+ * testSchema method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchema() {
+		$Post = new Post();
+
+		$result = $Post->schema();
+		$columns = array('id', 'author_id', 'title', 'body', 'published', 'created', 'updated');
+		$this->assertEqual(array_keys($result), $columns);
+
+		$types = array('integer', 'integer', 'string', 'text', 'string', 'datetime', 'datetime');
+		$this->assertEqual(Set::extract(array_values($result), '{n}.type'), $types);
+
+		$result = $Post->schema('body');
+		$this->assertEqual($result['type'], 'text');
+		$this->assertNull($Post->schema('foo'));
+
+		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
+	}
+/**
+ * test deconstruct() with time fields.
+ *
+ * @return void
+ **/
+	function testDeconstructFieldsTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['meridan'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected, 'Empty values are not returning properly. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '12';
+		$data['Apple']['mytime']['min'] = '0';
+		$data['Apple']['mytime']['meridian'] = 'am';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '00';
+		$data['Apple']['mytime']['min'] = '00';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '04';
+		$data['Apple']['mytime']['sec'] = '04';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '3';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple' => array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['mytime'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+/**
+ * testDeconstructFields with datetime, timestamp, and date fields
+ *
+ * @access public
+ * @return void
+ */
+	function testDeconstructFieldsDateTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		//test null/empty values first
+		$data['Apple']['created']['year'] = '';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '';
+		$data['Apple']['date']['month'] = '';
+		$data['Apple']['date']['day'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 00:00:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '12';
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+		$data['Apple']['created']['sec'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '13';
+		$data['Apple']['created']['min'] = '00';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+			'created'=> '',
+			'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+				'created'=> '2007-08-20 10:12:09',
+				'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '--';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '--';
+		$data['Apple']['created']['hour'] = '--';
+		$data['Apple']['created']['min'] = '--';
+		$data['Apple']['created']['sec'] = '--';
+		$data['Apple']['date']['year'] = '--';
+		$data['Apple']['date']['month'] = '--';
+		$data['Apple']['date']['day'] = '--';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['modified'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+/**
+ * testTablePrefixSwitching method
+ *
+ * @access public
+ * @return void
+ */
+	function testTablePrefixSwitching() {
+		ConnectionManager::create('database1',
+				array_merge($this->db->config, array('prefix' => 'aaa_')
+		));
+		ConnectionManager::create('database2',
+			array_merge($this->db->config, array('prefix' => 'bbb_')
+		));
+
+		$db1 = ConnectionManager::getDataSource('database1');
+		$db2 = ConnectionManager::getDataSource('database2');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'bbb_apples');
+
+		$TestModel = new Apple();
+		$TestModel->tablePrefix = 'custom_';
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'custom_apples');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$TestModel->tablePrefix = '';
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+
+		$TestModel->tablePrefix = null;
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->tablePrefix = false;
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+	}
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidAssociation() {
+		$TestModel =& new ValidationTest1();
+		$this->assertNull($TestModel->getAssociated('Foo'));
+	}
+/**
+ * testLoadModelSecondIteration method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadModelSecondIteration() {
+		$model = new ModelA();
+		$this->assertIsA($model,'ModelA');
+
+		$this->assertIsA($model->ModelB, 'ModelB');
+		$this->assertIsA($model->ModelB->ModelD, 'ModelD');
+
+		$this->assertIsA($model->ModelC, 'ModelC');
+		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
+	}
+/**
+ * ensure that __exists is reset on create
+ *
+ * @return void
+ **/
+	function testResetOfExistsOnCreate() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$Article->id = 1;
+		$Article->saveField('title', 'Reset me');
+		$Article->delete();
+		$Article->id = 1;
+		$this->assertFalse($Article->exists());
+
+		$Article->create();
+		$this->assertFalse($Article->exists());
+		$Article->id = 2;
+		$Article->saveField('title', 'Staying alive');
+		$result = $Article->read(null, 2);
+		$this->assertEqual($result['Article']['title'], 'Staying alive');
+	}
+/**
+ * testPluginAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginAssociations() {
+		$this->loadFixtures('TestPluginArticle', 'User', 'TestPluginComment');
+		$TestModel =& new TestPluginArticle();
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'TestPluginArticle' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Plugin Article',
+					'body' => 'First Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:39:23',
+					'updated' => '2008-09-24 10:41:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 1,
+						'article_id' => 1,
+						'user_id' => 2,
+						'comment' => 'First Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:45:23',
+						'updated' => '2008-09-24 10:47:31'
+					),
+					array(
+						'id' => 2,
+						'article_id' => 1,
+						'user_id' => 4,
+						'comment' => 'Second Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:47:23',
+						'updated' => '2008-09-24 10:49:31'
+					),
+					array(
+						'id' => 3,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Third Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:49:23',
+						'updated' => '2008-09-24 10:51:31'
+					),
+					array(
+						'id' => 4,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Fourth Comment for First Plugin Article',
+						'published' => 'N',
+						'created' => '2008-09-24 10:51:23',
+						'updated' => '2008-09-24 10:53:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Plugin Article',
+					'body' => 'Second Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:41:23',
+					'updated' => '2008-09-24 10:43:31'
+				),
+				'User' => array(
+					'id' => 3,
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 5,
+						'article_id' => 2,
+						'user_id' => 1,
+						'comment' => 'First Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:53:23',
+						'updated' => '2008-09-24 10:55:31'
+					),
+					array(
+						'id' => 6,
+						'article_id' => 2,
+						'user_id' => 2,
+						'comment' => 'Second Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:55:23',
+						'updated' => '2008-09-24 10:57:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Plugin Article',
+					'body' => 'Third Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:43:23',
+					'updated' => '2008-09-24 10:45:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests getAssociated method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetAssociated() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+
+		$assocTypes = array('hasMany', 'hasOne', 'belongsTo', 'hasAndBelongsToMany');
+		foreach ($assocTypes as $type) {
+			 $this->assertEqual($Article->getAssociated($type), array_keys($Article->{$type}));
+		}
+
+		$Article->bindModel(array('hasMany' => array('Category')));
+		$this->assertEqual($Article->getAssociated('hasMany'), array('Comment', 'Category'));
+
+		$results = $Article->getAssociated();
+		$this->assertEqual(sort(array_keys($results)), array('Category', 'Comment', 'Tag'));
+
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$this->assertEqual($Article->getAssociated('hasAndBelongsToMany'), array());
+
+		$result = $Article->getAssociated('Category');
+		$expected = array(
+			'className' => 'Category',
+			'foreignKey' => 'article_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => '',
+			'association' => 'hasMany',
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAutoConstructAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoConstructAssociations() {
+		$this->loadFixtures('User', 'ArticleFeatured');
+		$TestModel =& new AssociationTest1();
+
+		$result = $TestModel->hasAndBelongsToMany;
+		$expected = array('AssociationTest2' => array(
+				'unique' => false,
+				'joinTable' => 'join_as_join_bs',
+				'foreignKey' => false,
+				'className' => 'AssociationTest2',
+				'with' => 'JoinAsJoinB',
+				'associationForeignKey' => 'join_b_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
+				'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
+		));
+		$this->assertEqual($result, $expected);
+
+		// Tests related to ticket https://trac.cakephp.org/ticket/5594
+		$TestModel =& new ArticleFeatured();
+		$TestFakeModel =& new ArticleFeatured(array('table' => false));
+
+		$expected = array(
+			'User' => array(
+				'className' => 'User', 'foreignKey' => 'user_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			),
+			'Category' => array(
+				'className' => 'Category', 'foreignKey' => 'category_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			)
+		);
+		$this->assertIdentical($TestModel->belongsTo, $expected);
+		$this->assertIdentical($TestFakeModel->belongsTo, $expected);
+
+		$this->assertEqual($TestModel->User->name, 'User');
+		$this->assertEqual($TestFakeModel->User->name, 'User');
+		$this->assertEqual($TestModel->Category->name, 'Category');
+		$this->assertEqual($TestFakeModel->Category->name, 'Category');
+
+		$expected = array(
+			'Featured' => array(
+				'className' => 'Featured',
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'dependent' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasOne, $expected);
+		$this->assertIdentical($TestFakeModel->hasOne, $expected);
+
+		$this->assertEqual($TestModel->Featured->name, 'Featured');
+		$this->assertEqual($TestFakeModel->Featured->name, 'Featured');
+
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'dependent' => true,
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'exclusive' => '',
+				'finderQuery' => '',
+				'counterQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasMany, $expected);
+
+		$this->assertEqual($TestModel->Comment->name, 'Comment');
+		$this->assertEqual($TestFakeModel->Comment->name, 'Comment');
+
+		$expected = array(
+			'Tag' => array(
+				'className' => 'Tag',
+				'joinTable' => 'article_featureds_tags',
+				'with' => 'ArticleFeaturedsTag',
+				'foreignKey' => 'article_featured_id',
+				'associationForeignKey' => 'tag_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'unique' => true,
+				'finderQuery' => '',
+				'deleteQuery' => '',
+				'insertQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasAndBelongsToMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasAndBelongsToMany, $expected);
+
+		$this->assertEqual($TestModel->Tag->name, 'Tag');
+		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
+	}
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ **/
+	function testConstruct() {
+		$this->loadFixtures('Post', 'Comment');
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginPost');
+		$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+		$this->assertTrue(isset($TestModel->Behaviors->Tree));
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginComment');
+		$expected = array('Containable', 'Containable' => array('some_settings'));
+		$this->assertEqual($TestModel->actsAs, $expected);
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+	}
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ **/
+	function testConstructWithAlternateDataSource() {
+		$TestModel =& ClassRegistry::init(array(
+			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
+		));
+		$this->assertEqual('test_suite', $TestModel->useDbConfig);
+
+		//deprecated but test it anyway
+		$NewVoid =& new TheVoid(null, false, 'other');
+		$this->assertEqual('other', $NewVoid->useDbConfig);
+	}
+/**
+ * testColumnTypeFetching method
+ *
+ * @access public
+ * @return void
+ */
+	function testColumnTypeFetching() {
+		$model =& new Test();
+		$this->assertEqual($model->getColumnType('id'), 'integer');
+		$this->assertEqual($model->getColumnType('notes'), 'text');
+		$this->assertEqual($model->getColumnType('updated'), 'datetime');
+		$this->assertEqual($model->getColumnType('unknown'), null);
+
+		$model =& new Article();
+		$this->assertEqual($model->getColumnType('User.created'), 'datetime');
+		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
+		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
+	}
+/**
+ * testHabtmUniqueKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUniqueKey() {
+		$model =& new Item();
+		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
+	}
+/**
+ * testIdentity method
+ *
+ * @access public
+ * @return void
+ */
+	function testIdentity() {
+		$TestModel =& new Test();
+		$result = $TestModel->alias;
+		$expected = 'Test';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new TestAlias();
+		$result = $TestModel->alias;
+		$expected = 'TestAlias';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Test(array('alias' => 'AnotherTest'));
+		$result = $TestModel->alias;
+		$expected = 'AnotherTest';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testWithAssociation method
+ *
+ * @access public
+ * @return void
+ */
+	function testWithAssociation() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$TestModel =& new Something();
+		$result = $TestModel->SomethingElse->find('all');
+
+		$expected = array(
+			array(
+				'SomethingElse' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'id' => '3',
+							'something_id' => '3',
+							'something_else_id' => '1',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:43:23',
+							'updated' => '2007-03-18 10:45:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'id' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'id' => '2',
+							'something_id' => '2',
+							'something_else_id' => '3',
+							'doomed' => '0',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Something' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '2',
+							'something_else_id' => '3'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '3',
+							'something_else_id' => '1'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			'SomethingElse' => array(
+				array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'JoinThing' => array(
+						'doomed' => '1',
+						'something_id' => '1',
+						'something_else_id' => '2'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$expected = $TestModel->findById(1);
+		$TestModel->set($expected);
+		$TestModel->save();
+		$result = $TestModel->findById(1);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
+		$TestModel->create(array(
+			'Something' => array('id' => 1),
+			'SomethingElse' => array(3, array(
+				'something_else_id' => 1,
+				'doomed' => '1'
+		))));
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->save();
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['order'] = 'SomethingElse.id ASC';
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => $ts),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '1'
+					)),
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+					)),
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '1',
+							'something_else_id' => '3'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindSelfAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindSelfAssociations() {
+		$this->loadFixtures('Person');
+
+		$TestModel =& new Person();
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 3;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDynamicAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicAssociations() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = $TestModel->hasOne = array();
+		$TestModel->hasMany['Comment'] = array_merge($TestModel->hasMany['Comment'], array(
+			'foreignKey' => false,
+			'conditions' => array('Comment.user_id =' => '2')
+		));
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testCreation method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreation() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Test();
+		$result = $TestModel->create();
+		$expected = array('Test' => array('notes' => 'write some notes here'));
+		$this->assertEqual($result, $expected);
+		$TestModel =& new User();
+		$result = $TestModel->schema();
+
+		if (isset($this->db->columns['primary_key']['length'])) {
+			$intLength = $this->db->columns['primary_key']['length'];
+		} elseif (isset($this->db->columns['integer']['length'])) {
+			$intLength = $this->db->columns['integer']['length'];
+		} else {
+			$intLength = 11;
+		}
+		foreach (array('collate', 'charset') as $type) {
+			unset($result['user'][$type]);
+			unset($result['password'][$type]);
+		}
+
+		$expected = array(
+			'id' => array(
+				'type' => 'integer',
+				'null' => false,
+				'default' => null,
+				'length' => $intLength,
+				'key' => 'primary'
+			),
+			'user' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'password' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+			),
+			'updated'=> array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Article();
+		$result = $TestModel->create();
+		$expected = array('Article' => array('published' => 'N'));
+		$this->assertEqual($result, $expected);
+
+		$FeaturedModel =& new Featured();
+		$data = array(
+			'article_featured_id' => 1,
+			'category_id' => 1,
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+		));
+
+		$expected = array(
+			'Featured' => array(
+				'article_featured_id' => 1,
+				'category_id' => 1,
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00'
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+
+		$data = array(
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+			),
+			'article_featured_id' => 1,
+			'category_id' => 1
+		);
+
+		$expected = array(
+			'Featured' => array(
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00',
+				'article_featured_id' => 1,
+				'category_id' => 1
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
new file mode 100644
index 000000000..233a1b1e7
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -0,0 +1,7102 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+/**
+ * ModelReadTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_read.test.php';
+/**
+ * ModelReadTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelReadTest extends BaseModelTest {
+/**
+ * testFetchingNonUniqueFKJoinTableRecords()
+ *
+ * Tests if the results are properly returned in the case there are non-unique FK's
+ * in the join table but another fields value is different. For example:
+ * something_id | something_else_id | doomed = 1
+ * something_id | something_else_id | doomed = 0
+ * Should return both records and not just one.
+ *
+ * @access public
+ * @return void
+ */
+	function testFetchingNonUniqueFKJoinTableRecords() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$Something = new Something();
+
+		$joinThingData = array(
+			'JoinThing' => array(
+				'something_id' => 1,
+				'something_else_id' => 2,
+				'doomed' => '0',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$Something->JoinThing->create($joinThingData);
+		$Something->JoinThing->save();
+
+		$result = $Something->JoinThing->find('all', array('conditions' => array('something_else_id' => 2)));
+		$this->assertEqual($result[0]['JoinThing']['doomed'], 1);
+		$this->assertEqual($result[1]['JoinThing']['doomed'], 0);
+
+		$result = $Something->find('first');
+		$this->assertEqual(count($result['SomethingElse']), 2);
+		$this->assertEqual($result['SomethingElse'][0]['JoinThing']['doomed'], 1);
+		$this->assertEqual($result['SomethingElse'][1]['JoinThing']['doomed'], 0);
+	}
+/**
+ * testGroupBy method
+ *
+ * These tests will never pass with Postgres or Oracle as all fields in a select must be
+ * part of an aggregate function or in the GROUP BY statement.
+ *
+ * @access public
+ * @return void
+ */
+	function testGroupBy() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle'));
+		$message = '%s Postgresql and Oracle have strict GROUP BY and are incompatible with this test.';
+
+		if ($this->skipIf($isStrictGroupBy, $message )) {
+			return;
+		}
+
+		$this->loadFixtures('Project', 'Product', 'Thread', 'Message', 'Bid');
+		$Thread =& new Thread();
+		$Product =& new Product();
+
+		$result = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'order' => 'Thread.id ASC'
+		));
+
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+			))),
+			array(
+				'Thread' => array(
+					'id' => 3,
+					'project_id' => 2,
+					'name' => 'Project 2, Thread 1'
+				),
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Message' => array(
+					array(
+						'id' => 3,
+						'thread_id' => 3,
+						'name' => 'Thread 3, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total')
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
+			'order'=> 'Thread.project_id'
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id'
+		));
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id, Project.id'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'project_id'
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('Thread.project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$expected = array(
+			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
+			array('Product' => array('type' => 'Food'), array('price' => 9)),
+			array('Product' => array('type' => 'Music'), array( 'price' => 4)),
+			array('Product' => array('type' => 'Toy'), array('price' => 3))
+		);
+		$result = $Product->find('all',array(
+			'fields'=>array('Product.type','MIN(Product.price) as price'),
+			'group'=> 'Product.type',
+			'order' => 'Product.type ASC'
+			));
+		$this->assertEqual($result, $expected);
+
+		$result = $Product->find('all', array(
+			'fields'=>array('Product.type','MIN(Product.price) as price'),
+			'group'=> array('Product.type'),
+			'order' => 'Product.type ASC'));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testOldQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testOldQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id IN (1,2)';
+
+		$results = $Article->query($query);
+		$this->assertTrue(is_array($results));
+		$this->assertEqual(count($results), 2);
+
+		$query  = 'SELECT title, body FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id = 1';
+
+		$results = $Article->query($query, false);
+		$this->assertTrue(!isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+
+		$query  = 'SELECT title, id FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ' . $this->db->value('Y');
+
+		$results = $Article->query($query, true);
+		$this->assertTrue(isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+	}
+/**
+ * testPreparedQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testPreparedQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$this->db->_queryCache = array();
+
+		$finalQuery = 'SELECT title, published FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.id = ' . $this->db->value(1);
+		$finalQuery .= ' AND ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.published = ' . $this->db->value('Y');
+
+		$query = 'SELECT title, published FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.id = ? AND ' . $this->db->fullTableName('articles') . '.published = ?';
+
+		$params = array(1, 'Y');
+		$result = $Article->query($query, $params);
+		$expected = array(
+			'0' => array(
+				$this->db->fullTableName('articles', false) => array(
+					'title' => 'First Article', 'published' => 'Y')
+		));
+
+		if (isset($result[0][0])) {
+			$expected[0][0] = $expected[0][$this->db->fullTableName('articles', false)];
+			unset($expected[0][$this->db->fullTableName('articles', false)]);
+		}
+
+		$this->assertEqual($result, $expected);
+		$this->assertTrue(isset($this->db->_queryCache[$finalQuery]));
+
+		$finalQuery = 'SELECT id, created FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.title = ' . $this->db->value('First Article');
+
+		$query  = 'SELECT id, created FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= '  WHERE ' . $this->db->fullTableName('articles') . '.title = ?';
+
+		$params = array('First Article');
+		$result = $Article->query($query, $params, false);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)])
+			|| isset($result[0][0])
+		);
+		$this->assertFalse(isset($this->db->_queryCache[$finalQuery]));
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.title LIKE ?';
+
+		$params = array('%First%');
+		$result = $Article->query($query, $params);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)]['title'])
+			|| isset($result[0][0]['title'])
+		);
+
+		//related to ticket #5035
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles') . ' WHERE title = ? AND published = ?';
+		$params = array('First? Article', 'Y');
+		$Article->query($query, $params);
+
+		$expected  = 'SELECT title FROM ';
+		$expected .= $this->db->fullTableName('articles');
+		$expected .= " WHERE title = 'First? Article' AND published = 'Y'";
+		$this->assertTrue(isset($this->db->_queryCache[$expected]));
+
+	}
+/**
+ * testParameterMismatch method
+ *
+ * @access public
+ * @return void
+ */
+	function testParameterMismatch() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT * FROM ' . $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
+		$params = array('Y');
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $params);
+		ob_end_clean();
+		$this->assertEqual($result, null);
+	}
+/**
+ * testVeryStrangeUseCase method
+ *
+ * @access public
+ * @return void
+ */
+	function testVeryStrangeUseCase() {
+		$message = "%s skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
+		$message .= " MSSQL is incompatible with this test.";
+
+		if ($this->skipIf($this->db->config['driver'] == 'mssql', $message)) {
+			return;
+		}
+
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query = 'SELECT * FROM ? WHERE ? = ? AND ? = ?';
+		$param = array(
+			$this->db->fullTableName('articles'),
+			$this->db->fullTableName('articles') . '.user_id', '3',
+			$this->db->fullTableName('articles') . '.published', 'Y'
+		);
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $param);
+		ob_end_clean();
+	}
+/**
+ * testRecursiveUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveUnbind() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2',
+						'Apple' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 2,
+									'apple_id' => 1,
+									'color' => 'Bright Red 1',
+									'name' => 'Bright Red Apple',
+									'created' => '2006-11-22 10:43:13',
+									'date' => '2014-01-01',
+									'modified' => '2006-11-30 18:38:10',
+									'mytime' => '22:57:17'
+						))),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 1,
+								'apple_id' => 3,
+								'name' => 'sample1'
+						)),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 3,
+								'apple_id' => 4,
+								'name' => 'sample3'
+							),
+							'Child' => array(
+								array(
+									'id' => 6,
+									'apple_id' => 4,
+									'color' => 'My new appleOrange',
+									'name' => 'My new apple',
+									'created' => '2006-12-25 05:29:39',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:39',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 7,
+								'apple_id' => 6,
+								'color' => 'Some wierd color',
+								'name' => 'Some odd color',
+								'created' => '2006-12-25 05:34:21',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:34:21',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 4,
+								'apple_id' => 5,
+								'name' => 'sample4'
+							),
+							'Child' => array(
+								array(
+									'id' => 5,
+									'apple_id' => 5,
+									'color' => 'Green',
+									'name' => 'Blue Green',
+									'created' => '2006-12-25 05:24:06',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:16',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' =>
+					'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01', 'modified' =>
+								'2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 1,
+							'apple_id' => 3,
+							'name' => 'sample1'
+					)),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 7,
+									'apple_id' => 6,
+									'color' => 'Some wierd color',
+									'name' => 'Some odd color',
+									'created' => '2006-12-25 05:34:21',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:34:21',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 4,
+							'apple_id' => 5,
+							'name' => 'sample4'
+						),
+						'Child' => array(
+							array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+				'id' => 3,
+				'apple_id' => 2,
+				'color' => 'blue green',
+				'name' => 'green blue',
+				'created' => '2006-12-25 05:13:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:24',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 1,
+				'apple_id' => 3,
+				'name' => 'sample1',
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 3,
+				'apple_id' => 4,
+				'name' => 'sample3',
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 4,
+				'apple_id' => 5,
+				'name' => 'sample4',
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)),
+		array(
+			'Apple' => array(
+				'id' => 7,
+				'apple_id' => 6,
+				'color' => 'Some wierd color',
+				'name' => 'Some odd color',
+				'created' => '2006-12-25 05:34:21',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:34:21',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->Sample->unbindModel(array('belongsTo' => array('Apple')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('belongsTo' => array('Parent')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' =>
+					'2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => '',
+						'apple_id' => '',
+						'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25', 'modified' =>
+							'2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSelfAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testSelfAssociationAfterFind() {
+		$this->loadFixtures('Apple');
+		$afterFindModel = new NodeAfterFind();
+		$afterFindModel->recursive = 3;
+		$afterFindData = $afterFindModel->find('all');
+
+		$duplicateModel = new NodeAfterFind();
+		$duplicateModel->recursive = 3;
+		$duplicateModelData = $duplicateModel->find('all');
+
+		$noAfterFindModel = new NodeNoAfterFind();
+		$noAfterFindModel->recursive = 3;
+		$noAfterFindData = $noAfterFindModel->find('all');
+
+		$this->assertFalse($afterFindModel == $noAfterFindModel);
+		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
+		if (PHP_VERSION === '5.1.6') {
+			$this->assertFalse($afterFindModel != $duplicateModel);
+		}
+		$this->assertEqual($afterFindData, $noAfterFindData);
+	}
+/**
+ * testFindAllThreaded method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllThreaded() {
+		$this->loadFixtures('Category');
+		$TestModel =& new Category();
+
+		$result = $TestModel->find('threaded');
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1%')
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name'
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array('order' => 'id DESC'));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => 5,
+					'parent_id' => 0,
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 6,
+							'parent_id' => 5,
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => 4,
+					'parent_id' => 0,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 3,
+							'parent_id' => 1,
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					),
+					array(
+						'Category' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 3%')
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1.1%')
+		));
+		$expected = array(
+				array('Category' =>
+					array(
+						'id' => '2',
+						'parent_id' => '1',
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31'),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 2)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'id, name, parent_id',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array (
+			array ('Category' => array(
+				'id' => '2',
+				'name' => 'Category 1.1',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '3',
+				'name' => 'Category 1.2',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '4',
+				'name' => 'Category 2',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '5',
+				'name' => 'Category 3',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '6',
+				'name' => 'Category 3.1',
+				'parent_id' => '5'
+			)),
+			array ('Category' => array(
+				'id' => '7',
+				'name' => 'Category 1.1.1',
+				'parent_id' => '2'
+			)),
+			array ('Category' => array(
+				'id' => '8',
+				'name' => 'Category 1.1.2',
+				'parent_id' => '2'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '2',
+					'parent_id' => '1',
+					'name' => 'Category 1.1'
+				),
+				'children' => array(
+					array('Category' => array(
+						'id' => '7',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.1'),
+						'children' => array()),
+					array('Category' => array(
+						'id' => '8',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.2'),
+						'children' => array()))
+			),
+			array(
+				'Category' => array(
+					'id' => '3',
+					'parent_id' => '1',
+					'name' => 'Category 1.2'
+				),
+				'children' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test find('neighbors')
+ *
+ * @return void
+ * @access public
+ */
+	function testFindNeighbors() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array('id' => 2)
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array(
+			'fields' => array('id')
+		));
+
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1
+			)),
+			'next' => array(
+				'Article' => array(
+					'id' => 3
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2
+			)),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			'next' => array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 0;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindCombinedRelations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCombinedRelations() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+
+		$result = $TestModel->find('all');
+
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '2',
+						'apple_id' => '1',
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '2',
+					'apple_id' => '2',
+					'name' => 'sample2'
+				),
+				'Child' => array(
+					array(
+						'id' => '1',
+						'apple_id' => '2',
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '3',
+						'apple_id' => '2',
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '4',
+						'apple_id' => '2',
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '3',
+					'apple_id' => '2',
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '1',
+					'apple_id' => '3',
+					'name' => 'sample1'
+				),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '3',
+					'apple_id' => '4',
+					'name' => 'sample3'
+				),
+				'Child' => array(
+					array(
+						'id' => '6',
+						'apple_id' => '4',
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '4',
+					'apple_id' => '5',
+					'name' => 'sample4'
+				),
+				'Child' => array(
+					array(
+						'id' => '5',
+						'apple_id' => '5',
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '7',
+						'apple_id' => '6',
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '7',
+					'apple_id' => '6',
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveEmpty() {
+		$this->loadFixtures('Thread');
+		$TestModel =& new Thread();
+		$data = array();
+		$expected = $TestModel->save($data);
+		$this->assertFalse($expected);
+	}
+	// function testBasicValidation() {
+	// 	$TestModel =& new ValidationTest1();
+	// 	$TestModel->testing = true;
+	// 	$TestModel->set(array('title' => '', 'published' => 1));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('title' => 'This field cannot be left blank'));
+	//
+	// 	$TestModel->create();
+	// 	$TestModel->set(array('title' => 'Hello', 'published' => 0));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('published' => 'This field cannot be left blank'));
+	//
+	// 	$TestModel->create();
+	// 	$TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => ''));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank'));
+	// }
+
+/**
+ * testFindAllWithConditionInChildQuery
+ *
+ * @todo external conditions like this are going to need to be revisited at some point
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionInChildQuery() {
+		$this->loadFixtures('Basket', 'FilmFile');
+
+		$TestModel =& new Basket();
+		$recursive = 3;
+		$result = $TestModel->find('all', compact('conditions', 'recursive'));
+
+		$expected = array(
+			array(
+				'Basket' => array(
+					'id' => 1,
+					'type' => 'nonfile',
+					'name' => 'basket1',
+					'object_id' => 1,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => '',
+					'name' => '',
+				)
+			),
+			array(
+				'Basket' => array(
+					'id' => 2,
+					'type' => 'file',
+					'name' => 'basket2',
+					'object_id' => 2,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => 2,
+					'name' => 'two',
+				)
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllWithConditionsHavingMixedDataTypes method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionsHavingMixedDataTypes() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$conditions = array('id' => array('1', 2));
+		$recursive = -1;
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
+		$this->assertEqual($result, $expected);
+
+
+		$conditions = array('id' => array('1', 2, '3.0'));
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testBindUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindUnbind() {
+		$this->loadFixtures('User', 'Comment', 'FeatureSet');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->resetAssociations();
+		$result = $TestModel->hasMany;
+		$this->assertEqual($result, array());
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'foreignKey' => 'user_id',
+				'conditions' => null,
+				'fields' => null,
+				'order' => null,
+				'limit' => null,
+				'offset' => null,
+				'dependent' => null,
+				'exclusive' => null,
+				'finderQuery' => null,
+				'counterQuery' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' =>
+						'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array(
+			'Comment' => array('className' => 'Comment', 'conditions' => 'Comment.published = \'Y\'')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel2 =& new DeviceType();
+
+		$expected = array(
+			'className' => 'FeatureSet',
+			'foreignKey' => 'feature_set_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'counterCache' => ''
+		);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('FeatureSet', array(
+			'conditions' => array('active' => true)
+		));
+		$expected['conditions'] = array('active' => true);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('FeatureSet', array(
+			'foreignKey' => false,
+			'conditions' => array('Feature.name' => 'DeviceType.name')
+		));
+		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
+		$expected['foreignKey'] = false;
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('NewFeatureSet', array(
+			'type' => 'hasMany',
+			'className' => 'FeatureSet',
+			'conditions' => array('active' => true)
+		));
+		$expected = array(
+			'className' => 'FeatureSet',
+			'conditions' => array('active' => true),
+			'foreignKey' => 'device_type_id',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		);
+		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
+		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
+	}
+/**
+ * testBindMultipleTimes method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindMultipleTimes() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Comment')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4', 'user' => 'garrett'),
+					'Items' => array(
+						array(
+							'id' => '2',
+							'article_id' => '1',
+							'user_id' => '4',
+							'comment' => 'Second Comment for First Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:47:23',
+							'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Article')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => 1,
+						'user_id' => 1,
+						'title' => 'First Article',
+						'body' => 'First Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3,
+						'user_id' => 1,
+						'title' => 'Third Article',
+						'body' => 'Third Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array(
+					array(
+						'id' => 2,
+						'user_id' => 3,
+						'title' => 'Second Article',
+						'body' => 'Second Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Items' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that bindModel behaves with Custom primary Key associations
+ *
+ * @return void
+ **/
+	function bindWithCustomPrimaryKey() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Model =& ClassRegistry::init('StoriesTag');
+		$Model->bindModel(array(
+			'belongsTo' => array(
+				'Tag' => array(
+					'className' => 'Tag',
+					'foreignKey' => 'story'
+		))));
+
+		$result = $Model->find('all');
+		$this->assertFalse(empty($result));
+	}
+
+/**
+ * testAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testAssociationAfterFind() {
+		$this->loadFixtures('Post', 'Author', 'Comment');
+		$TestModel =& new Post();
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+		)));
+		$this->assertEqual($result, $expected);
+		unset($TestModel);
+
+		$Author =& new Author();
+		$Author->Post->bindModel(array(
+			'hasMany' => array(
+				'Comment' => array(
+					'className' => 'ModifiedComment',
+					'foreignKey' => 'article_id',
+				)
+		)));
+		$result = $Author->find('all', array(
+			'conditions' => array('Author.id' => 1),
+			'recursive' => 2
+		));
+		$expected = array(
+			'id' => 1,
+			'article_id' => 1,
+			'user_id' => 2,
+			'comment' => 'First Comment for First Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 10:45:23',
+			'updated' => '2007-03-18 10:47:31',
+			'callback' => 'Fire'
+		);
+		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
+	}
+/**
+ * Tests that callbacks can be properly disabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCallbackDisabling() {
+		$this->loadFixtures('Author');
+		$TestModel = new ModifiedAuthor();
+
+		$result = Set::extract($TestModel->find('all'), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'after')), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'before')), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => false)), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testMultipleBelongsToWithSameClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleBelongsToWithSameClass() {
+		$this->loadFixtures(
+			'DeviceType',
+			'DeviceTypeCategory',
+			'FeatureSet',
+			'ExteriorTypeCategory',
+			'Document',
+			'Device',
+			'DocumentDirectory'
+		);
+
+		$DeviceType =& new DeviceType();
+
+		$DeviceType->recursive = 2;
+		$result = $DeviceType->read(null, 1);
+
+		$expected = array(
+			'DeviceType' => array(
+				'id' => 1,
+				'device_type_category_id' => 1,
+				'feature_set_id' => 1,
+				'exterior_type_category_id' => 1,
+				'image_id' => 1,
+				'extra1_id' => 1,
+				'extra2_id' => 1,
+				'name' => 'DeviceType 1',
+				'order' => 0
+			),
+			'Image' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra1' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra2' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'DeviceTypeCategory' => array(
+				'id' => 1,
+				'name' => 'DeviceTypeCategory 1'
+			),
+			'FeatureSet' => array(
+				'id' => 1,
+				'name' => 'FeatureSet 1'
+			),
+			'ExteriorTypeCategory' => array(
+				'id' => 1,
+				'image_id' => 1,
+				'name' => 'ExteriorTypeCategory 1',
+				'Image' => array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+			)),
+			'Device' => array(
+				array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+				),
+				array(
+					'id' => 2,
+					'device_type_id' => 1,
+					'name' => 'Device 2',
+					'typ' => 1
+				),
+				array(
+					'id' => 3,
+					'device_type_id' => 1,
+					'name' => 'Device 3',
+					'typ' => 2
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmRecursiveBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmRecursiveBelongsTo() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio', 'Syfile', 'Image');
+		$Portfolio =& new Portfolio();
+
+		$result = $Portfolio->find(array('id' => 2), null, null, 3);
+		$expected = array(
+			'Portfolio' => array(
+				'id' => 2,
+				'seller_id' => 1,
+				'name' => 'Portfolio 2'
+			),
+			'Item' => array(
+				array(
+					'id' => 2,
+					'syfile_id' => 2,
+					'published' => 0,
+					'name' => 'Item 2',
+					'ItemsPortfolio' => array(
+						'id' => 2,
+						'item_id' => 2,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 2,
+						'image_id' => 2,
+						'name' => 'Syfile 2',
+						'item_count' => null,
+						'Image' => array(
+							'id' => 2,
+							'name' => 'Image 2'
+						)
+				)),
+				array(
+					'id' => 6,
+					'syfile_id' => 6,
+					'published' => 0,
+					'name' => 'Item 6',
+					'ItemsPortfolio' => array(
+						'id' => 6,
+						'item_id' => 6,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 6,
+						'image_id' => null,
+						'name' => 'Syfile 6',
+						'item_count' => null,
+						'Image' => array()
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmFinderQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmFinderQuery() {
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
+		$Article =& new Article();
+
+		$sql = $this->db->buildStatement(
+			array(
+				'fields' => $this->db->fields($Article->Tag, null, array(
+					'Tag.id', 'Tag.tag', 'ArticlesTag.article_id', 'ArticlesTag.tag_id'
+				)),
+				'table' => $this->db->fullTableName('tags'),
+				'alias' => 'Tag',
+				'limit' => null,
+				'offset' => null,
+				'group' => null,
+				'joins' => array(array(
+					'alias' => 'ArticlesTag',
+					'table' => $this->db->fullTableName('articles_tags'),
+					'conditions' => array(
+						array("ArticlesTag.article_id" => '{$__cakeID__$}'),
+						array("ArticlesTag.tag_id" => $this->db->identifier('Tag.id'))
+					)
+				)),
+				'conditions' => array(),
+				'order' => null
+			),
+			$Article
+		);
+
+		$Article->hasAndBelongsToMany['Tag']['finderQuery'] = $sql;
+		$result = $Article->find('first');
+		$expected = array(
+			array(
+				'id' => '1',
+				'tag' => 'tag1'
+			),
+			array(
+				'id' => '2',
+				'tag' => 'tag2'
+		));
+
+		$this->assertEqual($result['Tag'], $expected);
+	}
+/**
+ * testHabtmLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmLimitOptimization() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 2;
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 1;
+		$result = $TestModel->read(null, 2);
+		unset($expected['Tag'][1]);
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHasManyLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasManyLimitOptimization() {
+		$this->loadFixtures('Project', 'Thread', 'Message', 'Bid');
+		$Project =& new Project();
+		$Project->recursive = 3;
+
+		$result = $Project->find('all');
+		$expected = array(
+			array(
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Thread' => array(
+					array(
+						'id' => 1,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 1',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 1,
+								'thread_id' => 1,
+								'name' => 'Thread 1, Message 1',
+								'Bid' => array(
+									'id' => 1,
+									'message_id' => 1,
+									'name' => 'Bid 1.1'
+					)))),
+					array(
+						'id' => 2,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 2',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 2,
+								'thread_id' => 2,
+								'name' => 'Thread 2, Message 1',
+								'Bid' => array(
+									'id' => 4,
+									'message_id' => 2,
+									'name' => 'Bid 2.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Thread' => array(
+					array(
+						'id' => 3,
+						'project_id' => 2,
+						'name' => 'Project 2, Thread 1',
+						'Project' => array(
+							'id' => 2,
+							'name' => 'Project 2',
+							'Thread' => array(
+								array(
+									'id' => 3,
+									'project_id' => 2,
+									'name' => 'Project 2, Thread 1'
+						))),
+						'Message' => array(
+							array(
+								'id' => 3,
+								'thread_id' => 3,
+								'name' => 'Thread 3, Message 1',
+								'Bid' => array(
+									'id' => 3,
+									'message_id' => 3,
+									'name' => 'Bid 3.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 3,
+					'name' => 'Project 3'
+				),
+				'Thread' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindAllRecursiveSelfJoin method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllRecursiveSelfJoin() {
+		$this->loadFixtures('Home', 'AnotherArticle', 'Advertisement');
+		$TestModel =& new Home();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Home' => array(
+					'id' => '1',
+					'another_article_id' => '1',
+					'advertisement_id' => '1',
+					'title' => 'First Home',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+			)))),
+			array(
+				'Home' => array(
+					'id' => '2',
+					'another_article_id' => '3',
+					'advertisement_id' => '1',
+					'title' => 'Second Home',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '3',
+					'title' => 'Third Article',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+					'Home' => array(
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+
+		$this->assertEqual($result, $expected);
+
+
+
+	}
+/**
+ * testFindAllRecursiveWithHabtm method
+ *
+ * @return void
+ * @access public
+ */
+	function testFindAllRecursiveWithHabtm() {
+		$this->loadFixtures(
+			'MyCategoriesMyUsers',
+			'MyCategoriesMyProducts',
+			'MyCategory',
+			'MyUser',
+			'MyProduct'
+		);
+
+		$MyUser =& new MyUser();
+		$MyUser->recursive = 2;
+
+		$result = $MyUser->find('all');
+		$expected = array(
+			array(
+				'MyUser' => array('id' => '1', 'firstname' => 'userA'),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '3',
+						'name' => 'C',
+						'MyProduct' => array(
+							array(
+								'id' => '2',
+								'name' => 'computer'
+			))))),
+			array(
+				'MyUser' => array(
+					'id' => '2',
+					'firstname' => 'userB'
+				),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '2',
+						'name' => 'B',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+							),
+							array(
+								'id' => '2',
+								'name' => 'computer'
+		))))));
+
+		$this->assertIdentical($result, $expected);
+	}
+/**
+ * testReadFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$TestModel->id = 7;
+		$result = $TestModel->read();
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find(array('CategoryThread.id' => 7));
+
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindAllFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find('all', null, null, 'CategoryThread.id ASC');
+		$expected = array(
+			array(
+				'CategoryThread' => array(
+				'id' => 1,
+				'parent_id' => 0,
+				'name' => 'Category 1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => null,
+					'parent_id' => null,
+					'name' => null,
+					'created' => null,
+					'updated' => null,
+					'ParentCategory' => array()
+			)),
+			array(
+				'CategoryThread' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array()
+				)),
+			array(
+				'CategoryThread' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 1,
+						'parent_id' => 0,
+						'name' => 'Category 1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array()
+			))),
+			array(
+				'CategoryThread' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 2,
+						'parent_id' => 1,
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 1,
+							'parent_id' => 0,
+							'name' => 'Category 1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array()
+			)))),
+			array(
+				'CategoryThread' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 3,
+						'parent_id' => 2,
+						'name' => 'Category 1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 1,
+								'parent_id' => 0,
+								'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array()
+			))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31',
+									'ParentCategory' => array()
+			)))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 7,
+					'parent_id' => 6,
+					'name' => 'Category 2.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 5,
+						'parent_id' => 4,
+						'name' => 'Category 1.1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 4,
+							'parent_id' => 3,
+							'name' => 'Category 1.1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 3,
+								'parent_id' => 2,
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		))))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testConditionalNumerics method
+ *
+ * @access public
+ * @return void
+ */
+	function testConditionalNumerics() {
+		$this->loadFixtures('NumericArticle');
+		$NumericArticle =& new NumericArticle();
+		$data = array('title' => '12345abcde');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(!empty($result));
+
+		$data = array('title' => '12345');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(empty($result));
+	}
+
+/**
+ * test find('all') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAll() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+		$TestModel->cacheQueries = false;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => 'User.id > 2'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id !=' => '0', 'User.user LIKE' => '%arr%')
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => array('User.id' => '0')));
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('or' => array('User.id' => '0', 'User.user LIKE' => '%a%')
+		)));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+				array('User' => array('id' => '1', 'user' => 'mariano')),
+				array('User' => array('id' => '2', 'user' => 'nate')),
+				array('User' => array('id' => '3', 'user' => 'larry')),
+				array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user ASC'));
+		$expected = array(
+				array('User' => array('user' => 'garrett')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'nate')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user DESC'));
+		$expected = array(
+				array('User' => array('user' => 'nate')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('limit' => 3, 'page' => 1));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$ids = array(4 => 1, 5 => 3);
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id' => $ids),
+			'order' => 'User.id'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
+		// hack can't handle small record counts.
+		if ($this->db->config['driver'] != 'mssql') {
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
+			$expected = array(
+				array(
+					'User' => array(
+						'id' => '4',
+						'user' => 'garrett',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:22:23',
+						'updated' => '2007-03-17 01:24:31'
+			)));
+			$this->assertEqual($result, $expected);
+
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 3));
+			$expected = array();
+			$this->assertEqual($result, $expected);
+		}
+	}
+/**
+ * test find('list') method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateFindList() {
+		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
+
+		$TestModel =& new Article();
+		$TestModel->displayField = 'title';
+
+		$result = $TestModel->find('list', array(
+			'order' => 'Article.title ASC'
+		));
+
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		if ($db->config['driver'] == 'mysql') {
+			$result = $TestModel->find('list', array(
+				'order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')
+			));
+			$expected = array(
+				1 => 'First Article',
+				3 => 'Third Article',
+				2 => 'Second Article'
+			);
+			$this->assertEqual($result, $expected);
+		}
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title')
+			)),
+			'{n}.Article.id', '{n}.Article.title'
+		);
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article'
+		);
+		$expected = array(
+			1 => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'body' => 'First Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			2 => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			3 => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'body' => 'Third Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article', '{n}.Article.user_id'
+		);
+		$expected = array(
+			1 => array(
+				1 => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				3 => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)),
+			3 => array(
+				2 => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title', 'user_id')
+			)),
+			'{n}.Article.id', '{n}.Article.title', '{n}.Article.user_id'
+		);
+
+		$expected = array(
+			1 => array(
+				1 => 'First Article',
+				3 => 'Third Article'
+			),
+			3 => array(
+				2 => 'Second Article'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Apple();
+		$expected = array(
+			1 => 'Red Apple 1',
+			2 => 'Bright Red Apple',
+			3 => 'green blue',
+			4 => 'Test Name',
+			5 => 'Blue Green',
+			6 => 'My new apple',
+			7 => 'Some odd color'
+		);
+
+		$this->assertEqual($TestModel->find('list'), $expected);
+		$this->assertEqual($TestModel->Parent->find('list'), $expected);
+
+		$TestModel =& new Post();
+		$result = $TestModel->find('list', array(
+			'fields' => 'Post.title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => 'title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id')
+		));
+		$expected = array(
+			'First Post' => '1',
+			'Second Post' => '2',
+			'Third Post' => '3'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id', 'created')
+		));
+		$expected = array(
+			'2007-03-18 10:39:23' => array(
+				'First Post' => '1'
+			),
+			'2007-03-18 10:41:23' => array(
+				'Second Post' => '2'
+			),
+			'2007-03-18 10:43:23' => array(
+				'Third Post' => '3'
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.body')
+		));
+		$expected = array(
+			1 => 'First Post Body',
+			2 => 'Second Post Body',
+			3 => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.title', 'Post.body')
+		));
+		$expected = array(
+			'First Post' => 'First Post Body',
+			'Second Post' => 'Second Post Body',
+			'Third Post' => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.id', 'Post.title', 'Author.user'),
+			'recursive' => 1
+		));
+		$expected = array(
+			'mariano' => array(
+				1 => 'First Post',
+				3 => 'Third Post'
+			),
+			'larry' => array(
+				2 => 'Second Post'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new User();
+		$result = $TestModel->find('list', array(
+			'fields' => array('User.user', 'User.password')
+		));
+		$expected = array(
+			'mariano' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'nate' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'larry' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'garrett' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new ModifiedAuthor();
+		$result = $TestModel->find('list', array(
+			'fields' => array('Author.id', 'Author.user')
+		));
+		$expected = array(
+			1 => 'mariano (CakePHP)',
+			2 => 'nate (CakePHP)',
+			3 => 'larry (CakePHP)',
+			4 => 'garrett (CakePHP)'
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindField method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindField() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$TestModel->id = 1;
+		$result = $TestModel->field('user');
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('User.user');
+		$this->assertEqual($result, 'mariano');
+
+		$TestModel->id = false;
+		$result = $TestModel->field('user', array(
+			'user' => 'mariano'
+		));
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('COUNT(*) AS count', true);
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->field('COUNT(*)', true);
+		$this->assertEqual($result, 4);
+	}
+/**
+ * testFindUnique method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindUnique() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$TestModel->id = 2;
+		$this->assertTrue($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		)));
+	}
+/**
+ * test find('count') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCount() {
+		$this->loadFixtures('User', 'Project');
+
+		$TestModel =& new User();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->order = 'User.id';
+		$this->db->_queriesLog = array();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$this->assertTrue(isset($this->db->_queriesLog[0]['query']));
+		$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
+	}
+
+/**
+ * test find with COUNT(DISTINCT field)
+ *
+ * @return void
+ **/
+	function testFindCountDistinct() {
+		$skip = $this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
+		);
+		if ($skip) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$TestModel =& new Project();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+
+		$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
+		$this->assertEqual($result, 4);
+	}
+/**
+ * Test find(count) with Db::expression
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCountWithDbExpressions() {
+		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$db = ConnectionManager::getDataSource('test_suite');
+		$TestModel =& new Project();
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			$db->expression('Project.name = \'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			'Project.name' => $db->expression('\'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+	}
+/**
+ * testFindMagic method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindMagic() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$result = $TestModel->findByUser('mariano');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23',
+				'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findByPassword('5f4dcc3b5aa765d61d8327deb882cf99');
+		$expected = array('User' => array(
+			'id' => '1',
+			'user' => 'mariano',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->read();
+		$this->assertFalse($result);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read();
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read(array('id', 'user'));
+		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read('id, user', 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')));
+		$this->assertTrue($result);
+
+		$TestModel->id = 1;
+		$result = $TestModel->read('id, user');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRecursiveRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveRead() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Featured',
+			'ArticleFeatured'
+		);
+		$TestModel =& new User();
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')), false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array('id' => '1', 'user' => 'mariano'),
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 1;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read('id, user', 3);
+		$expected = array(
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry'
+			),
+			'Article' => array(
+				array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Comment' => array(
+						array(
+							'id' => '5',
+							'article_id' => '2',
+							'user_id' => '1',
+							'comment' => 'First Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:53:23',
+							'updated' => '2007-03-18 10:55:31'
+						),
+						array(
+							'id' => '6',
+							'article_id' => '2',
+							'user_id' => '2',
+							'comment' => 'Second Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:55:23',
+							'updated' => '2007-03-18 10:57:31'
+					)),
+					'Tag' => array(
+						array(
+							'id' => '1',
+							'tag' => 'tag1',
+							'created' => '2007-03-18 12:22:23',
+							'updated' => '2007-03-18 12:24:31'
+						),
+						array(
+							'id' => '3',
+							'tag' => 'tag3',
+							'created' => '2007-03-18 12:26:23',
+							'updated' => '2007-03-18 12:28:31'
+		)))));
+		$this->assertEqual($result, $expected);
+	}
+
+	function testRecursiveFindAll() {
+		$this->db->truncate(new Featured());
+
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment',
+			'ArticleFeatured',
+			'Featured',
+			'Category'
+		);
+		$TestModel =& new Article();
+
+		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '2',
+							'user' => 'nate',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23',
+							'updated' => '2007-03-17 01:20:31'
+						),
+						'Attachment' => false
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$Featured = new Featured();
+
+		$Featured->recursive = 2;
+		$Featured->bindModel(array(
+			'belongsTo' => array(
+				'ArticleFeatured' => array(
+					'conditions' => "ArticleFeatured.published = 'Y'",
+					'fields' => 'id, title, user_id, published'
+				)
+			)
+		));
+
+		$Featured->ArticleFeatured->unbindModel(array(
+			'hasMany' => array('Attachment', 'Comment'),
+			'hasAndBelongsToMany' => array('Tag'))
+		);
+
+		$orderBy = 'ArticleFeatured.id ASC';
+		$result = $Featured->find('all', array(
+			'order' => $orderBy, 'limit' => 3
+		));
+
+		$expected = array(
+			array(
+				'Featured' => array(
+					'id' => '1',
+					'article_featured_id' => '1',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'user_id' => '1',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '1',
+						'article_featured_id' => '1',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				)),
+			array(
+				'Featured' => array(
+					'id' => '2',
+					'article_featured_id' => '2',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '2',
+					'title' => 'Second Article',
+					'user_id' => '3',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '2',
+						'article_featured_id' => '2',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRecursiveFindAllWithLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveFindAllWithLimit() {
+		$this->loadFixtures('Article', 'User', 'Tag', 'ArticlesTag', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$TestModel->hasMany['Comment']['limit'] = 2;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 1)
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasMany['Comment']['limit'] = 1;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
new file mode 100644
index 000000000..b4dcf22fd
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -0,0 +1,126 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+/**
+ * ModelValidationTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_validation.test.php';
+/**
+ * ModelValidationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelValidationTest extends BaseModelTest {
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testValidationParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithParams',
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'validator' => array(
+				'rule' => 'customValidatorWithParams',
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			),
+			'or' => true,
+			'ignore_on_same' => 'id'
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithMessage',
+			'required' => true
+		);
+		$expected = array(
+			'title' => 'This field will *never* validate! Muhahaha!'
+		);
+
+		$this->assertEqual($TestModel->invalidFields(), $expected);
+	}
+/**
+ * Tests validation parameter fieldList in invalidFields
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidFieldsWithFieldListParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate = $validate = array(
+			'title' => array(
+				'rule' => 'customValidator',
+				'required' => true
+			),
+			'name' => array(
+				'rule' => 'allowEmpty',
+				'required' => true
+		));
+		$TestModel->invalidFields(array('fieldList' => array('title')));
+		$expected = array(
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name')));
+		$expected = array(
+			'name' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name', 'title')));
+		$expected = array(
+			'name' => 'This field cannot be left blank',
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->whitelist = array('name');
+		$TestModel->invalidFields();
+		$expected = array('name' => 'This field cannot be left blank');
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$this->assertEqual($TestModel->validate, $validate);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
new file mode 100644
index 000000000..c0f45af02
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -0,0 +1,3894 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+/**
+ * ModelWriteTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_write.test.php';
+/**
+ * ModelWriteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelWriteTest extends BaseModelTest {
+/**
+ * testInsertAnotherHabtmRecordWithSameForeignKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsertAnotherHabtmRecordWithSameForeignKey() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->JoinAsJoinB->create();
+		$result = $TestModel->JoinAsJoinB->save(array(
+			'join_a_id' => 1,
+			'join_b_id' => 1,
+			'other' => 'Data for Join A 1 Join B 1',
+			'created' => '2008-01-03 10:56:44',
+			'updated' => '2008-01-03 10:56:44'
+		));
+		$this->assertTrue($result);
+		$lastInsertId = $TestModel->JoinAsJoinB->getLastInsertID();
+		$this->assertTrue($lastInsertId != null);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$updatedValue = 'UPDATED Data for Join A 1 Join B 2';
+		$TestModel->JoinAsJoinB->id = 1;
+		$result = $TestModel->JoinAsJoinB->saveField('other', $updatedValue, false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
+	}
+/**
+ * testSaveDateAsFirstEntry method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveDateAsFirstEntry() {
+		$this->loadFixtures('Article');
+
+		$Article =& new Article();
+
+		$data = array(
+			'Article' => array(
+				'created' => array(
+					'day' => '1',
+					'month' => '1',
+					'year' => '2008'
+				),
+				'title' => 'Test Title',
+				'user_id' => 1
+		));
+		$Article->create();
+		$this->assertTrue($Article->save($data));
+
+		$testResult = $Article->find(array('Article.title' => 'Test Title'));
+
+		$this->assertEqual($testResult['Article']['title'], $data['Article']['title']);
+		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
+
+	}
+/**
+ * testUnderscoreFieldSave method
+ *
+ * @access public
+ * @return void
+ */
+	function testUnderscoreFieldSave() {
+		$this->loadFixtures('UnderscoreField');
+		$UnderscoreField =& new UnderscoreField();
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 3);
+		$data = array('UnderscoreField' => array(
+			'user_id' => '1',
+			'my_model_has_a_field' => 'Content here',
+			'body' => 'Body',
+			'published' => 'Y',
+			'another_field' => 4
+		));
+		$ret = $UnderscoreField->save($data);
+		$this->assertTrue($ret);
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 4);
+	}
+/**
+ * testAutoSaveUuid method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoSaveUuid() {
+		// SQLite does not support non-integer primary keys, and SQL Server
+		// is still having problems with custom PK's
+		$this->skipIf(
+			   $this->db->config['driver'] == 'sqlite'
+			|| $this->db->config['driver'] == 'mssql'
+		);
+
+		$this->loadFixtures('Uuid');
+		$TestModel =& new Uuid();
+
+		$TestModel->save(array('title' => 'Test record'));
+		$result = $TestModel->findByTitle('Test record');
+		$this->assertEqual(
+			array_keys($result['Uuid']),
+			array('id', 'title', 'count', 'created', 'updated')
+		);
+		$this->assertEqual(strlen($result['Uuid']['id']), 36);
+	}
+/**
+ * testZeroDefaultFieldValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testZeroDefaultFieldValue() {
+		$this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'%s SQLite uses loose typing, this operation is unsupported'
+		);
+		$this->loadFixtures('DataTest');
+		$TestModel =& new DataTest();
+
+		$TestModel->create(array());
+		$TestModel->save();
+		$result = $TestModel->findById($TestModel->id);
+		$this->assertIdentical($result['DataTest']['count'], '0');
+		$this->assertIdentical($result['DataTest']['float'], '0');
+	}
+/**
+ * testNonNumericHabtmJoinKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testNonNumericHabtmJoinKey() {
+		$this->loadFixtures('Post', 'Tag', 'PostsTag');
+		$Post =& new Post();
+		$Post->bind('Tag', array('type' => 'hasAndBelongsToMany'));
+		$Post->Tag->primaryKey = 'tag';
+
+		$result = $Post->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+						),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testAllowSimulatedFields() {
+		$TestModel =& new ValidationTest1();
+
+		$TestModel->create(array(
+			'title' => 'foo',
+			'bar' => 'baz'
+		));
+		$expected = array(
+			'ValidationTest1' => array(
+				'title' => 'foo',
+				'bar' => 'baz'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+	}
+/**
+ * test that Caches are getting cleared on save().
+ * ensure that both inflections of controller names are getting cleared
+ * as url for controller could be either overallFavorites/index or overall_favorites/index
+ *
+ * @return void
+ **/
+	function testCacheClearOnSave() {
+		$_back = array(
+			'check' => Configure::read('Cache.check'),
+			'disable' => Configure::read('Cache.disable'),
+		);
+		Configure::write('Cache.check', true);
+		Configure::write('Cache.disable', false);
+
+		$this->loadFixtures('OverallFavorite');
+		$OverallFavorite =& new OverallFavorite();
+
+		touch(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php');
+		touch(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php');
+
+		$data = array(
+			'OverallFavorite' => array(
+		 		'model_type' => '8-track',
+				'model_id' => '3',
+				'priority' => '1'
+			)
+		);
+		$OverallFavorite->create($data);
+		$OverallFavorite->save();
+
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php'));
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php'));
+
+		Configure::write('Cache.check', $_back['check']);
+		Configure::write('Cache.disable', $_back['disable']);
+	}
+/**
+ * testSaveWithCounterCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCache() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published' => false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->delete(1);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 2;
+		$TestModel2->saveField('syfile_id', 1);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$result = $TestModel->findById(2);
+		$this->assertIdentical($result['Syfile']['item_count'], '0');
+	}
+/**
+ * Tests that counter caches are updated when records are added
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheIncrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+		$data = array('Post' => array(
+			'title' => 'New Post',
+			'user_id' => 66
+		));
+
+		$Post->save($data);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests that counter caches are updated when records are deleted
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheDecrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$Post->del(2);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests that counter caches are updated when foreign keys of counted records change
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheUpdated() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('id' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['user_id'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.id'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+	}
+/**
+ * Test counter cache with models that use a non-standard (i.e. not using 'id')
+ * as their primary key.
+ *
+ * @access public
+ * @return void
+ */
+    function testCounterCacheWithNonstandardPrimaryKey() {
+        $this->loadFixtures(
+			'CounterCacheUserNonstandardPrimaryKey',
+			'CounterCachePostNonstandardPrimaryKey'
+		);
+
+        $User = new CounterCacheUserNonstandardPrimaryKey();
+        $Post = new CounterCachePostNonstandardPrimaryKey();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('pid' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['uid'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.uid'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+    }
+
+/**
+ * test Counter Cache With Self Joining table
+ *
+ * @return void
+ * @access public
+ */
+	function testCounterCacheWithSelfJoin() {
+		$skip = $this->skipIf(
+			($this->db->config['driver'] == 'sqlite'),
+			'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('CategoryThread');
+		$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD COLUMN child_count INTEGER");
+		$Category =& new CategoryThread();
+		$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
+		$this->assertTrue($result);
+
+		$Category =& new CategoryThread();
+		$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
+		$Category->updateCounterCache(array('parent_id' => 5));
+		$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
+		$expected = array_fill(0, 1, 1);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithCounterCacheScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCacheScope() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+		$TestModel2->belongsTo['Syfile']['counterCache'] = true;
+		$TestModel2->belongsTo['Syfile']['counterScope'] = array('published' => true);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published'=> true
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 1;
+		$TestModel2->saveField('published', true);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->save(array(
+			'id' => 1,
+			'syfile_id' => 1,
+			'published'=> false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+	}
+/**
+ * testValidatesBackwards method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatesBackwards() {
+		$TestModel =& new TestValidate();
+
+		$TestModel->validate = array(
+			'user_id' => VALID_NUMBER,
+			'title' => VALID_NOT_EMPTY,
+			'body' => VALID_NOT_EMPTY
+		);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '',
+			'body' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => 'not a number',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+	}
+/**
+ * testValidates method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidates() {
+		$TestModel =& new TestValidate();
+
+		$TestModel->validate = array(
+			'user_id' => 'numeric',
+			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
+			'body' => 'notEmpty'
+		);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data) && $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '0',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => true, 'rule' => 'date');
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 'invalid-date-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => false, 'rule' => 'date');
+
+		$data = array('TestValidate' => array('modified' => null));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => false));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['slug'] = array('allowEmpty' => false, 'rule' => array('maxLength', 45));
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'slug-right-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 3,
+				'max' => 5
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 5,
+				'max' => 10
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'validateTitle'
+		));
+
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'new title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'title-new'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array('title' => array(
+			'allowEmpty' => true,
+			'rule' => 'validateTitle'
+		));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'length' => array(
+					'allowEmpty' => true,
+					'rule' => array('maxLength', 10)
+		)));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'rule' => array('userDefined', 'Article', 'titleDuplicate')
+		));
+		$data = array('TestValidate' => array('title' => 'My Article Title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'My Article With a Different Title'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array('rule' => array('minLength', 50)),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'onlyLetters'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array(
+					'rule' => array('minLength', 50),
+					'last' => true
+				),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'tooShort'
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveField method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveField() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', 'New First Article');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'First Article Body'
+		));
+		$result['Article']['title'] = trim($result['Article']['title']);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$TestModel->set('body', 'Messed up data');
+		$this->assertTrue($TestModel->saveField('title', 'First Article'));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '', true);
+		$this->assertFalse($result);
+
+		$this->loadFixtures('Node', 'Dependency');
+		$Node =& new Node();
+		$Node->set('id', 1);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+
+		$Node->saveField('state', 10);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+	}
+/**
+ * testSaveWithCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCreate() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'User',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment'
+		);
+		$TestModel =& new User();
+
+		$data = array('User' => array(
+			'user' => 'user',
+			'password' => ''
+		));
+		$result = $TestModel->save($data);
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => '',
+			'title' => '',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'title' => 'New First Article'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '2',
+			'title' => 'First Article',
+			'body' => 'New First Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, true, array('id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array('Tag' => array(1, 3))
+		);
+		$TestModel->create();
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Comment' => array(
+			'article_id' => '4',
+			'user_id' => '1',
+			'comment' => 'Comment New Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 14:57:23',
+			'updated' => '2007-03-18 14:59:31'
+		));
+		$result = $TestModel->Comment->create() && $TestModel->Comment->save($data);
+		$this->assertTrue($result);
+
+		$data = array('Attachment' => array(
+			'comment_id' => '7',
+			'attachment' => 'newattachment.zip',
+			'created' => '2007-03-18 15:02:23',
+			'updated' => '2007-03-18 15:04:31'
+		));
+		$result = $TestModel->Comment->Attachment->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '7',
+					'article_id' => '4',
+					'user_id' => '1',
+					'comment' => 'Comment New Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 14:57:23',
+					'updated' => '2007-03-18 14:59:31',
+					'Article' => array(
+						'id' => '4',
+						'user_id' => '2',
+						'title' => 'New Article',
+						'body' => 'New Article Body',
+						'published' => 'N',
+						'created' => '2007-03-18 14:55:23',
+						'updated' => '2007-03-18 14:57:31'
+					),
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Attachment' => array(
+						'id' => '2',
+						'comment_id' => '7',
+						'attachment' => 'newattachment.zip',
+						'created' => '2007-03-18 15:02:23',
+						'updated' => '2007-03-18 15:04:31'
+			))),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithSet() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		// Create record we will be updating later
+
+		$data = array('Article' => array(
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		// Check record we created
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Create new record just to overlap Model->id on previously created record
+
+		$data = array('Article' => array(
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Go back and edit the first article we created, starting by checking it's still there
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// And now do the update with set()
+
+		$data = array('Article' => array(
+			'id' => '4',
+			'title' => 'Fourth Article - New Title',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '5', 'title' => 'Fifth Article - New Title 5'));
+		$result = ($TestModel->set($data) && $TestModel->save());
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article - New Title 5',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
+		$expected = array(
+			array('Article' => array('id' => 1, 'title' => 'First Article' )),
+			array('Article' => array('id' => 2, 'title' => 'Second Article' )),
+			array('Article' => array('id' => 3, 'title' => 'Third Article' )),
+			array('Article' => array('id' => 4, 'title' => 'Fourth Article - New Title' )),
+			array('Article' => array('id' => 5, 'title' => 'Fifth Article - New Title 5' ))
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithNonExistentFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithNonExistentFields() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$TestModel->recursive = -1;
+
+		$data = array(
+			'non_existent' => 'This field does not exist',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'user_id' => '1',
+			'non_existent' => 'This field does not exist',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '1',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveFromXml method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveFromXml() {
+		$this->loadFixtures('Article');
+		App::import('Core', 'Xml');
+
+		$Article = new Article();
+		$Article->save(new Xml('<article title="test xml" user_id="5" />'));
+		$this->assertTrue($Article->save(new Xml('<article title="test xml" user_id="5" />')));
+
+		$results = $Article->find(array('Article.title' => 'test xml'));
+		$this->assertTrue($results);
+	}
+/**
+ * testSaveHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtm() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+			),
+			'Tag' => array('Tag' => array(1, 2))
+		);
+
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '2'), 'Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(1, 2, 3)));
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array()));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Tag' => array('Tag' => ''));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article Title'
+		));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article Title',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(2, 3)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'Changed Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 3)
+			),
+			'Article' => array('id' => '2'),
+		);
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => 10,
+				'user_id' => '2',
+				'title' => 'New Article With Tags and fieldList',
+				'body' => 'New Article Body with Tags and fieldList',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2, 3)
+		));
+		$result =  $TestModel->create()
+				&& $TestModel->save($data, true, array('user_id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->read();
+		$expected = array(
+			'Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'New Article With Tags and fieldList',
+				'body' => '',
+				'published' => 'N',
+				'created' => '',
+				'updated' => ''
+			),
+			'Tag' => array(
+				0 => array(
+					'id' => 1,
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				1 => array(
+					'id' => 2,
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				2 => array(
+					'id' => 3,
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+
+		$this->loadFixtures('JoinA', 'JoinC', 'JoinAC', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+		$TestModel->hasBelongsToMany['JoinC']['unique'] = true;
+		$data = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+			),
+			'JoinC' => array(
+				'JoinC' => array(
+					array('join_c_id' => 2, 'other' => 'new record'),
+					array('join_c_id' => 3, 'other' => 'new record')
+				)
+			)
+		);
+		$TestModel->save($data);
+		$result = $TestModel->read(null, 1);
+		$time = date('Y-M-D H:i:s');
+		$expected = array(4, 5);
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
+		$expected = array('new record', 'new record');
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
+	}
+/**
+ * testSaveHabtmCustomKeys method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtmCustomKeys() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Story =& new Story();
+
+		$data = array(
+			'Story' => array('story' => '1'),
+			'Tag' => array(
+				'Tag' => array(2, 3)
+		));
+		$result = $Story->set($data);
+		$this->assertTrue($result);
+
+		$result = $Story->save();
+		$this->assertTrue($result);
+
+		$result = $Story->find('all');
+		$expected = array(
+			array(
+				'Story' => array(
+					'story' => 1,
+					'title' => 'First Story'
+				),
+				'Tag' => array(
+					array(
+						'id' => 2,
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+					),
+					array(
+						'id' => 3,
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Story' => array(
+					'story' => 2,
+					'title' => 'Second Story'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmSaveKeyResolution method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmSaveKeyResolution() {
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+			));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+/**
+ * testCreationOfEmptyRecord method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationOfEmptyRecord() {
+		$this->loadFixtures('Author');
+		$TestModel =& new Author();
+		$this->assertEqual($TestModel->find('count'), 4);
+
+		$TestModel->deleteAll(true, false, false);
+		$this->assertEqual($TestModel->find('count'), 0);
+
+		$result = $TestModel->save();
+		$this->assertTrue(isset($result['Author']['created']));
+		$this->assertTrue(isset($result['Author']['updated']));
+		$this->assertEqual($TestModel->find('count'), 1);
+	}
+/**
+ * testCreateWithPKFiltering method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateWithPKFiltering() {
+		$TestModel =& new Article();
+		$data = array(
+			'id' => 5,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 5);
+
+		$result = $TestModel->create($data, true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$result = $TestModel->create(array('Article' => $data), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$data = array(
+			'id' => 6,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text',
+			'created' => '1970-01-01 00:00:00',
+			'updated' => '1970-01-01 12:00:00',
+			'modified' => '1970-01-01 12:00:00'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 6,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text',
+				'created' => '1970-01-01 00:00:00',
+				'updated' => '1970-01-01 12:00:00',
+				'modified' => '1970-01-01 12:00:00'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 6);
+
+		$result = $TestModel->create(array(
+			'Article' => array_diff_key($data, array(
+				'created' => true,
+				'updated' => true,
+				'modified' => true
+		))), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+	}
+/**
+ * testCreationWithMultipleData method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleData() {
+		$this->loadFixtures('Article', 'Comment');
+		$Article =& new Article();
+		$Comment =& new Comment();
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'Second Comment for Second Article',
+				'published' => 'Y'
+		))));
+
+		$data = array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article Modified'
+		));
+
+		$result = $Comment->create($data);
+
+		$this->assertTrue($result);
+		$result = $Comment->save();
+		$this->assertTrue($result);
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2, 'comment' =>
+				'Second Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 7,
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+	))));
+
+	}
+/**
+ * testCreationWithMultipleDataSameModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModel() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$SecondaryArticle =& new Article();
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$data = array(
+			'Article' => array(
+				'user_id' => 2,
+				'title' => 'Brand New Article',
+				'body' => 'Brand New Article Body',
+				'published' => 'Y'
+			),
+			'SecondaryArticle' => array(
+				'id' => 1
+		));
+
+		$Article->create();
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Article->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+			)),
+			array('Article' => array(
+				'id' => 4,
+				'title' => 'Brand New Article'
+		))));
+	}
+/**
+ * testCreationWithMultipleDataSameModelManualInstances method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModelManualInstances() {
+		$this->loadFixtures('PrimaryModel');
+		$Primary =& new PrimaryModel();
+		$Secondary =& new PrimaryModel();
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$data = array(
+			'PrimaryModel' => array(
+				'primary_name' => 'Primary Name New'
+			),
+			'SecondaryModel' => array(
+				'id' => array(1)
+		));
+
+		$Primary->create();
+		$result = $Primary->save($data);
+		$this->assertTrue($result);
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$result = $Primary->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Primary->field('primary_name', array('id' => $result));
+		$this->assertEqual($result, 'Primary Name New');
+
+		$result = $Primary->find('count');
+		$this->assertEqual($result, 2);
+	}
+/**
+ * testRecordExists method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecordExists() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->exists());
+		$TestModel->read(null, 1);
+		$this->assertTrue($TestModel->exists());
+		$TestModel->create();
+		$this->assertFalse($TestModel->exists());
+		$TestModel->id = 4;
+		$this->assertTrue($TestModel->exists());
+
+		$TestModel =& new TheVoid();
+		$this->assertFalse($TestModel->exists());
+		$TestModel->id = 5;
+		$this->assertFalse($TestModel->exists());
+	}
+/**
+ * testUpdateExisting method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateExisting() {
+		$this->loadFixtures('User', 'Article', 'Comment');
+		$TestModel =& new User();
+		$TestModel->create();
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'some user',
+				'password' => 'some password'
+		)));
+		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
+		$id = $TestModel->id;
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'updated user'
+		)));
+		$this->assertEqual($TestModel->id, $id);
+
+		$result = $TestModel->findById($id);
+		$this->assertEqual($result['User']['user'], 'updated user');
+		$this->assertEqual($result['User']['password'], 'some password');
+
+		$Article =& new Article();
+		$Comment =& new Comment();
+		$data = array(
+			'Comment' => array(
+				'id' => 1,
+				'comment' => 'First Comment for First Article'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+		));
+
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Comment->save($data);
+		$this->assertTrue($result);
+	}
+/**
+ * testUpdateMultiple method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateMultiple() {
+		$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
+		$TestModel =& new Comment();
+		$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id');
+		$expected = array('2', '4', '1', '1', '1', '2');
+		$this->assertEqual($result, $expected);
+
+		$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
+		$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
+		$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->updateAll(
+			array('Comment.comment' => "'Updated today'"),
+			array('Comment.user_id' => 5)
+		);
+		$this->assertTrue($result);
+		$result = Set::extract(
+			$TestModel->find('all', array(
+				'conditions' => array(
+					'Comment.user_id' => 5
+			))),
+			'{n}.Comment.comment'
+		);
+		$expected = array_fill(0, 2, 'Updated today');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmUuidWithUuidId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithUuidId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolio');
+		$TestModel =& new Uuidportfolio();
+
+		$data = array('Uuidportfolio' => array('name' => 'Portfolio 3'));
+		$data['Uuiditem']['Uuiditem'] = array('483798c8-c7cc-430e-8cf9-4fcc40cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuiditem']));
+		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
+	}
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns.
+ *
+ * @return void
+ **/
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new Fruit();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
+ *
+ * @return void
+ **/
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new FruitNoWith();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+
+/**
+ * testHabtmUuidWithNumericId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithNumericId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolioNumericid');
+		$TestModel =& new Uuiditem();
+
+		$data = array('Uuiditem' => array('name' => 'Item 7', 'published' => 0));
+		$data['Uuidportfolio']['Uuidportfolio'] = array('480af662-eb8c-47d3-886b-230540cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuidportfolio']));
+	}
+/**
+ * testSaveMultipleHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveMultipleHabtm() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
+		$TestModel = new JoinA();
+		$result = $TestModel->findById(1);
+
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => '2008-01-03 10:54:23'
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'Data for Join A 1 Join B 2',
+						'created' => '2008-01-03 10:56:33',
+						'updated' => '2008-01-03 10:56:33'
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'Data for Join A 1 Join C 2',
+						'created' => '2008-01-03 10:57:22',
+						'updated' => '2008-01-03 10:57:22'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->id = 1;
+		$data = array(
+			'JoinA' => array(
+				'id' => '1',
+				'name' => 'New name for Join A 1',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				array(
+					'id' => 1,
+					'join_b_id' => 2,
+					'other' => 'New data for Join A 1 Join B 2',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			'JoinC' => array(
+				array(
+					'id' => 1,
+					'join_c_id' => 2,
+					'other' => 'New data for Join A 1 Join C 2',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+
+		$TestModel->set($data);
+		$TestModel->save();
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'New name for Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'New data for Join A 1 Join B 2',
+						'created' => $ts,
+						'updated' => $ts
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'New data for Join A 1 Join C 2',
+						'created' => $ts,
+						'updated' => $ts
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAll() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result), 3);
+		$this->assertFalse(isset($result[3]));
+		$ts = date('Y-m-d H:i:s');
+
+		$TestModel->saveAll(array(
+			'Post' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author'
+			),
+			'Author' => array(
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90'
+		)));
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'Post' => array(
+				'id' => '4',
+				'author_id' => '5',
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'published' => 'N',
+				'created' => $ts,
+				'updated' => $ts
+			),
+			'Author' => array(
+				'id' => '5',
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
+				'created' => $ts,
+				'updated' => $ts,
+				'test' => 'working'
+		));
+		$this->assertEqual($result[3], $expected);
+		$this->assertEqual(count($result), 4);
+
+		$TestModel->deleteAll(true);
+		$this->assertEqual($TestModel->find('all'), array());
+
+		// SQLite seems to reset the PK counter when that happens, so we need this to make the tests pass
+		$this->db->truncate($TestModel);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->saveAll(array(
+			array(
+				'title' => 'Multi-record post 1',
+				'body' => 'First multi-record post',
+				'author_id' => 2
+			),
+			array(
+				'title' => 'Multi-record post 2',
+				'body' => 'Second multi-record post',
+				'author_id' => 2
+		)));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'order' => 'Post.id ASC'
+		));
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '2',
+					'title' => 'Multi-record post 1',
+					'body' => 'First multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '2',
+					'title' => 'Multi-record post 2',
+					'body' => 'Second multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Comment();
+		$ts = date('Y-m-d H:i:s');
+		$result = $TestModel->saveAll(array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'New comment with attachment',
+				'published' => 'Y'
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.tgz'
+			)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '2',
+			'comment_id' => '7',
+			'attachment' => 'some_file.tgz',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Attachment'], $expected);
+	}
+/**
+ * Test SaveAll with Habtm relations
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtm() {
+		$this->loadFixtures('Article', 'Tag', 'Comment', 'User');
+		$data = array(
+			'Article' => array(
+				'user_id' => 1,
+				'title' => 'Article Has and belongs to Many Tags'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Comment' => array(
+				array(
+					'comment' => 'Article comment',
+					'user_id' => 1
+		)));
+		$Article =& new Article();
+		$result = $Article->saveAll($data);
+		$this->assertTrue($result);
+
+		$result = $Article->read();
+		$this->assertEqual(count($result['Tag']), 2);
+		$this->assertEqual($result['Tag'][0]['tag'], 'tag1');
+		$this->assertEqual(count($result['Comment']), 1);
+		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
+	}
+/**
+ * Test SaveAll with Habtm relations and extra join table fields
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtmWithExtraJoinTableFields() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+
+		$data = array(
+			'Something' => array(
+				'id' => 4,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '1'),
+				array('something_else_id' => 2, 'doomed' => '0'),
+				array('something_else_id' => 3, 'doomed' => '1')
+			)
+		);
+
+		$Something =& new Something();
+		$result = $Something->saveAll($data);
+		$this->assertTrue($result);
+		$result = $Something->read();
+
+		$this->assertEqual(count($result['SomethingElse']), 3);
+		$this->assertTrue(Set::matches('/Something[id=4]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[something_else_id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[doomed=1]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[something_else_id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[doomed=0]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
+	}
+/**
+ * testSaveAllHasOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOne() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Comment with attachment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.zip'
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Attachment.id',
+			'Attachment.comment_id', 'Attachment.attachment'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'comment' => 'Comment with attachment'
+			),
+			'Attachment' => array(
+				'id' => '1',
+				'comment_id' => '1',
+				'attachment' => 'some_file.zip'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAllBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllBelongsTo() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Article->deleteAll(true);
+		$this->assertEqual($model->Article->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Article comment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Article' => array(
+				'title' => 'Model Associations 101',
+				'user_id' => 1
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Comment.article_id', 'Article.id', 'Article.title'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'article_id' => '1',
+				'comment' => 'Article comment'
+			),
+			'Article' => array(
+				'id' => '1',
+				'title' => 'Model Associations 101'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAllHasOneValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOneValidation() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$model->validate = array('comment' => 'notEmpty');
+		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->Attachment->bind('Comment');
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array(
+					'comment' => '',
+					'article_id' => 1,
+					'user_id' => 1
+				),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'first')
+		));
+		$expected = array(
+			'Comment' => array('comment' => 'This field cannot be left blank'),
+			'Attachment' => array('attachment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'only')
+		));
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+	}
+/**
+ * testSaveAllAtomic method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllAtomic() {
+		$this->loadFixtures('Article', 'User');
+		$TestModel =& new Article();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'user_id' => 2))
+		), array('atomic' => false));
+
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true)));
+
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'user_id' => 2
+			)
+		), array('atomic' => false));
+		$this->assertIdentical($result, array(true, true, true));
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+			)
+		), array('atomic' => false));
+		$this->assertIdentical($result, array(true, false));
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => 'First new comment',
+					'published' => 'Y',
+					'user_id' => 1
+				),
+				array(
+					'comment' => 'Second new comment',
+					'published' => 'Y',
+					'user_id' => 2
+			))
+		), array('atomic' => false));
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
+	}
+/**
+ * testSaveAllHasMany method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasMany() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
+				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
+			)
+		));
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Third new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$TestModel->beforeSaveReturn = false;
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Fourth new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertEqual($result, array('Article' => false));
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+	}
+/**
+ * testSaveAllHasManyValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidation() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
+			)
+		));
+		$expected = array('Comment' => array(false));
+		$this->assertEqual($result, $expected);
+
+		$expected = array('Comment' => array(
+			array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$expected = array(
+			array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => '',
+					'published' => 'Y',
+					'user_id' => 1
+			))
+		), array('validate' => 'only'));
+	}
+/**
+ * testSaveAllTransaction method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllTransaction() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => '')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'New Fifth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$this->assertEqual($result, $expected);
+			// Skip the rest of the transactional tests
+			return;
+		}
+
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => ''),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+		}
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'fields' => array('author_id', 'title','body','published')
+		));
+
+		$expected = array(
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fourth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fifth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Sixth Post',
+				'body' => '',
+				'published' => 'N'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveAllValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidation() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'author_id' => 2
+		));
+
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$ts = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Baleeted First Post',
+					'body' => 'Baleeted!',
+					'published' => 'N',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23', 'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data);
+		$this->assertEqual($result, false);
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
+		if (!$transactionWorked) {
+			$this->assertTrue(Set::matches('/Post[1][title=Un-Baleeted First Post]', $result));
+			$this->assertTrue(Set::matches('/Post[2][title=Just update the title]', $result));
+		}
+
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data, array('atomic' => false));
+		$this->assertEqual($result, array(true, false));
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$newTs = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Un-Baleeted First Post',
+					'body' => 'Not Baleeted!',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $newTs
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Re-Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'title' => 'First new post',
+				'body' => 'Woohoo!',
+				'published' => 'Y'
+			),
+			array(
+				'title' => 'Empty body',
+				'body' => ''
+		));
+
+		$TestModel->validate['body'] = 'notEmpty';
+	}
+/**
+ * testSaveAllValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidationOnly() {
+		$TestModel =& new Comment();
+		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+
+		$data = array(
+			'Comment' => array(
+				'comment' => 'This is the comment'
+			),
+			'Attachment' => array(
+				'attachment' => ''
+			)
+		);
+
+		$result = $TestModel->saveAll($data, array('validate' => 'only'));
+		$this->assertFalse($result);
+
+		$TestModel =& new Article();
+		$TestModel->validate = array('title' => 'notEmpty');
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => ''),
+				1 => array('title' => 'title 1'),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			0 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => 'title 0'),
+				1 => array('title' => ''),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			1 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+	}
+/**
+ * testSaveAllValidateFirst method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidateFirst() {
+		$model =& new Article();
+		$model->deleteAll(true);
+
+		$model->Comment->validate = array('comment' => 'notEmpty');
+		$result = $model->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved  author'
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment'),
+				array('comment' => '')
+			)
+		), array('validate' => 'first'));
+
+		$this->assertFalse($result);
+
+		$result = $model->find('all');
+		$this->assertEqual($result, array());
+		$expected = array('Comment' => array(
+			1 => array('comment' => 'This field cannot be left blank')
+		));
+
+		$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
+
+		$this->assertIdentical($model->Comment->find('count'), 0);
+
+		$result = $model->saveAll(
+			array(
+				'Article' => array(
+					'title' => 'Post with Author',
+					'body' => 'This post will be saved with an author',
+					'user_id' => 2
+				),
+				'Comment' => array(
+					array(
+						'comment' => 'Only new comment',
+						'user_id' => 2
+			))),
+			array('validate' => 'first')
+		);
+
+		$this->assertIdentical($result, true);
+
+		$result = $model->Comment->find('all');
+		$this->assertIdentical(count($result), 1);
+		$result = Set::extract('/Comment/article_id', $result);
+		$this->assertTrue($result[0] === 1 || $result[0] === '1');
+
+
+		$model->deleteAll(true);
+		$data = array(
+			'Article' => array(
+				'title' => 'Post with Author saveAlled from comment',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				'comment' => 'Only new comment', 'user_id' => 2
+		));
+
+		$result = $model->Comment->saveAll($data, array('validate' => 'first'));
+		$this->assertTrue($result);
+
+		$result = $model->find('all');
+		$this->assertEqual(
+			$result[0]['Article']['title'],
+			'Post with Author saveAlled from comment'
+		);
+		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
+	}
+/**
+ * testUpdateWithCalculation method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateWithCalculation() {
+		$this->loadFixtures('DataTest');
+		$model =& new DataTest();
+		$result = $model->saveAll(array(
+			array('count' => 5, 'float' => 1.1),
+			array('count' => 3, 'float' => 1.2),
+			array('count' => 4, 'float' => 1.3),
+			array('count' => 1, 'float' => 2.0),
+		));
+		$this->assertTrue($result);
+
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(5, 3, 4, 1));
+
+		$this->assertTrue($model->updateAll(array('count' => 'count + 2')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(7, 5, 6, 3));
+
+		$this->assertTrue($model->updateAll(array('DataTest.count' => 'DataTest.count - 1')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(6, 4, 5, 2));
+	}
+/**
+ * testSaveAllHasManyValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidationOnly() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1),
+					array(
+						'id' => 2,
+						'comment' =>
+						'comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('validate' => 'only')
+		);
+		$this->assertFalse($result);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 2,
+						'comment' => 'comment',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 3,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array(
+				'validate' => 'only',
+				'atomic' => false
+		));
+		$expected = array(
+			'Article' => true,
+			'Comment' => array(false, true, false)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('Comment' => array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$expected = array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 20e5b6ba1..419184d13 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Mock models file
  *
@@ -27,6 +28,7 @@
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
+
 /**
  * Test class
  *
@@ -34,6 +36,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Test extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -41,6 +44,7 @@ class Test extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -48,6 +52,7 @@ class Test extends CakeTestModel {
  * @access public
  */
 	var $name = 'Test';
+
 /**
  * schema property
  *
@@ -63,6 +68,7 @@ class Test extends CakeTestModel {
 		'updated'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
 }
+
 /**
  * TestAlias class
  *
@@ -70,6 +76,7 @@ class Test extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestAlias extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -77,6 +84,7 @@ class TestAlias extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -84,6 +92,7 @@ class TestAlias extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestAlias';
+
 /**
  * alias property
  *
@@ -91,6 +100,7 @@ class TestAlias extends CakeTestModel {
  * @access public
  */
 	var $alias = 'TestAlias';
+
 /**
  * schema property
  *
@@ -106,6 +116,7 @@ class TestAlias extends CakeTestModel {
 		'updated'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
 }
+
 /**
  * TestValidate class
  *
@@ -113,6 +124,7 @@ class TestAlias extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestValidate extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -120,6 +132,7 @@ class TestValidate extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -127,6 +140,7 @@ class TestValidate extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestValidate';
+
 /**
  * schema property
  *
@@ -141,6 +155,7 @@ class TestValidate extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'modified' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * validateNumber method
  *
@@ -154,6 +169,7 @@ class TestValidate extends CakeTestModel {
 		$valid = ($value['number'] >= $options['min'] && $value['number'] <= $options['max']);
 		return $valid;
 	}
+
 /**
  * validateTitle method
  *
@@ -165,6 +181,7 @@ class TestValidate extends CakeTestModel {
 		return (!empty($value) && strpos(low($value['title']), 'title-') === 0);
 	}
 }
+
 /**
  * User class
  *
@@ -172,6 +189,7 @@ class TestValidate extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class User extends CakeTestModel {
+
 /**
  * name property
  *
@@ -179,6 +197,7 @@ class User extends CakeTestModel {
  * @access public
  */
 	var $name = 'User';
+
 /**
  * validate property
  *
@@ -187,6 +206,7 @@ class User extends CakeTestModel {
  */
 	var $validate = array('user' => 'notEmpty', 'password' => 'notEmpty');
 }
+
 /**
  * Article class
  *
@@ -194,6 +214,7 @@ class User extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Article extends CakeTestModel {
+
 /**
  * name property
  *
@@ -201,6 +222,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $name = 'Article';
+
 /**
  * belongsTo property
  *
@@ -208,6 +230,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('User');
+
 /**
  * hasMany property
  *
@@ -215,6 +238,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Comment' => array('dependent' => true));
+
 /**
  * hasAndBelongsToMany property
  *
@@ -222,6 +246,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $hasAndBelongsToMany = array('Tag');
+
 /**
  * validate property
  *
@@ -229,6 +254,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $validate = array('user_id' => 'numeric', 'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'), 'body' => 'notEmpty');
+
 /**
  * beforeSaveReturn property
  *
@@ -236,6 +262,7 @@ class Article extends CakeTestModel {
  * @access public
  */
 	var $beforeSaveReturn = true;
+
 /**
  * beforeSave method
  *
@@ -245,6 +272,7 @@ class Article extends CakeTestModel {
 	function beforeSave() {
 		return $this->beforeSaveReturn;
 	}
+
 /**
  * titleDuplicate method
  *
@@ -259,6 +287,7 @@ class Article extends CakeTestModel {
 		return true;
 	}
 }
+
 /**
  * NumericArticle class
  *
@@ -266,6 +295,7 @@ class Article extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NumericArticle extends CakeTestModel {
+
 /**
  * name property
  *
@@ -273,6 +303,7 @@ class NumericArticle extends CakeTestModel {
  * @access public
  */
 	var $name = 'NumericArticle';
+
 /**
  * useTable property
  *
@@ -281,6 +312,7 @@ class NumericArticle extends CakeTestModel {
  */
 	var $useTable = 'numeric_articles';
 }
+
 /**
  * Article10 class
  *
@@ -288,6 +320,7 @@ class NumericArticle extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Article10 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -295,6 +328,7 @@ class Article10 extends CakeTestModel {
  * @access public
  */
 	var $name = 'Article10';
+
 /**
  * useTable property
  *
@@ -302,6 +336,7 @@ class Article10 extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'articles';
+
 /**
  * hasMany property
  *
@@ -310,6 +345,7 @@ class Article10 extends CakeTestModel {
  */
 	var $hasMany = array('Comment' => array('dependent' => true, 'exclusive' => true));
 }
+
 /**
  * ArticleFeatured class
  *
@@ -317,6 +353,7 @@ class Article10 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ArticleFeatured extends CakeTestModel {
+
 /**
  * name property
  *
@@ -324,6 +361,7 @@ class ArticleFeatured extends CakeTestModel {
  * @access public
  */
 	var $name = 'ArticleFeatured';
+
 /**
  * belongsTo property
  *
@@ -331,6 +369,7 @@ class ArticleFeatured extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('User', 'Category');
+
 /**
  * hasOne property
  *
@@ -338,6 +377,7 @@ class ArticleFeatured extends CakeTestModel {
  * @access public
  */
 	var $hasOne = array('Featured');
+
 /**
  * hasMany property
  *
@@ -345,6 +385,7 @@ class ArticleFeatured extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Comment' => array('className' => 'Comment', 'dependent' => true));
+
 /**
  * hasAndBelongsToMany property
  *
@@ -352,6 +393,7 @@ class ArticleFeatured extends CakeTestModel {
  * @access public
  */
 	var $hasAndBelongsToMany = array('Tag');
+
 /**
  * validate property
  *
@@ -360,6 +402,7 @@ class ArticleFeatured extends CakeTestModel {
  */
 	var $validate = array('user_id' => 'numeric', 'title' => 'notEmpty', 'body' => 'notEmpty');
 }
+
 /**
  * Featured class
  *
@@ -367,6 +410,7 @@ class ArticleFeatured extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Featured extends CakeTestModel {
+
 /**
  * name property
  *
@@ -374,6 +418,7 @@ class Featured extends CakeTestModel {
  * @access public
  */
 	var $name = 'Featured';
+
 /**
  * belongsTo property
  *
@@ -382,6 +427,7 @@ class Featured extends CakeTestModel {
  */
 	var $belongsTo = array('ArticleFeatured', 'Category');
 }
+
 /**
  * Tag class
  *
@@ -389,6 +435,7 @@ class Featured extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Tag extends CakeTestModel {
+
 /**
  * name property
  *
@@ -397,6 +444,7 @@ class Tag extends CakeTestModel {
  */
 	var $name = 'Tag';
 }
+
 /**
  * ArticlesTag class
  *
@@ -404,6 +452,7 @@ class Tag extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ArticlesTag extends CakeTestModel {
+
 /**
  * name property
  *
@@ -412,6 +461,7 @@ class ArticlesTag extends CakeTestModel {
  */
 	var $name = 'ArticlesTag';
 }
+
 /**
  * ArticleFeaturedsTag class
  *
@@ -419,6 +469,7 @@ class ArticlesTag extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ArticleFeaturedsTag extends CakeTestModel {
+
 /**
  * name property
  *
@@ -427,6 +478,7 @@ class ArticleFeaturedsTag extends CakeTestModel {
  */
 	var $name = 'ArticleFeaturedsTag';
 }
+
 /**
  * Comment class
  *
@@ -434,6 +486,7 @@ class ArticleFeaturedsTag extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Comment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -441,6 +494,7 @@ class Comment extends CakeTestModel {
  * @access public
  */
 	var $name = 'Comment';
+
 /**
  * belongsTo property
  *
@@ -448,6 +502,7 @@ class Comment extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Article', 'User');
+
 /**
  * hasOne property
  *
@@ -456,6 +511,7 @@ class Comment extends CakeTestModel {
  */
 	var $hasOne = array('Attachment' => array('dependent' => true));
 }
+
 /**
  * Modified Comment Class has afterFind Callback
  *
@@ -463,6 +519,7 @@ class Comment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModifiedComment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -470,6 +527,7 @@ class ModifiedComment extends CakeTestModel {
  * @access public
  */
 	var $name = 'Comment';
+
 /**
  * useTable property
  *
@@ -477,6 +535,7 @@ class ModifiedComment extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'comments';
+
 /**
  * belongsTo property
  *
@@ -484,6 +543,7 @@ class ModifiedComment extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Article');
+
 /**
  * afterFind callback
  *
@@ -504,6 +564,7 @@ class ModifiedComment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MergeVarPluginAppModel extends AppModel {
+
 /**
  * actsAs parameter
  *
@@ -513,6 +574,7 @@ class MergeVarPluginAppModel extends AppModel {
 		'Containable'
 	);
 }
+
 /**
  * MergeVarPluginPost class
  *
@@ -520,6 +582,7 @@ class MergeVarPluginAppModel extends AppModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MergeVarPluginPost extends MergeVarPluginAppModel {
+
 /**
  * actsAs parameter
  *
@@ -528,6 +591,7 @@ class MergeVarPluginPost extends MergeVarPluginAppModel {
 	var $actsAs = array(
 		'Tree'
 	);
+
 /**
  * useTable parameter
  *
@@ -535,6 +599,7 @@ class MergeVarPluginPost extends MergeVarPluginAppModel {
  */
 	var $useTable = 'posts';
 }
+
 /**
  * MergeVarPluginComment class
  *
@@ -542,6 +607,7 @@ class MergeVarPluginPost extends MergeVarPluginAppModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MergeVarPluginComment extends MergeVarPluginAppModel {
+
 /**
  * actsAs parameter
  *
@@ -550,6 +616,7 @@ class MergeVarPluginComment extends MergeVarPluginAppModel {
 	var $actsAs = array(
 		'Containable' => array('some_settings')
 	);
+
 /**
  * useTable parameter
  *
@@ -566,6 +633,7 @@ class MergeVarPluginComment extends MergeVarPluginAppModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Attachment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -574,6 +642,7 @@ class Attachment extends CakeTestModel {
  */
 	var $name = 'Attachment';
 }
+
 /**
  * Category class
  *
@@ -581,6 +650,7 @@ class Attachment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Category extends CakeTestModel {
+
 /**
  * name property
  *
@@ -589,6 +659,7 @@ class Category extends CakeTestModel {
  */
 	var $name = 'Category';
 }
+
 /**
  * CategoryThread class
  *
@@ -596,6 +667,7 @@ class Category extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class CategoryThread extends CakeTestModel {
+
 /**
  * name property
  *
@@ -603,6 +675,7 @@ class CategoryThread extends CakeTestModel {
  * @access public
  */
 	var $name = 'CategoryThread';
+
 /**
  * belongsTo property
  *
@@ -611,6 +684,7 @@ class CategoryThread extends CakeTestModel {
  */
 	var $belongsTo = array('ParentCategory' => array('className' => 'CategoryThread', 'foreignKey' => 'parent_id'));
 }
+
 /**
  * Apple class
  *
@@ -618,6 +692,7 @@ class CategoryThread extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Apple extends CakeTestModel {
+
 /**
  * name property
  *
@@ -625,6 +700,7 @@ class Apple extends CakeTestModel {
  * @access public
  */
 	var $name = 'Apple';
+
 /**
  * validate property
  *
@@ -632,6 +708,7 @@ class Apple extends CakeTestModel {
  * @access public
  */
 	var $validate = array('name' => 'notEmpty');
+
 /**
  * hasOne property
  *
@@ -639,6 +716,7 @@ class Apple extends CakeTestModel {
  * @access public
  */
 	var $hasOne = array('Sample');
+
 /**
  * hasMany property
  *
@@ -646,6 +724,7 @@ class Apple extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Child' => array('className' => 'Apple', 'dependent' => true));
+
 /**
  * belongsTo property
  *
@@ -654,6 +733,7 @@ class Apple extends CakeTestModel {
  */
 	var $belongsTo = array('Parent' => array('className' => 'Apple', 'foreignKey' => 'apple_id'));
 }
+
 /**
  * Sample class
  *
@@ -661,6 +741,7 @@ class Apple extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Sample extends CakeTestModel {
+
 /**
  * name property
  *
@@ -668,6 +749,7 @@ class Sample extends CakeTestModel {
  * @access public
  */
 	var $name = 'Sample';
+
 /**
  * belongsTo property
  *
@@ -676,6 +758,7 @@ class Sample extends CakeTestModel {
  */
 	var $belongsTo = 'Apple';
 }
+
 /**
  * AnotherArticle class
  *
@@ -683,6 +766,7 @@ class Sample extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class AnotherArticle extends CakeTestModel {
+
 /**
  * name property
  *
@@ -690,6 +774,7 @@ class AnotherArticle extends CakeTestModel {
  * @access public
  */
 	var $name = 'AnotherArticle';
+
 /**
  * hasMany property
  *
@@ -698,6 +783,7 @@ class AnotherArticle extends CakeTestModel {
  */
 	var $hasMany = 'Home';
 }
+
 /**
  * Advertisement class
  *
@@ -705,6 +791,7 @@ class AnotherArticle extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Advertisement extends CakeTestModel {
+
 /**
  * name property
  *
@@ -712,6 +799,7 @@ class Advertisement extends CakeTestModel {
  * @access public
  */
 	var $name = 'Advertisement';
+
 /**
  * hasMany property
  *
@@ -720,6 +808,7 @@ class Advertisement extends CakeTestModel {
  */
 	var $hasMany = 'Home';
 }
+
 /**
  * Home class
  *
@@ -727,6 +816,7 @@ class Advertisement extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Home extends CakeTestModel {
+
 /**
  * name property
  *
@@ -734,6 +824,7 @@ class Home extends CakeTestModel {
  * @access public
  */
 	var $name = 'Home';
+
 /**
  * belongsTo property
  *
@@ -742,6 +833,7 @@ class Home extends CakeTestModel {
  */
 	var $belongsTo = array('AnotherArticle', 'Advertisement');
 }
+
 /**
  * Post class
  *
@@ -749,6 +841,7 @@ class Home extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Post extends CakeTestModel {
+
 /**
  * name property
  *
@@ -756,6 +849,7 @@ class Post extends CakeTestModel {
  * @access public
  */
 	var $name = 'Post';
+
 /**
  * belongsTo property
  *
@@ -764,6 +858,7 @@ class Post extends CakeTestModel {
  */
 	var $belongsTo = array('Author');
 }
+
 /**
  * Author class
  *
@@ -771,6 +866,7 @@ class Post extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Author extends CakeTestModel {
+
 /**
  * name property
  *
@@ -778,6 +874,7 @@ class Author extends CakeTestModel {
  * @access public
  */
 	var $name = 'Author';
+
 /**
  * hasMany property
  *
@@ -785,6 +882,7 @@ class Author extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Post');
+
 /**
  * afterFind method
  *
@@ -797,6 +895,7 @@ class Author extends CakeTestModel {
 		return $results;
 	}
 }
+
 /**
  * ModifiedAuthor class
  *
@@ -804,6 +903,7 @@ class Author extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModifiedAuthor extends Author {
+
 /**
  * name property
  *
@@ -811,6 +911,7 @@ class ModifiedAuthor extends Author {
  * @access public
  */
 	var $name = 'Author';
+
 /**
  * afterFind method
  *
@@ -825,6 +926,7 @@ class ModifiedAuthor extends Author {
 		return $results;
 	}
 }
+
 /**
  * Project class
  *
@@ -832,6 +934,7 @@ class ModifiedAuthor extends Author {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Project extends CakeTestModel {
+
 /**
  * name property
  *
@@ -839,6 +942,7 @@ class Project extends CakeTestModel {
  * @access public
  */
 	var $name = 'Project';
+
 /**
  * hasMany property
  *
@@ -847,6 +951,7 @@ class Project extends CakeTestModel {
  */
 	var $hasMany = array('Thread');
 }
+
 /**
  * Thread class
  *
@@ -854,6 +959,7 @@ class Project extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Thread extends CakeTestModel {
+
 /**
  * name property
  *
@@ -861,6 +967,7 @@ class Thread extends CakeTestModel {
  * @access public
  */
 	var $name = 'Thread';
+
 /**
  * hasMany property
  *
@@ -868,6 +975,7 @@ class Thread extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Project');
+
 /**
  * hasMany property
  *
@@ -876,6 +984,7 @@ class Thread extends CakeTestModel {
  */
 	var $hasMany = array('Message');
 }
+
 /**
  * Message class
  *
@@ -883,6 +992,7 @@ class Thread extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Message extends CakeTestModel {
+
 /**
  * name property
  *
@@ -890,6 +1000,7 @@ class Message extends CakeTestModel {
  * @access public
  */
 	var $name = 'Message';
+
 /**
  * hasOne property
  *
@@ -898,6 +1009,7 @@ class Message extends CakeTestModel {
  */
 	var $hasOne = array('Bid');
 }
+
 /**
  * Bid class
  *
@@ -905,6 +1017,7 @@ class Message extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Bid extends CakeTestModel {
+
 /**
  * name property
  *
@@ -912,6 +1025,7 @@ class Bid extends CakeTestModel {
  * @access public
  */
 	var $name = 'Bid';
+
 /**
  * belongsTo property
  *
@@ -920,6 +1034,7 @@ class Bid extends CakeTestModel {
  */
 	var $belongsTo = array('Message');
 }
+
 /**
  * NodeAfterFind class
  *
@@ -927,6 +1042,7 @@ class Bid extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NodeAfterFind extends CakeTestModel {
+
 /**
  * name property
  *
@@ -934,6 +1050,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $name = 'NodeAfterFind';
+
 /**
  * validate property
  *
@@ -941,6 +1058,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $validate = array('name' => 'notEmpty');
+
 /**
  * useTable property
  *
@@ -948,6 +1066,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'apples';
+
 /**
  * hasOne property
  *
@@ -955,6 +1074,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $hasOne = array('Sample' => array('className' => 'NodeAfterFindSample'));
+
 /**
  * hasMany property
  *
@@ -962,6 +1082,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Child' => array('className' => 'NodeAfterFind', 'dependent' => true));
+
 /**
  * belongsTo property
  *
@@ -969,6 +1090,7 @@ class NodeAfterFind extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Parent' => array('className' => 'NodeAfterFind', 'foreignKey' => 'apple_id'));
+
 /**
  * afterFind method
  *
@@ -980,6 +1102,7 @@ class NodeAfterFind extends CakeTestModel {
 		return $results;
 	}
 }
+
 /**
  * NodeAfterFindSample class
  *
@@ -987,6 +1110,7 @@ class NodeAfterFind extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NodeAfterFindSample extends CakeTestModel {
+
 /**
  * name property
  *
@@ -994,6 +1118,7 @@ class NodeAfterFindSample extends CakeTestModel {
  * @access public
  */
 	var $name = 'NodeAfterFindSample';
+
 /**
  * useTable property
  *
@@ -1001,6 +1126,7 @@ class NodeAfterFindSample extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'samples';
+
 /**
  * belongsTo property
  *
@@ -1009,6 +1135,7 @@ class NodeAfterFindSample extends CakeTestModel {
  */
 	var $belongsTo = 'NodeAfterFind';
 }
+
 /**
  * NodeNoAfterFind class
  *
@@ -1016,6 +1143,7 @@ class NodeAfterFindSample extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NodeNoAfterFind extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1023,6 +1151,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @access public
  */
 	var $name = 'NodeAfterFind';
+
 /**
  * validate property
  *
@@ -1030,6 +1159,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @access public
  */
 	var $validate = array('name' => 'notEmpty');
+
 /**
  * useTable property
  *
@@ -1037,6 +1167,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'apples';
+
 /**
  * hasOne property
  *
@@ -1044,6 +1175,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @access public
  */
 	var $hasOne = array('Sample' => array('className' => 'NodeAfterFindSample'));
+
 /**
  * hasMany property
  *
@@ -1051,6 +1183,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @access public
  */
 	var $hasMany = array('Child' => array('className' => 'NodeAfterFind', 'dependent' => true));
+
 /**
  * belongsTo property
  *
@@ -1059,6 +1192,7 @@ class NodeNoAfterFind extends CakeTestModel {
  */
 	var $belongsTo = array('Parent' => array('className' => 'NodeAfterFind', 'foreignKey' => 'apple_id'));
 }
+
 /**
  * Node class
  *
@@ -1066,6 +1200,7 @@ class NodeNoAfterFind extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Node extends CakeTestModel{
+
 /**
  * name property
  *
@@ -1073,6 +1208,7 @@ class Node extends CakeTestModel{
  * @access public
  */
 	var $name = 'Node';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1089,6 +1225,7 @@ class Node extends CakeTestModel{
 		)
 	);
 }
+
 /**
  * Dependency class
  *
@@ -1096,6 +1233,7 @@ class Node extends CakeTestModel{
  * @subpackage    cake.tests.cases.libs.model
  */
 class Dependency extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1104,6 +1242,7 @@ class Dependency extends CakeTestModel {
  */
 	var $name = 'Dependency';
 }
+
 /**
  * ModelA class
  *
@@ -1111,6 +1250,7 @@ class Dependency extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModelA extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1118,6 +1258,7 @@ class ModelA extends CakeTestModel {
  * @access public
  */
 	var $name = 'ModelA';
+
 /**
  * useTable property
  *
@@ -1125,6 +1266,7 @@ class ModelA extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'apples';
+
 /**
  * hasMany property
  *
@@ -1133,6 +1275,7 @@ class ModelA extends CakeTestModel {
  */
 	var $hasMany = array('ModelB', 'ModelC');
 }
+
 /**
  * ModelB class
  *
@@ -1140,6 +1283,7 @@ class ModelA extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModelB extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1147,6 +1291,7 @@ class ModelB extends CakeTestModel {
  * @access public
  */
 	var $name = 'ModelB';
+
 /**
  * useTable property
  *
@@ -1154,6 +1299,7 @@ class ModelB extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'messages';
+
 /**
  * hasMany property
  *
@@ -1162,6 +1308,7 @@ class ModelB extends CakeTestModel {
  */
 	var $hasMany = array('ModelD');
 }
+
 /**
  * ModelC class
  *
@@ -1169,6 +1316,7 @@ class ModelB extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModelC extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1176,6 +1324,7 @@ class ModelC extends CakeTestModel {
  * @access public
  */
 	var $name = 'ModelC';
+
 /**
  * useTable property
  *
@@ -1183,6 +1332,7 @@ class ModelC extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'bids';
+
 /**
  * hasMany property
  *
@@ -1191,6 +1341,7 @@ class ModelC extends CakeTestModel {
  */
 	var $hasMany = array('ModelD');
 }
+
 /**
  * ModelD class
  *
@@ -1198,6 +1349,7 @@ class ModelC extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ModelD extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1205,6 +1357,7 @@ class ModelD extends CakeTestModel {
  * @access public
  */
 	var $name = 'ModelD';
+
 /**
  * useTable property
  *
@@ -1213,6 +1366,7 @@ class ModelD extends CakeTestModel {
  */
 	var $useTable = 'threads';
 }
+
 /**
  * Something class
  *
@@ -1220,6 +1374,7 @@ class ModelD extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Something extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1227,6 +1382,7 @@ class Something extends CakeTestModel {
  * @access public
  */
 	var $name = 'Something';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1235,6 +1391,7 @@ class Something extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('SomethingElse' => array('with' => array('JoinThing' => array('doomed'))));
 }
+
 /**
  * SomethingElse class
  *
@@ -1242,6 +1399,7 @@ class Something extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SomethingElse extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1249,6 +1407,7 @@ class SomethingElse extends CakeTestModel {
  * @access public
  */
 	var $name = 'SomethingElse';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1257,6 +1416,7 @@ class SomethingElse extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Something' => array('with' => 'JoinThing'));
 }
+
 /**
  * JoinThing class
  *
@@ -1264,6 +1424,7 @@ class SomethingElse extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class JoinThing extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1271,6 +1432,7 @@ class JoinThing extends CakeTestModel {
  * @access public
  */
 	var $name = 'JoinThing';
+
 /**
  * belongsTo property
  *
@@ -1279,6 +1441,7 @@ class JoinThing extends CakeTestModel {
  */
 	var $belongsTo = array('Something', 'SomethingElse');
 }
+
 /**
  * Portfolio class
  *
@@ -1286,6 +1449,7 @@ class JoinThing extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Portfolio extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1293,6 +1457,7 @@ class Portfolio extends CakeTestModel {
  * @access public
  */
 	var $name = 'Portfolio';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1301,6 +1466,7 @@ class Portfolio extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Item');
 }
+
 /**
  * Item class
  *
@@ -1308,6 +1474,7 @@ class Portfolio extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Item extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1315,6 +1482,7 @@ class Item extends CakeTestModel {
  * @access public
  */
 	var $name = 'Item';
+
 /**
  * belongsTo property
  *
@@ -1322,6 +1490,7 @@ class Item extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Syfile' => array('counterCache' => true));
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1330,6 +1499,7 @@ class Item extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Portfolio' => array('unique' => false));
 }
+
 /**
  * ItemsPortfolio class
  *
@@ -1337,6 +1507,7 @@ class Item extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ItemsPortfolio extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1345,6 +1516,7 @@ class ItemsPortfolio extends CakeTestModel {
  */
 	var $name = 'ItemsPortfolio';
 }
+
 /**
  * Syfile class
  *
@@ -1352,6 +1524,7 @@ class ItemsPortfolio extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Syfile extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1359,6 +1532,7 @@ class Syfile extends CakeTestModel {
  * @access public
  */
 	var $name = 'Syfile';
+
 /**
  * belongsTo property
  *
@@ -1367,6 +1541,7 @@ class Syfile extends CakeTestModel {
  */
 	var $belongsTo = array('Image');
 }
+
 /**
  * Image class
  *
@@ -1374,6 +1549,7 @@ class Syfile extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Image extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1382,6 +1558,7 @@ class Image extends CakeTestModel {
  */
 	var $name = 'Image';
 }
+
 /**
  * DeviceType class
  *
@@ -1389,6 +1566,7 @@ class Image extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class DeviceType extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1396,6 +1574,7 @@ class DeviceType extends CakeTestModel {
  * @access public
  */
 	var $name = 'DeviceType';
+
 /**
  * order property
  *
@@ -1403,6 +1582,7 @@ class DeviceType extends CakeTestModel {
  * @access public
  */
 	var $order = array('DeviceType.order' => 'ASC');
+
 /**
  * belongsTo property
  *
@@ -1414,6 +1594,7 @@ class DeviceType extends CakeTestModel {
 		'Image' => array('className' => 'Document'),
 		'Extra1' => array('className' => 'Document'),
 		'Extra2' => array('className' => 'Document'));
+
 /**
  * hasMany property
  *
@@ -1422,6 +1603,7 @@ class DeviceType extends CakeTestModel {
  */
 	var $hasMany = array('Device' => array('order' => array('Device.id' => 'ASC')));
 }
+
 /**
  * DeviceTypeCategory class
  *
@@ -1429,6 +1611,7 @@ class DeviceType extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class DeviceTypeCategory extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1437,6 +1620,7 @@ class DeviceTypeCategory extends CakeTestModel {
  */
 	var $name = 'DeviceTypeCategory';
 }
+
 /**
  * FeatureSet class
  *
@@ -1444,6 +1628,7 @@ class DeviceTypeCategory extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class FeatureSet extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1452,6 +1637,7 @@ class FeatureSet extends CakeTestModel {
  */
 	var $name = 'FeatureSet';
 }
+
 /**
  * ExteriorTypeCategory class
  *
@@ -1459,6 +1645,7 @@ class FeatureSet extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ExteriorTypeCategory extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1466,6 +1653,7 @@ class ExteriorTypeCategory extends CakeTestModel {
  * @access public
  */
 	var $name = 'ExteriorTypeCategory';
+
 /**
  * belongsTo property
  *
@@ -1474,6 +1662,7 @@ class ExteriorTypeCategory extends CakeTestModel {
  */
 	var $belongsTo = array('Image' => array('className' => 'Device'));
 }
+
 /**
  * Document class
  *
@@ -1481,6 +1670,7 @@ class ExteriorTypeCategory extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Document extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1488,6 +1678,7 @@ class Document extends CakeTestModel {
  * @access public
  */
 	var $name = 'Document';
+
 /**
  * belongsTo property
  *
@@ -1496,6 +1687,7 @@ class Document extends CakeTestModel {
  */
 	var $belongsTo = array('DocumentDirectory');
 }
+
 /**
  * Device class
  *
@@ -1503,6 +1695,7 @@ class Document extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Device extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1511,6 +1704,7 @@ class Device extends CakeTestModel {
  */
 	var $name = 'Device';
 }
+
 /**
  * DocumentDirectory class
  *
@@ -1518,6 +1712,7 @@ class Device extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class DocumentDirectory extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1526,6 +1721,7 @@ class DocumentDirectory extends CakeTestModel {
  */
 	var $name = 'DocumentDirectory';
 }
+
 /**
  * PrimaryModel class
  *
@@ -1533,6 +1729,7 @@ class DocumentDirectory extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class PrimaryModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1541,6 +1738,7 @@ class PrimaryModel extends CakeTestModel {
  */
 	var $name = 'PrimaryModel';
 }
+
 /**
  * SecondaryModel class
  *
@@ -1548,6 +1746,7 @@ class PrimaryModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class SecondaryModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1556,6 +1755,7 @@ class SecondaryModel extends CakeTestModel {
  */
 	var $name = 'SecondaryModel';
 }
+
 /**
  * JoinA class
  *
@@ -1563,6 +1763,7 @@ class SecondaryModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class JoinA extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1570,6 +1771,7 @@ class JoinA extends CakeTestModel {
  * @access public
  */
 	var $name = 'JoinA';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1578,6 +1780,7 @@ class JoinA extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('JoinB', 'JoinC');
 }
+
 /**
  * JoinB class
  *
@@ -1585,6 +1788,7 @@ class JoinA extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class JoinB extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1592,6 +1796,7 @@ class JoinB extends CakeTestModel {
  * @access public
  */
 	var $name = 'JoinB';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1600,6 +1805,7 @@ class JoinB extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('JoinA');
 }
+
 /**
  * JoinC class
  *
@@ -1607,6 +1813,7 @@ class JoinB extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class JoinC extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1614,6 +1821,7 @@ class JoinC extends CakeTestModel {
  * @access public
  */
 	var $name = 'JoinC';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1622,6 +1830,7 @@ class JoinC extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('JoinA');
 }
+
 /**
  * ThePaper class
  *
@@ -1629,6 +1838,7 @@ class JoinC extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ThePaper extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1636,6 +1846,7 @@ class ThePaper extends CakeTestModel {
  * @access public
  */
 	var $name = 'ThePaper';
+
 /**
  * useTable property
  *
@@ -1643,6 +1854,7 @@ class ThePaper extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'apples';
+
 /**
  * hasOne property
  *
@@ -1650,6 +1862,7 @@ class ThePaper extends CakeTestModel {
  * @access public
  */
 	var $hasOne = array('Itself' => array('className' => 'ThePaper', 'foreignKey' => 'apple_id'));
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1658,6 +1871,7 @@ class ThePaper extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Monkey' => array('joinTable' => 'the_paper_monkies', 'order' => 'id'));
 }
+
 /**
  * Monkey class
  *
@@ -1665,6 +1879,7 @@ class ThePaper extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Monkey extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1672,6 +1887,7 @@ class Monkey extends CakeTestModel {
  * @access public
  */
 	var $name = 'Monkey';
+
 /**
  * useTable property
  *
@@ -1680,6 +1896,7 @@ class Monkey extends CakeTestModel {
  */
 	var $useTable = 'devices';
 }
+
 /**
  * AssociationTest1 class
  *
@@ -1687,6 +1904,7 @@ class Monkey extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class AssociationTest1 extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -1694,6 +1912,7 @@ class AssociationTest1 extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'join_as';
+
 /**
  * name property
  *
@@ -1701,6 +1920,7 @@ class AssociationTest1 extends CakeTestModel {
  * @access public
  */
 	var $name = 'AssociationTest1';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1711,6 +1931,7 @@ class AssociationTest1 extends CakeTestModel {
 		'unique' => false, 'joinTable' => 'join_as_join_bs', 'foreignKey' => false
 	));
 }
+
 /**
  * AssociationTest2 class
  *
@@ -1718,6 +1939,7 @@ class AssociationTest1 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class AssociationTest2 extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -1725,6 +1947,7 @@ class AssociationTest2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'join_bs';
+
 /**
  * name property
  *
@@ -1732,6 +1955,7 @@ class AssociationTest2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'AssociationTest2';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -1742,6 +1966,7 @@ class AssociationTest2 extends CakeTestModel {
 		'unique' => false, 'joinTable' => 'join_as_join_bs'
 	));
 }
+
 /**
  * Callback class
  *
@@ -1751,6 +1976,7 @@ class AssociationTest2 extends CakeTestModel {
 class Callback extends CakeTestModel {
 	//
 }
+
 /**
  * Uuid class
  *
@@ -1758,6 +1984,7 @@ class Callback extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Uuid extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1766,6 +1993,7 @@ class Uuid extends CakeTestModel {
  */
 	var $name = 'Uuid';
 }
+
 /**
  * DataTest class
  *
@@ -1773,6 +2001,7 @@ class Uuid extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class DataTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1781,6 +2010,7 @@ class DataTest extends CakeTestModel {
  */
 	var $name = 'DataTest';
 }
+
 /**
  * TheVoid class
  *
@@ -1788,6 +2018,7 @@ class DataTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TheVoid extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1795,6 +2026,7 @@ class TheVoid extends CakeTestModel {
  * @access public
  */
 	var $name = 'TheVoid';
+
 /**
  * useTable property
  *
@@ -1803,6 +2035,7 @@ class TheVoid extends CakeTestModel {
  */
 	var $useTable = false;
 }
+
 /**
  * ValidationTest1 class
  *
@@ -1810,6 +2043,7 @@ class TheVoid extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ValidationTest1 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1817,6 +2051,7 @@ class ValidationTest1 extends CakeTestModel {
  * @access public
  */
 	var $name = 'ValidationTest1';
+
 /**
  * useTable property
  *
@@ -1824,6 +2059,7 @@ class ValidationTest1 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema property
  *
@@ -1831,6 +2067,7 @@ class ValidationTest1 extends CakeTestModel {
  * @access protected
  */
 	var $_schema = array();
+
 /**
  * validate property
  *
@@ -1846,6 +2083,7 @@ class ValidationTest1 extends CakeTestModel {
 			'/^[0-9A-Za-z \\.]{1,}$/s'
 		)
 	);
+
 /**
  * customValidationMethod method
  *
@@ -1856,6 +2094,7 @@ class ValidationTest1 extends CakeTestModel {
 	function customValidationMethod($data) {
 		return $data === 1;
 	}
+
 /**
  * Custom validator with parameters + default values
  *
@@ -1867,6 +2106,7 @@ class ValidationTest1 extends CakeTestModel {
 		unset($this->validatorParams['this']);
 		return true;
 	}
+
 /**
  * Custom validator with messaage
  *
@@ -1877,6 +2117,7 @@ class ValidationTest1 extends CakeTestModel {
 		return 'This field will *never* validate! Muhahaha!';
 	}
 }
+
 /**
  * ValidationTest2 class
  *
@@ -1884,6 +2125,7 @@ class ValidationTest1 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ValidationTest2 extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1891,6 +2133,7 @@ class ValidationTest2 extends CakeTestModel {
  * @access public
  */
 	var $name = 'ValidationTest2';
+
 /**
  * useTable property
  *
@@ -1898,6 +2141,7 @@ class ValidationTest2 extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * validate property
  *
@@ -1913,6 +2157,7 @@ class ValidationTest2 extends CakeTestModel {
 			'/^[0-9A-Za-z \\.]{1,}$/s'
 		)
 	);
+
 /**
  * customValidationMethod method
  *
@@ -1923,6 +2168,7 @@ class ValidationTest2 extends CakeTestModel {
 	function customValidationMethod($data) {
 		return $data === 1;
 	}
+
 /**
  * schema method
  *
@@ -1933,6 +2179,7 @@ class ValidationTest2 extends CakeTestModel {
 		return array();
 	}
 }
+
 /**
  * Person class
  *
@@ -1940,6 +2187,7 @@ class ValidationTest2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Person extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1947,6 +2195,7 @@ class Person extends CakeTestModel {
  * @access public
  */
 	var $name = 'Person';
+
 /**
  * belongsTo property
  *
@@ -1961,6 +2210,7 @@ class Person extends CakeTestModel {
 				'className' => 'Person',
 				'foreignKey' => 'father_id'));
 }
+
 /**
  * UnderscoreField class
  *
@@ -1968,6 +2218,7 @@ class Person extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class UnderscoreField extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1976,6 +2227,7 @@ class UnderscoreField extends CakeTestModel {
  */
 	var $name = 'UnderscoreField';
 }
+
 /**
  * Product class
  *
@@ -1983,6 +2235,7 @@ class UnderscoreField extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Product extends CakeTestModel {
+
 /**
  * name property
  *
@@ -1991,6 +2244,7 @@ class Product extends CakeTestModel {
  */
 	var $name = 'Product';
 }
+
 /**
  * Story class
  *
@@ -1998,6 +2252,7 @@ class Product extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Story extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2005,6 +2260,7 @@ class Story extends CakeTestModel {
  * @access public
  */
 	var $name = 'Story';
+
 /**
  * primaryKey property
  *
@@ -2012,6 +2268,7 @@ class Story extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'story';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -2019,6 +2276,7 @@ class Story extends CakeTestModel {
  * @access public
  */
 	var $hasAndBelongsToMany = array('Tag' => array('foreignKey' => 'story'));
+
 /**
  * validate property
  *
@@ -2027,6 +2285,7 @@ class Story extends CakeTestModel {
  */
 	var $validate = array('title' => 'notEmpty');
 }
+
 /**
  * Cd class
  *
@@ -2034,6 +2293,7 @@ class Story extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Cd extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2041,6 +2301,7 @@ class Cd extends CakeTestModel {
  * @access public
  */
 	var $name = 'Cd';
+
 /**
  * hasOne property
  *
@@ -2049,6 +2310,7 @@ class Cd extends CakeTestModel {
  */
 	var $hasOne = array('OverallFavorite' => array('foreignKey' => 'model_id', 'dependent' => true, 'conditions' => array('model_type' => 'Cd')));
 }
+
 /**
  * Book class
  *
@@ -2056,6 +2318,7 @@ class Cd extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Book extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2063,6 +2326,7 @@ class Book extends CakeTestModel {
  * @access public
  */
 	var $name = 'Book';
+
 /**
  * hasOne property
  *
@@ -2071,6 +2335,7 @@ class Book extends CakeTestModel {
  */
 	var $hasOne = array('OverallFavorite' => array('foreignKey' => 'model_id', 'dependent' => true, 'conditions' => array('model_type' => 'Book')));
 }
+
 /**
  * OverallFavorite class
  *
@@ -2078,6 +2343,7 @@ class Book extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class OverallFavorite extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2086,6 +2352,7 @@ class OverallFavorite extends CakeTestModel {
  */
 	var $name = 'OverallFavorite';
 }
+
 /**
  * MyUser class
  *
@@ -2093,6 +2360,7 @@ class OverallFavorite extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MyUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2100,6 +2368,7 @@ class MyUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'MyUser';
+
 /**
  * undocumented variable
  *
@@ -2108,6 +2377,7 @@ class MyUser extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('MyCategory');
 }
+
 /**
  * MyCategory class
  *
@@ -2115,6 +2385,7 @@ class MyUser extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MyCategory extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2122,6 +2393,7 @@ class MyCategory extends CakeTestModel {
  * @access public
  */
 	var $name = 'MyCategory';
+
 /**
  * undocumented variable
  *
@@ -2130,6 +2402,7 @@ class MyCategory extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('MyProduct', 'MyUser');
 }
+
 /**
  * MyProduct class
  *
@@ -2137,6 +2410,7 @@ class MyCategory extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MyProduct extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2144,6 +2418,7 @@ class MyProduct extends CakeTestModel {
  * @access public
  */
 	var $name = 'MyProduct';
+
 /**
  * undocumented variable
  *
@@ -2152,6 +2427,7 @@ class MyProduct extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('MyCategory');
 }
+
 /**
  * MyCategoriesMyUser class
  *
@@ -2159,6 +2435,7 @@ class MyProduct extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MyCategoriesMyUser extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2167,6 +2444,7 @@ class MyCategoriesMyUser extends CakeTestModel {
  */
 	var $name = 'MyCategoriesMyUser';
 }
+
 /**
  * MyCategoriesMyProduct class
  *
@@ -2174,6 +2452,7 @@ class MyCategoriesMyUser extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class MyCategoriesMyProduct extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2182,6 +2461,7 @@ class MyCategoriesMyProduct extends CakeTestModel {
  */
 	var $name = 'MyCategoriesMyProduct';
 }
+
 /**
  * I18nModel class
  *
@@ -2189,6 +2469,7 @@ class MyCategoriesMyProduct extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class I18nModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2196,6 +2477,7 @@ class I18nModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'I18nModel';
+
 /**
  * useTable property
  *
@@ -2203,6 +2485,7 @@ class I18nModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'i18n';
+
 /**
  * displayField property
  *
@@ -2211,6 +2494,7 @@ class I18nModel extends CakeTestModel {
  */
 	var $displayField = 'field';
 }
+
 /**
  * NumberTree class
  *
@@ -2218,6 +2502,7 @@ class I18nModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NumberTree extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2225,6 +2510,7 @@ class NumberTree extends CakeTestModel {
  * @access public
  */
 	var $name = 'NumberTree';
+
 /**
  * actsAs property
  *
@@ -2232,6 +2518,7 @@ class NumberTree extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Tree');
+
 /**
  * initialize method
  *
@@ -2274,6 +2561,7 @@ class NumberTree extends CakeTestModel {
 		}
 	}
 }
+
 /**
  * NumberTreeTwo class
  *
@@ -2281,6 +2569,7 @@ class NumberTree extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class NumberTreeTwo extends NumberTree {
+
 /**
  * name property
  *
@@ -2288,6 +2577,7 @@ class NumberTreeTwo extends NumberTree {
  * @access public
  */
 	var $name = 'NumberTreeTwo';
+
 /**
  * actsAs property
  *
@@ -2296,6 +2586,7 @@ class NumberTreeTwo extends NumberTree {
  */
 	var $actsAs = array();
 }
+
 /**
  * FlagTree class
  *
@@ -2303,6 +2594,7 @@ class NumberTreeTwo extends NumberTree {
  * @subpackage    cake.tests.cases.libs.model
  */
 class FlagTree extends NumberTree {
+
 /**
  * name property
  *
@@ -2311,6 +2603,7 @@ class FlagTree extends NumberTree {
  */
 	var $name = 'FlagTree';
 }
+
 /**
  * UnconventionalTree class
  *
@@ -2318,6 +2611,7 @@ class FlagTree extends NumberTree {
  * @subpackage    cake.tests.cases.libs.model
  */
 class UnconventionalTree extends NumberTree {
+
 /**
  * name property
  *
@@ -2333,6 +2627,7 @@ class UnconventionalTree extends NumberTree {
 		)
 	);
 }
+
 /**
  * UuidTree class
  *
@@ -2340,6 +2635,7 @@ class UnconventionalTree extends NumberTree {
  * @subpackage    cake.tests.cases.libs.model
  */
 class UuidTree extends NumberTree {
+
 /**
  * name property
  *
@@ -2356,6 +2652,7 @@ class UuidTree extends NumberTree {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Campaign extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2363,6 +2660,7 @@ class Campaign extends CakeTestModel {
  * @access public
  */
 	var $name = 'Campaign';
+
 /**
  * hasMany property
  *
@@ -2371,6 +2669,7 @@ class Campaign extends CakeTestModel {
  */
 	var $hasMany = array('Ad' => array('fields' => array('id','campaign_id','name')));
 }
+
 /**
  * Ad class
  *
@@ -2378,6 +2677,7 @@ class Campaign extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Ad extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2385,6 +2685,7 @@ class Ad extends CakeTestModel {
  * @access public
  */
 	var $name = 'Ad';
+
 /**
  * actsAs property
  *
@@ -2392,6 +2693,7 @@ class Ad extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Tree');
+
 /**
  * belongsTo property
  *
@@ -2400,6 +2702,7 @@ class Ad extends CakeTestModel {
  */
 	var $belongsTo = array('Campaign');
 }
+
 /**
  * AfterTree class
  *
@@ -2407,6 +2710,7 @@ class Ad extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class AfterTree extends NumberTree {
+
 /**
  * name property
  *
@@ -2414,6 +2718,7 @@ class AfterTree extends NumberTree {
  * @access public
  */
 	var $name = 'AfterTree';
+
 /**
  * actsAs property
  *
@@ -2428,6 +2733,7 @@ class AfterTree extends NumberTree {
 		}
 	}
 }
+
 /**
  * Nonconformant Content class
  *
@@ -2435,6 +2741,7 @@ class AfterTree extends NumberTree {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Content extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2442,6 +2749,7 @@ class Content extends CakeTestModel {
  * @access public
  */
 	var $name = 'Content';
+
 /**
  * useTable property
  *
@@ -2449,6 +2757,7 @@ class Content extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'Content';
+
 /**
  * primaryKey property
  *
@@ -2456,6 +2765,7 @@ class Content extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'iContentId';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -2464,6 +2774,7 @@ class Content extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Account' => array('className' => 'Account', 'with' => 'ContentAccount', 'joinTable' => 'ContentAccounts', 'foreignKey' => 'iContentId', 'associationForeignKey', 'iAccountId'));
 }
+
 /**
  * Nonconformant Account class
  *
@@ -2471,6 +2782,7 @@ class Content extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Account extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2478,6 +2790,7 @@ class Account extends CakeTestModel {
  * @access public
  */
 	var $name = 'Account';
+
 /**
  * useTable property
  *
@@ -2485,6 +2798,7 @@ class Account extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'Accounts';
+
 /**
  * primaryKey property
  *
@@ -2493,6 +2807,7 @@ class Account extends CakeTestModel {
  */
 	var $primaryKey = 'iAccountId';
 }
+
 /**
  * Nonconformant ContentAccount class
  *
@@ -2500,6 +2815,7 @@ class Account extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class ContentAccount extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2507,6 +2823,7 @@ class ContentAccount extends CakeTestModel {
  * @access public
  */
 	var $name = 'ContentAccount';
+
 /**
  * useTable property
  *
@@ -2514,6 +2831,7 @@ class ContentAccount extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'ContentAccounts';
+
 /**
  * primaryKey property
  *
@@ -2522,6 +2840,7 @@ class ContentAccount extends CakeTestModel {
  */
 	var $primaryKey = 'iContentAccountsId';
 }
+
 /**
  * FilmFile class
  *
@@ -2531,6 +2850,7 @@ class ContentAccount extends CakeTestModel {
 class FilmFile extends CakeTestModel {
 	var $name = 'FilmFile';
 }
+
 /**
  * Basket test model
  *
@@ -2550,6 +2870,7 @@ class Basket extends CakeTestModel {
 		)
 	);
 }
+
 /**
  * TestPluginArticle class
  *
@@ -2557,6 +2878,7 @@ class Basket extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestPluginArticle extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2564,6 +2886,7 @@ class TestPluginArticle extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestPluginArticle';
+
 /**
  * belongsTo property
  *
@@ -2571,6 +2894,7 @@ class TestPluginArticle extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('User');
+
 /**
  * hasMany property
  *
@@ -2585,6 +2909,7 @@ class TestPluginArticle extends CakeTestModel {
 		)
 	);
 }
+
 /**
  * TestPluginComment class
  *
@@ -2592,6 +2917,7 @@ class TestPluginArticle extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TestPluginComment extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2599,6 +2925,7 @@ class TestPluginComment extends CakeTestModel {
  * @access public
  */
 	var $name = 'TestPluginComment';
+
 /**
  * belongsTo property
  *
@@ -2613,6 +2940,7 @@ class TestPluginComment extends CakeTestModel {
 		'User'
 	);
 }
+
 /**
  * Uuidportfolio class
  *
@@ -2620,6 +2948,7 @@ class TestPluginComment extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Uuidportfolio extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2627,6 +2956,7 @@ class Uuidportfolio extends CakeTestModel {
  * @access public
  */
 	var $name = 'Uuidportfolio';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -2635,6 +2965,7 @@ class Uuidportfolio extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('Uuiditem');
 }
+
 /**
  * Uuiditem class
  *
@@ -2642,6 +2973,7 @@ class Uuidportfolio extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Uuiditem extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2649,6 +2981,7 @@ class Uuiditem extends CakeTestModel {
  * @access public
  */
 	var $name = 'Uuiditem';
+
 /**
  * hasAndBelongsToMany property
  *
@@ -2660,6 +2993,7 @@ class Uuiditem extends CakeTestModel {
 	var $hasAndBelongsToMany = array('Uuidportfolio' => array('with' => 'UuiditemsUuidportfolioNumericid'));
 
 }
+
 /**
  * UuiditemsPortfolio class
  *
@@ -2667,6 +3001,7 @@ class Uuiditem extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class UuiditemsUuidportfolio extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2675,6 +3010,7 @@ class UuiditemsUuidportfolio extends CakeTestModel {
  */
 	var $name = 'UuiditemsUuidportfolio';
 }
+
 /**
  * UuiditemsPortfolioNumericid class
  *
@@ -2682,6 +3018,7 @@ class UuiditemsUuidportfolio extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class UuiditemsUuidportfolioNumericid extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2690,6 +3027,7 @@ class UuiditemsUuidportfolioNumericid extends CakeTestModel {
  */
 	var $name = 'UuiditemsUuidportfolioNumericid';
 }
+
 /**
  * TranslateTestModel class.
  *
@@ -2697,6 +3035,7 @@ class UuiditemsUuidportfolioNumericid extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TranslateTestModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2704,6 +3043,7 @@ class TranslateTestModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'TranslateTestModel';
+
 /**
  * useTable property
  *
@@ -2711,6 +3051,7 @@ class TranslateTestModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'i18n';
+
 /**
  * displayField property
  *
@@ -2719,6 +3060,7 @@ class TranslateTestModel extends CakeTestModel {
  */
 	var $displayField = 'field';
 }
+
 /**
  * TranslatedItem class.
  *
@@ -2726,6 +3068,7 @@ class TranslateTestModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TranslatedItem extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2733,6 +3076,7 @@ class TranslatedItem extends CakeTestModel {
  * @access public
  */
 	var $name = 'TranslatedItem';
+
 /**
  * cacheQueries property
  *
@@ -2740,6 +3084,7 @@ class TranslatedItem extends CakeTestModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * actsAs property
  *
@@ -2747,6 +3092,7 @@ class TranslatedItem extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Translate' => array('content', 'title'));
+
 /**
  * translateModel property
  *
@@ -2755,6 +3101,7 @@ class TranslatedItem extends CakeTestModel {
  */
 	var $translateModel = 'TranslateTestModel';
 }
+
 /**
  * TranslatedItemWithTable class.
  *
@@ -2762,6 +3109,7 @@ class TranslatedItem extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TranslatedItemWithTable extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2769,6 +3117,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @access public
  */
 	var $name = 'TranslatedItemWithTable';
+
 /**
  * useTable property
  *
@@ -2776,6 +3125,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'translated_items';
+
 /**
  * cacheQueries property
  *
@@ -2783,6 +3133,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * actsAs property
  *
@@ -2790,6 +3141,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Translate' => array('content', 'title'));
+
 /**
  * translateModel property
  *
@@ -2797,6 +3149,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @access public
  */
 	var $translateModel = 'TranslateTestModel';
+
 /**
  * translateTable property
  *
@@ -2805,6 +3158,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  */
 	var $translateTable = 'another_i18n';
 }
+
 /**
  * TranslateArticleModel class.
  *
@@ -2812,6 +3166,7 @@ class TranslatedItemWithTable extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TranslateArticleModel extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2819,6 +3174,7 @@ class TranslateArticleModel extends CakeTestModel {
  * @access public
  */
 	var $name = 'TranslateArticleModel';
+
 /**
  * useTable property
  *
@@ -2826,6 +3182,7 @@ class TranslateArticleModel extends CakeTestModel {
  * @access public
  */
 	var $useTable = 'article_i18n';
+
 /**
  * displayField property
  *
@@ -2834,6 +3191,7 @@ class TranslateArticleModel extends CakeTestModel {
  */
 	var $displayField = 'field';
 }
+
 /**
  * TranslatedArticle class.
  *
@@ -2841,6 +3199,7 @@ class TranslateArticleModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class TranslatedArticle extends CakeTestModel {
+
 /**
  * name property
  *
@@ -2848,6 +3207,7 @@ class TranslatedArticle extends CakeTestModel {
  * @access public
  */
 	var $name = 'TranslatedArticle';
+
 /**
  * cacheQueries property
  *
@@ -2855,6 +3215,7 @@ class TranslatedArticle extends CakeTestModel {
  * @access public
  */
 	var $cacheQueries = false;
+
 /**
  * actsAs property
  *
@@ -2862,6 +3223,7 @@ class TranslatedArticle extends CakeTestModel {
  * @access public
  */
 	var $actsAs = array('Translate' => array('title', 'body'));
+
 /**
  * translateModel property
  *
@@ -2869,6 +3231,7 @@ class TranslatedArticle extends CakeTestModel {
  * @access public
  */
 	var $translateModel = 'TranslateArticleModel';
+
 /**
  * belongsTo property
  *
diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index 68950cc78..44f59d41b 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * MultibyteTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Multibyte');
+
 /**
  * MultibyteTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Multibyte');
  * @subpackage    cake.tests.cases.libs
  */
 class MultibyteTest extends CakeTestCase {
+
 /**
  * testUtf8 method
  *
@@ -355,6 +358,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = array(64256, 64257, 64258, 64259, 64260, 64261, 64262, 64275, 64276, 64277, 64278, 64279);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testAscii method
  *
@@ -675,6 +679,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStripos method
  *
@@ -922,6 +927,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStripos method
  *
@@ -1169,6 +1175,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStristr method
  *
@@ -1559,6 +1566,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStristr method
  *
@@ -1949,6 +1957,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrlen method
  *
@@ -2096,6 +2105,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = 6;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrlen method
  *
@@ -2243,6 +2253,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = 6;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrpos method
  *
@@ -2490,6 +2501,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrpos method
  *
@@ -2737,6 +2749,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrrchr method
  *
@@ -3121,6 +3134,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrrchr method
  *
@@ -3505,6 +3519,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrrichr method
  *
@@ -3889,6 +3904,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrrichr method
  *
@@ -4273,6 +4289,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrripos method
  *
@@ -4526,6 +4543,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrripos method
  *
@@ -4779,6 +4797,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrrpos method
  *
@@ -5032,6 +5051,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrrpos method
  *
@@ -5285,6 +5305,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrstr method
  *
@@ -5681,6 +5702,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrstr method
  *
@@ -6077,6 +6099,7 @@ class MultibyteTest extends CakeTestCase {
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrtolower method
  *
@@ -6603,6 +6626,7 @@ class MultibyteTest extends CakeTestCase {
 		$result = mb_strtolower($string);
 		$expected = 'ωkå';
 		$this->assertEqual($result, $expected);
+
 /*
 mb_strtolower does not work for these strings.
 
@@ -6631,6 +6655,7 @@ mb_strtolower does not work for these strings.
 		$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrtolower method
  *
@@ -7188,6 +7213,7 @@ mb_strtolower does not work for these strings.
 		$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbStrtoupper method
  *
@@ -7704,6 +7730,7 @@ mb_strtolower does not work for these strings.
 		$result = mb_strtoupper($string);
 		$expected = 'ΩKÅ';
 		$this->assertEqual($result, $expected);
+
 /*
 mb_strtoupper does not work for these strings.
 
@@ -7732,6 +7759,7 @@ mb_strtoupper does not work for these strings.
 		$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteStrtoupper method
  *
@@ -8284,6 +8312,7 @@ mb_strtoupper does not work for these strings.
 		$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbSubstrCount method
  *
@@ -8537,6 +8566,7 @@ mb_strtoupper does not work for these strings.
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteSubstrCount method
  *
@@ -8790,6 +8820,7 @@ mb_strtoupper does not work for these strings.
 		$expected = false;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUsingMbSubstr method
  *
@@ -8948,6 +8979,7 @@ mb_strtoupper does not work for these strings.
 		$expected = '一二三周永龍';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteSubstr method
  *
@@ -9106,6 +9138,7 @@ mb_strtoupper does not work for these strings.
 		$expected = '一二三周永龍';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultibyteSubstr method
  *
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 8ed9adec3..3b97003db 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ObjectTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', array('Object', 'Controller', 'Model'));
+
 /**
  * RequestActionPost class
  *
@@ -32,6 +34,7 @@ App::import('Core', array('Object', 'Controller', 'Model'));
  * @subpackage    cake.tests.cases.libs.object
  */
 class RequestActionPost extends CakeTestModel {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class RequestActionPost extends CakeTestModel {
  * @access public
  */
 	var $name = 'RequestActionPost';
+
 /**
  * useTable property
  *
@@ -47,6 +51,7 @@ class RequestActionPost extends CakeTestModel {
  */
 	var $useTable = 'posts';
 }
+
 /**
  * RequestActionController class
  *
@@ -54,6 +59,7 @@ class RequestActionPost extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class RequestActionController extends Controller {
+
 /**
 * uses property
 *
@@ -61,6 +67,7 @@ class RequestActionController extends Controller {
 * @access public
 */
 	var $uses = array('RequestActionPost');
+
 /**
 * test_request_action method
 *
@@ -70,6 +77,7 @@ class RequestActionController extends Controller {
 	function test_request_action() {
 		return 'This is a test';
 	}
+
 /**
 * another_ra_test method
 *
@@ -81,6 +89,7 @@ class RequestActionController extends Controller {
 	function another_ra_test($id, $other) {
 		return $id + $other;
 	}
+
 /**
  * normal_request_action method
  *
@@ -90,6 +99,7 @@ class RequestActionController extends Controller {
 	function normal_request_action() {
 		return 'Hello World';
 	}
+
 /**
  * paginate_request_action method
  *
@@ -100,6 +110,7 @@ class RequestActionController extends Controller {
 		$data = $this->paginate();
 		return true;
 	}
+
 /**
  * post pass, testing post passing
  *
@@ -108,6 +119,7 @@ class RequestActionController extends Controller {
 	function post_pass() {
 		return $this->data;
 	}
+
 /**
  * test param passing and parsing.
  *
@@ -117,6 +129,7 @@ class RequestActionController extends Controller {
 		return $this->params;
 	}
 }
+
 /**
  * RequestActionPersistentController class
  *
@@ -124,6 +137,7 @@ class RequestActionController extends Controller {
  * @subpackage    cake.tests.cases.libs
  */
 class RequestActionPersistentController extends Controller {
+
 /**
 * uses property
 *
@@ -139,6 +153,7 @@ class RequestActionPersistentController extends Controller {
 * @access public
 */
 	var $persistModel = true;
+
 /**
  * post pass, testing post passing
  *
@@ -148,6 +163,7 @@ class RequestActionPersistentController extends Controller {
 		return 'This is a test';
 	}
 }
+
 /**
  * TestObject class
  *
@@ -155,6 +171,7 @@ class RequestActionPersistentController extends Controller {
  * @subpackage    cake.tests.cases.libs
  */
 class TestObject extends Object {
+
 /**
  * firstName property
  *
@@ -162,6 +179,7 @@ class TestObject extends Object {
  * @access public
  */
 	var $firstName = 'Joel';
+
 /**
  * lastName property
  *
@@ -169,6 +187,7 @@ class TestObject extends Object {
  * @access public
  */
 	var $lastName = 'Moss';
+
 /**
  * methodCalls property
  *
@@ -176,6 +195,7 @@ class TestObject extends Object {
  * @access public
  */
 	var $methodCalls = array();
+
 /**
  * emptyMethod method
  *
@@ -185,6 +205,7 @@ class TestObject extends Object {
 	function emptyMethod() {
 		$this->methodCalls[] = 'emptyMethod';
 	}
+
 /**
  * oneParamMethod method
  *
@@ -195,6 +216,7 @@ class TestObject extends Object {
 	function oneParamMethod($param) {
 		$this->methodCalls[] = array('oneParamMethod' => array($param));
 	}
+
 /**
  * twoParamMethod method
  *
@@ -206,6 +228,7 @@ class TestObject extends Object {
 	function twoParamMethod($param, $param2) {
 		$this->methodCalls[] = array('twoParamMethod' => array($param, $param2));
 	}
+
 /**
  * threeParamMethod method
  *
@@ -245,6 +268,7 @@ class TestObject extends Object {
 	function fiveParamMethod($param, $param2, $param3, $param4, $param5) {
 		$this->methodCalls[] = array('fiveParamMethod' => array($param, $param2, $param3, $param4, $param5));
 	}
+
 /**
  * crazyMethod method
  *
@@ -261,6 +285,7 @@ class TestObject extends Object {
 	function crazyMethod($param, $param2, $param3, $param4, $param5, $param6, $param7 = null) {
 		$this->methodCalls[] = array('crazyMethod' => array($param, $param2, $param3, $param4, $param5, $param6, $param7));
 	}
+
 /**
  * methodWithOptionalParam method
  *
@@ -271,6 +296,7 @@ class TestObject extends Object {
 	function methodWithOptionalParam($param = null) {
 		$this->methodCalls[] = array('methodWithOptionalParam' => array($param));
 	}
+
 /**
  * testPersist
  *
@@ -280,6 +306,7 @@ class TestObject extends Object {
 		return $this->_persist($name, $return, $object, $type);
 	}
 }
+
 /**
  * ObjectTestModel class
  *
@@ -290,6 +317,7 @@ class ObjectTestModel extends CakeTestModel {
 	var $useTable = false;
 	var $name = 'ObjectTestModel';
 }
+
 /**
  * Object Test class
  *
@@ -297,12 +325,14 @@ class ObjectTestModel extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class ObjectTest extends CakeTestCase {
+
 /**
  * fixtures
  *
  * @var string
  **/
 	var $fixtures = array('core.post', 'core.comment');
+
 /**
  * setUp method
  *
@@ -312,6 +342,7 @@ class ObjectTest extends CakeTestCase {
 	function setUp() {
 		$this->object = new TestObject();
 	}
+
 /**
  * tearDown method
  *
@@ -321,6 +352,7 @@ class ObjectTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->object);
 	}
+
 /**
  * endTest
  *
@@ -330,6 +362,7 @@ class ObjectTest extends CakeTestCase {
 	function endTest() {
 		App::build();
 	}
+
 /**
  * testLog method
  *
@@ -359,6 +392,7 @@ class ObjectTest extends CakeTestCase {
 		$this->assertPattern('/^\)$/', $result[4]);
 		unlink(LOGS . 'error.log');
 	}
+
 /**
  * testSet method
  *
@@ -379,6 +413,7 @@ class ObjectTest extends CakeTestCase {
 		$this->assertEqual($this->object->firstName, 'Joel');
 		$this->assertEqual($this->object->lastName, 'Moose');
 	}
+
 /**
  * testPersist method
  *
@@ -421,6 +456,7 @@ class ObjectTest extends CakeTestCase {
 
 		Configure::write('Cache.disable', $cacheDisable);
 	}
+
 /**
  * testPersistWithRequestAction method
  *
@@ -466,6 +502,7 @@ class ObjectTest extends CakeTestCase {
 		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
 		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
 	}
+
 /**
  * testPersistWithBehaviorAndRequestAction method
  *
@@ -523,6 +560,7 @@ class ObjectTest extends CakeTestCase {
 
 		Configure::write('Cache.disable', $cacheDisable);
 	}
+
 /**
  * testToString method
  *
@@ -533,6 +571,7 @@ class ObjectTest extends CakeTestCase {
 		$result = strtolower($this->object->toString());
 		$this->assertEqual($result, 'testobject');
 	}
+
 /**
  * testMethodDispatching method
  *
@@ -599,6 +638,7 @@ class ObjectTest extends CakeTestCase {
 		$expected[] = array('methodWithOptionalParam' => array(null));
 		$this->assertIdentical($this->object->methodCalls, $expected);
 	}
+
 /**
  * testRequestAction method
  *
@@ -685,6 +725,7 @@ class ObjectTest extends CakeTestCase {
 		$result = $this->object->requestAction(array('controller'=>'request_action', 'action'=>'paginate_request_action'), array('pass' => array(5), 'named' => array('param' => 'value')));
 		$this->assertTrue($result);
 	}
+
 /**
  * Test that requestAction() is populating $this->params properly
  *
@@ -707,6 +748,7 @@ class ObjectTest extends CakeTestCase {
 		$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'params_pass'), array('named' => array('sort' => 'desc', 'limit' => 5)));
 		$this->assertEqual($result['named'], $expected);
 	}
+
 /**
  * test requestAction and POST parameter passing, and not passing when url is an array.
  *
@@ -733,6 +775,7 @@ class ObjectTest extends CakeTestCase {
 
 		$_POST = $_tmp;
 	}
+
 /**
  * testCakeError
  *
diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php
index ed06e8cc7..48a330e60 100644
--- a/cake/tests/cases/libs/overloadable.test.php
+++ b/cake/tests/cases/libs/overloadable.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * OverloadableTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Overloadable');
+
 /**
  * OverloadableTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Overloadable');
  * @subpackage    cake.tests.cases.libs
  */
 class OverloadableTest extends CakeTestCase {
+
 /**
  * skip method
  *
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index f57c91d9c..7780a4448 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * RouterTest file
  *
@@ -29,6 +30,7 @@ App::import('Core', array('Router', 'Debugger'));
 if (!defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');
 }
+
 /**
  * RouterTest class
  *
@@ -36,6 +38,7 @@ if (!defined('FULL_BASE_URL')) {
  * @subpackage    cake.tests.cases.libs
  */
 class RouterTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -47,6 +50,7 @@ class RouterTest extends CakeTestCase {
 		Router::reload();
 		$this->router =& Router::getInstance();
 	}
+
 /**
  * testReturnedInstanceReference method
  *
@@ -58,6 +62,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertIdentical($this->router, Router::getInstance());
 		unset($this->router->testVar);
 	}
+
 /**
  * testFullBaseURL method
  *
@@ -68,6 +73,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertPattern('/^http(s)?:\/\//', Router::url('/', true));
 		$this->assertPattern('/^http(s)?:\/\//', Router::url(null, true));
 	}
+
 /**
  * testRouteWriting method
  *
@@ -137,6 +143,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($this->router->routes[0][2], array('id', 'title', 'year'));
 		$this->assertEqual($this->router->routes[0][1], '#^/posts(?:/([^\/]+))?(?:\\:([^\/]+))?(?:/([^\/]+))?[\/]*$#');
 	}
+
 /**
  * testRouteDefaultParams method
  *
@@ -147,6 +154,7 @@ class RouterTest extends CakeTestCase {
 		Router::connect('/:controller', array('controller' => 'posts'));
 		$this->assertEqual(Router::url(array('action' => 'index')), '/');
 	}
+
 /**
  * testRouterIdentity method
  *
@@ -157,6 +165,7 @@ class RouterTest extends CakeTestCase {
 		$router2 = new Router();
 		$this->assertEqual(get_object_vars($this->router), get_object_vars($router2));
 	}
+
 /**
  * testResourceRoutes method
  *
@@ -213,6 +222,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, array('pass' => array('name'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'edit', 'id' => 'name', '[method]' => 'PUT'));
 		$this->assertEqual($this->router->__resourceMapped, array('posts'));
 	}
+
 /**
  * testMultipleResourceRoute method
  *
@@ -230,6 +240,7 @@ class RouterTest extends CakeTestCase {
 		$result = Router::parse('/posts');
 		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'index', '[method]' => array('GET', 'POST')));
 	}
+
 /**
  * testGenerateUrlResourceRoute method
  *
@@ -263,6 +274,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/posts/10';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUrlNormalization method
  *
@@ -299,7 +311,7 @@ class RouterTest extends CakeTestCase {
 		$result = Router::normalize('/recipe/recipes/add');
 		$this->assertEqual($result, '/recipe/recipes/add');
 
-		Router::setRequestInfo(array(array(), array('base' => 'us')));
+		Router::setRequestInfo(array(array(), array('base' => '/us')));
 		$result = Router::normalize('/us/users/logout/');
 		$this->assertEqual($result, '/users/logout');
 
@@ -309,7 +321,24 @@ class RouterTest extends CakeTestCase {
 		$result = Router::normalize('/cake_12/users/logout/');
 		$this->assertEqual($result, '/users/logout');
 
+		Router::reload();
+		$_back = Configure::read('App.baseUrl');
+		Configure::write('App.baseUrl', '/');
+
+		Router::setRequestInfo(array(array(), array('base' => '/')));
+		$result = Router::normalize('users/login');
+		$this->assertEqual($result, '/users/login');
+		Configure::write('App.baseUrl', $_back);
+
+		Router::reload();
+		Router::setRequestInfo(array(array(), array('base' => 'beer')));
+		$result = Router::normalize('beer/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
+
+		$result = Router::normalize('/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
 	}
+
 /**
  * testUrlGeneration method
  *
@@ -678,6 +707,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/admin/shows/show_tickets/edit/6';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUrlGenerationWithPrefix method
  *
@@ -705,6 +735,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/admin/registrations/index/page:2';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUrlGenerationWithExtensions method
  *
@@ -729,6 +760,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/articles.json';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testPluginUrlGeneration method
  *
@@ -771,6 +803,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/en/shows/page:1';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUrlParsing method
  *
@@ -918,6 +951,7 @@ class RouterTest extends CakeTestCase {
 		$result = Router::url(array('controller' => 'pages', 'action' => 'view', 'about'));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUuidRoutes method
  *
@@ -934,6 +968,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array(), 'named' => array(), 'category_id' => '4795d601-19c8-49a6-930e-06a8b01d17b7', 'plugin' => null, 'controller' => 'subjects', 'action' => 'add');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRouteSymmetry method
  *
@@ -972,6 +1007,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/some_extra/page/this_is_the_slug';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testAdminRouting method
  *
@@ -1036,7 +1072,30 @@ class RouterTest extends CakeTestCase {
 		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
 		$expected = '/beheer/posts/index/0?var=test&var2=test2';
 		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.admin', 'admin');
+		$paths = Configure::read('pluginPaths');
+		Configure::write('pluginPaths', array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+		));
+		Configure::write('__objects.plugin', array('test_plugin'));
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'action',
+				'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(),
+				'argSeparator' => ':', 'namedArgs' => array())
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index'));
+		$expected = '/admin/test_plugin';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('pluginPaths', $paths);
 	}
+
 /**
  * testExtensionParsingSetting method
  *
@@ -1050,6 +1109,7 @@ class RouterTest extends CakeTestCase {
 		$router->parseExtensions();
 		$this->assertTrue($this->router->__parseExtensions);
 	}
+
 /**
  * testExtensionParsing method
  *
@@ -1097,6 +1157,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'url' => array('ext' => 'rss'), 'named' => array(), 'pass' => array());
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testQuerystringGeneration method
  *
@@ -1126,6 +1187,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/posts/index/0?var=test&amp;var2=test2';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testConnectNamed method
  *
@@ -1157,6 +1219,7 @@ class RouterTest extends CakeTestCase {
 		$result = Router::parse('/categories/index?limit=5');
 		$this->assertTrue(empty($result['named']));
 	}
+
 /**
  * testNamedArgsUrlGeneration method
  *
@@ -1210,6 +1273,7 @@ class RouterTest extends CakeTestCase {
 		$expected = "/admin/controller/index/type:new";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testNamedArgsUrlParsing method
  *
@@ -1276,6 +1340,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array('param2:value2:3', 'param3:value'), 'named' => array('param1' => 'value1:1'), 'controller' => 'bar', 'action' => 'fubar', 'plugin' => null);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testUrlGenerationWithPrefixes method
  *
@@ -1328,16 +1393,17 @@ class RouterTest extends CakeTestCase {
 		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true));
 		$expected = '/protected/others/edit/1';
 		$this->assertEqual($result, $expected);
-		
+
 		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
 		$expected = '/protected/others/edit/1/page:1';
 		$this->assertEqual($result, $expected);
-		
+
 		Router::connectNamed(array('random'));
 		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
 		$expected = '/protected/others/edit/1/random:my-value';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRemoveBase method
  *
@@ -1362,6 +1428,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/base/my_controller/my_action/base:1';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testParamsUrlParsing method
  *
@@ -1390,6 +1457,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array(), 'named' => array(), 'controller' => 'bob-p-500', 'plugin' => null, 'action' => 'index');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testPagesUrlParsing method
  *
@@ -1451,6 +1519,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass'=>array('contact'), 'named' => array(), 'plugin'=> null, 'controller'=>'pages', 'action'=>'display');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testParsingWithPrefixes method
  *
@@ -1511,6 +1580,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'index');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Tests URL generation with flags and prefixes in and out of context
  *
@@ -1534,6 +1604,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/login';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testPassedArgsOrder method
  *
@@ -1576,6 +1647,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('protected', 'admin');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRegexRouteMatching method
  *
@@ -1617,5 +1689,90 @@ class RouterTest extends CakeTestCase {
 		$expected = '/test/test_another_action/locale:badness';
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * testStripPlugin
+ *
+ * @return void
+ * @access public
+ */
+	function testStripPlugin() {
+		$pluginName = 'forums';
+		$url = 'example.com/' . $pluginName . '/';
+		$expected = 'example.com';
+
+		$this->assertEqual(Router::stripPlugin($url, $pluginName), $expected);
+		$this->assertEqual(Router::stripPlugin($url), $url);
+		$this->assertEqual(Router::stripPlugin($url, null), $url);
+	}
+/**
+ * testCurentRoute
+ *
+ * This test needs some improvement and actual requestAction() usage
+ * 
+ * @return void
+ * @access public
+ */
+	function testCurentRoute() {
+		$url = array('controller' => 'pages', 'action' => 'display', 'government');
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::currentRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+	}
+/**
+ * testRequestRoute
+ *
+ * @return void
+ * @access public
+ */
+	function testRequestRoute() {
+		$url = array('controller' => 'products', 'action' => 'display', 5);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+
+		// test that the first route is matched
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+
+		// test that an unmatched route does not change the current route
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/actor', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+	}
+/**
+ * testGetParams
+ *
+ * @return void
+ * @access public
+ */
+	function testGetParams() {
+		$paths = array('base' => '/', 'here' => '/products/display/5', 'webroot' => '/webroot');
+		$params = array('param1' => '1', 'param2' => '2');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array(
+			'plugin' => false, 'controller' => false, 'action' => false,
+			'param1' => '1', 'param2' => '2'
+		);
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparam('controller'), false);
+		$this->assertEqual(Router::getparam('param1'), '1');
+		$this->assertEqual(Router::getparam('param2'), '2');
+
+		Router::reload();
+
+		$params = array('controller' => 'pages', 'action' => 'display');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array('plugin' => false, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparams(true), $expected);
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index e564f9a92..32d15a68e 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SanitizeTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Sanitize');
+
 /**
  * DataTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Sanitize');
  * @subpackage    cake.tests.cases.libs
  */
 class SanitizeDataTest extends CakeTestModel {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class SanitizeDataTest extends CakeTestModel {
  * @access public
  */
 	var $name = 'SanitizeDataTest';
+
 /**
  * useTable property
  *
@@ -47,6 +51,7 @@ class SanitizeDataTest extends CakeTestModel {
  */
 	var $useTable = 'data_tests';
 }
+
 /**
  * Article class
  *
@@ -54,6 +59,7 @@ class SanitizeDataTest extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class SanitizeArticle extends CakeTestModel {
+
 /**
  * name property
  *
@@ -61,6 +67,7 @@ class SanitizeArticle extends CakeTestModel {
  * @access public
  */
 	var $name = 'SanitizeArticle';
+
 /**
  * useTable property
  *
@@ -69,6 +76,7 @@ class SanitizeArticle extends CakeTestModel {
  */
 	var $useTable = 'articles';
 }
+
 /**
  * SanitizeTest class
  *
@@ -76,6 +84,7 @@ class SanitizeArticle extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs
  */
 class SanitizeTest extends CakeTestCase {
+
 /**
  * autoFixtures property
  *
@@ -83,6 +92,7 @@ class SanitizeTest extends CakeTestCase {
  * @access public
  */
 	var $autoFixtures = false;
+
 /**
  * fixtures property
  *
@@ -90,6 +100,7 @@ class SanitizeTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.data_test', 'core.article');
+
 /**
  * startTest method
  *
@@ -101,6 +112,7 @@ class SanitizeTest extends CakeTestCase {
 		parent::startTest($method);
 		$this->_initDb();
 	}
+
 /**
  * testEscapeAlphaNumeric method
  *
@@ -132,6 +144,7 @@ class SanitizeTest extends CakeTestCase {
 		$resultNull = Sanitize::escape(true, 'test_suite');
 		$this->assertEqual($resultNull, true);
 	}
+
 /**
  * testClean method
  *
@@ -298,8 +311,8 @@ class SanitizeTest extends CakeTestCase {
 		$result = Sanitize::stripScripts($string);
 		$this->assertEqual($result, $expected);
 
-		$string = '<link href="/css/styles.css" media="screen" rel="stylesheet" />'."\n".'<link rel="icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
-		$expected = "\n".'<link rel="icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
+		$string = '<link href="/css/styles.css" media="screen" rel="stylesheet" />' . "\n" . '<link rel="icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
+		$expected = "\n" . '<link rel="icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
 		$result = Sanitize::stripScripts($string);
 		$this->assertEqual($result, $expected);
 
diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php
index f00af06b7..0ceb423ad 100644
--- a/cake/tests/cases/libs/security.test.php
+++ b/cake/tests/cases/libs/security.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SecurityTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Security');
+
 /**
  * SecurityTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Security');
  * @subpackage    cake.tests.cases.libs
  */
 class SecurityTest extends CakeTestCase {
+
 /**
  * sut property
  *
@@ -39,6 +42,7 @@ class SecurityTest extends CakeTestCase {
  * @access public
  */
 	var $sut = null;
+
 /**
  * setUp method
  *
@@ -48,6 +52,7 @@ class SecurityTest extends CakeTestCase {
 	function setUp() {
 		$this->sut =& Security::getInstance();
 	}
+
 /**
  * testInactiveMins method
  *
@@ -64,6 +69,7 @@ class SecurityTest extends CakeTestCase {
 		Configure::write('Security.level', 'low');
 		$this->assertEqual(300, Security::inactiveMins());
 	}
+
 /**
  * testGenerateAuthkey method
  *
@@ -73,6 +79,7 @@ class SecurityTest extends CakeTestCase {
 	function testGenerateAuthkey() {
 		$this->assertEqual(strlen(Security::generateAuthKey()), 40);
 	}
+
 /**
  * testValidateAuthKey method
  *
@@ -83,6 +90,7 @@ class SecurityTest extends CakeTestCase {
 		$authKey = Security::generateAuthKey();
 		$this->assertTrue(Security::validateAuthKey($authKey));
 	}
+
 /**
  * testHash method
  *
@@ -132,6 +140,7 @@ class SecurityTest extends CakeTestCase {
 
 		Security::setHash($_hashType);
 	}
+
 /**
  * testCipher method
  *
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index d0b7c10f9..a87101404 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SetTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Set');
+
 /**
  * SetTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Set');
  * @subpackage    cake.tests.cases.libs
  */
 class SetTest extends CakeTestCase {
+
 /**
  * testNumericKeyExtraction method
  *
@@ -43,6 +46,7 @@ class SetTest extends CakeTestCase {
 		$this->assertIdentical(Set::extract($data, '{n}'), array(1, 'whatever'));
 		$this->assertIdentical(Set::diff($data, Set::extract($data, '{n}')), array('plugin' => null, 'controller' => '', 'action' => ''));
 	}
+
 /**
  * testEnum method
  *
@@ -83,6 +87,7 @@ class SetTest extends CakeTestCase {
 		$result = Set::enum(2);
 		$this->assertNull($result);
 	}
+
 /**
  * testFilter method
  *
@@ -94,6 +99,7 @@ class SetTest extends CakeTestCase {
 		$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be', false));
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testNumericArrayCheck method
  *
@@ -131,6 +137,7 @@ class SetTest extends CakeTestCase {
 		$data = array('one', 2 => 'two', 3 => 'three', 4 => 'four', 'a' => 'five');
 		$this->assertFalse(Set::numeric(array_keys($data)));
 	}
+
 /**
  * testKeyCheck method
  *
@@ -168,6 +175,7 @@ class SetTest extends CakeTestCase {
 		$this->assertTrue(Set::check($data, '0.Article.user_id'));
 		$this->assertFalse(Set::check($data, '0.Article.user_id.a'));
 	}
+
 /**
  * testMerge method
  *
@@ -252,6 +260,7 @@ class SetTest extends CakeTestCase {
 
 		$this->assertIdentical(Set::normalize(Set::merge($a, $b)), $expected);
 	}
+
 /**
  * testSort method
  *
@@ -337,6 +346,7 @@ class SetTest extends CakeTestCase {
 		$a = Set::sort($a, '{n}.Person.name', 'ASC');
 		$this->assertIdentical($a, $b);
 	}
+
 /**
  * testExtract method
  *
@@ -971,6 +981,7 @@ class SetTest extends CakeTestCase {
 		$this->assertEqual($r, $expected);
 
 	}
+
 /**
  * testMatches method
  *
@@ -1043,6 +1054,7 @@ class SetTest extends CakeTestCase {
 
 
 	}
+
 /**
  * testSetExtractReturnsEmptyArray method
  *
@@ -1063,6 +1075,7 @@ class SetTest extends CakeTestCase {
 		$this->assertIdentical(Set::extract(array(), 'Message.flash'), null);
 
 	}
+
 /**
  * testClassicExtract method
  *
@@ -1214,6 +1227,7 @@ class SetTest extends CakeTestCase {
 		$expected = array( 'Article 1', 'Article 2', 'Article 3' );
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testInsert method
  *
@@ -1257,6 +1271,7 @@ class SetTest extends CakeTestCase {
 		);
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testRemove method
  *
@@ -1295,6 +1310,7 @@ class SetTest extends CakeTestCase {
 		$expected = $a;
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testCheck method
  *
@@ -1317,6 +1333,7 @@ class SetTest extends CakeTestCase {
 		$this->assertTrue(Set::check($set, 'My Index 1.First.Second.Third.Fourth'));
 		$this->assertFalse(Set::check($set, 'My Index 1.First.Seconds.Third.Fourth'));
 	}
+
 /**
  * testWritingWithFunkyKeys method
  *
@@ -1333,6 +1350,7 @@ class SetTest extends CakeTestCase {
 		$this->assertTrue($set = Set::insert(array(), 'Session Test.Test Case', "test"));
 		$this->assertTrue(Set::check($set, 'Session Test.Test Case'));
 	}
+
 /**
  * testDiff method
  *
@@ -1375,6 +1393,7 @@ class SetTest extends CakeTestCase {
 		);
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testIsEqual method
  *
@@ -1397,6 +1416,7 @@ class SetTest extends CakeTestCase {
 		$this->assertFalse(Set::isEqual($a, $b));
 		$this->assertFalse(Set::isEqual($b, $a));
 	}
+
 /**
  * testContains method
  *
@@ -1419,6 +1439,7 @@ class SetTest extends CakeTestCase {
 		$this->assertFalse(Set::contains($a, $b));
 		$this->assertTrue(Set::contains($b, $a));
 	}
+
 /**
  * testCombine method
  *
@@ -1551,6 +1572,7 @@ class SetTest extends CakeTestCase {
 		$expected = array(2 => null, 14 => null, 25 => null);
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testMapReverse method
  *
@@ -1800,6 +1822,7 @@ class SetTest extends CakeTestCase {
 		$expected = array('User' => array('id' => '100'), 'Profile' => array('name' => 'Joe Mamma'));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFormatting method
  *
@@ -1847,6 +1870,7 @@ class SetTest extends CakeTestCase {
 		$expected = array('Nate, 42', 'Larry, 0', 'Garrett, 0');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testCountDim method
  *
@@ -1901,6 +1925,7 @@ class SetTest extends CakeTestCase {
 		$result = Set::countDim($set, true);
 		$this->assertEqual($result, 5);
 	}
+
 /**
  * testMapNesting method
  *
@@ -2025,6 +2050,7 @@ class SetTest extends CakeTestCase {
 		$expected = null;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testNestedMappedData method
  *
@@ -2273,6 +2299,7 @@ class SetTest extends CakeTestCase {
 
 		$this->assertIdentical($expected, $result);
 	}
+
 /**
  * testPushDiff method
  *
@@ -2319,6 +2346,7 @@ class SetTest extends CakeTestCase {
 		$result = Set::pushDiff($array1, $array2);
 		$this->assertIdentical($result, $array1+$array2);
 	}
+
 /**
  * testXmlSetReverse method
  *
@@ -2564,6 +2592,7 @@ class SetTest extends CakeTestCase {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testStrictKeyCheck method
  *
@@ -2574,6 +2603,7 @@ class SetTest extends CakeTestCase {
 		$set = array('a' => 'hi');
 		$this->assertFalse(Set::check($set, 'a.b'));
 	}
+
 /**
  * Tests Set::flatten
  *
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index d6fe7a1ab..df1066012 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * StringTest file
  *
@@ -21,6 +22,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Core', 'String');
+
 /**
  * StringTest class
  *
diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php
index b8eb5de29..40e7a33bb 100644
--- a/cake/tests/cases/libs/test_manager.test.php
+++ b/cake/tests/cases/libs/test_manager.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TestManagerTest file
  *
@@ -27,6 +28,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'TestManager');
+
 /**
  * TestManagerTest class
  *
@@ -34,6 +36,7 @@ App::import('Core', 'TestManager');
  * @subpackage    cake.tests.cases.libs
  */
 class TestManagerTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -44,6 +47,7 @@ class TestManagerTest extends CakeTestCase {
 		$this->Sut =& new TestManager();
 		$this->Reporter =& new CakeHtmlReporter();
 	}
+
 /**
  * testRunAllTests method
  *
@@ -60,6 +64,7 @@ class TestManagerTest extends CakeTestCase {
 
 		$this->assertEqual(count($out), count($list));
 	}
+
 /**
  * testRunTestCase method
  *
@@ -76,6 +81,7 @@ class TestManagerTest extends CakeTestCase {
 		$result = $this->Sut->runTestCase($file, $this->Reporter, true);
 		$this->assertTrue($result);
 	}
+
 /**
  * testRunGroupTest method
  *
@@ -84,6 +90,7 @@ class TestManagerTest extends CakeTestCase {
  */
 	function testRunGroupTest() {
 	}
+
 /**
  * testAddTestCasesFromDirectory method
  *
@@ -92,6 +99,7 @@ class TestManagerTest extends CakeTestCase {
  */
 	function testAddTestCasesFromDirectory() {
 	}
+
 /**
  * testAddTestFile method
  *
@@ -100,6 +108,7 @@ class TestManagerTest extends CakeTestCase {
  */
 	function testAddTestFile() {
 	}
+
 /**
  * testGetTestCaseList method
  *
@@ -108,6 +117,7 @@ class TestManagerTest extends CakeTestCase {
  */
 	function testGetTestCaseList() {
 	}
+
 /**
  * testGetGroupTestList method
  *
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 98c3e6866..bde7d34dc 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ValidationTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Validation');
+
 /**
  * CustomValidator class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Validation');
  * @subpackage    cake.tests.cases.libs
  */
 class CustomValidator {
+
 /**
  * Makes sure that a given $email address is valid and unique
  *
@@ -43,6 +46,7 @@ class CustomValidator {
 		return preg_match('/^[0-9]{3}$/', $check);
 	}
 }
+
 /**
  * Test Case for Validation Class
  *
@@ -50,6 +54,7 @@ class CustomValidator {
  * @subpackage    cake.tests.cases.libs
  */
 class ValidationTest extends CakeTestCase {
+
 /**
  * Validation property
  *
@@ -57,6 +62,7 @@ class ValidationTest extends CakeTestCase {
  * @access public
  */
 	var $Validation = null;
+
 /**
  * setup method
  *
@@ -67,6 +73,7 @@ class ValidationTest extends CakeTestCase {
 		$this->Validation =& Validation::getInstance();
 		$this->_appEncoding = Configure::read('App.encoding');
 	}
+
 /**
  * tearDown method
  *
@@ -76,6 +83,7 @@ class ValidationTest extends CakeTestCase {
 	function tearDown() {
 		Configure::write('App.encoding', $this->_appEncoding);
 	}
+
 /**
  * testNotEmpty method
  *
@@ -94,6 +102,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::notEmpty(""));
 
 	}
+
 /**
  * testNotEmptyISO88591Encoding method
  *
@@ -111,6 +120,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::notEmpty("\t "));
 		$this->assertFalse(Validation::notEmpty(""));
 	}
+
 /**
  * testAlphaNumeric method
  *
@@ -137,6 +147,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::alphaNumeric(' '));
 		$this->assertFalse(Validation::alphaNumeric(''));
 	}
+
 /**
  * testAlphaNumericPassedAsArray method
  *
@@ -156,6 +167,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::alphaNumeric(array('check' =>  ' ')));
 		$this->assertFalse(Validation::alphaNumeric(array('check' =>  '')));
 	}
+
 /**
  * testBetween method
  *
@@ -167,6 +179,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::between('', 0, 7));
 		$this->assertFalse(Validation::between('abcdefg', 1, 6));
 	}
+
 /**
  * testBlank method
  *
@@ -182,6 +195,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::blank('    Blank'));
 		$this->assertFalse(Validation::blank('Blank'));
 	}
+
 /**
  * testBlankAsArray method
  *
@@ -197,6 +211,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::blank(array('check' => '    Blank')));
 		$this->assertFalse(Validation::blank(array('check' => 'Blank')));
 	}
+
 /**
  * testcc method
  *
@@ -641,6 +656,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::cc('869921250068209', array('voyager')));
 		$this->assertTrue(Validation::cc('869972521242198', array('voyager')));
 	}
+
 /**
  * testLuhn method
  *
@@ -720,6 +736,7 @@ class ValidationTest extends CakeTestCase {
 		$this->Validation->check = '869940697287173';
 		$this->assertFalse($this->Validation->_luhn());
 	}
+
 /**
  * testCustomRegexForCc method
  *
@@ -731,6 +748,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::cc('1233210593374358', null, null, '/123321\\d{11}/'));
 		$this->assertFalse(Validation::cc('12312305933743585', null, null, '/123321\\d{11}/'));
 	}
+
 /**
  * testCustomRegexForCcWithLuhnCheck method
  *
@@ -743,6 +761,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::cc('12332105933743587', null, true, '/123321\\d{11}/'));
 		$this->assertFalse(Validation::cc('12312305933743585', null, true, '/123321\\d{11}/'));
 	}
+
 /**
  * testFastCc method
  *
@@ -771,6 +790,7 @@ class ValidationTest extends CakeTestCase {
 		//Visa Electron
 		$this->assertTrue(Validation::cc('4175003346287100'));
 	}
+
 /**
  * testAllCc method
  *
@@ -821,6 +841,7 @@ class ValidationTest extends CakeTestCase {
 		//Voyager
 		$this->assertTrue(Validation::cc('869940697287073', 'all'));
 	}
+
 /**
  * testAllCcDeep method
  *
@@ -871,6 +892,7 @@ class ValidationTest extends CakeTestCase {
 		//Voyager
 		$this->assertTrue(Validation::cc('869940697287073', 'all', true));
 	}
+
 /**
  * testComparison method
  *
@@ -908,6 +930,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::comparison(7, 'not equal', 7));
 		$this->assertFalse(Validation::comparison(7, '!=', 7));
 	}
+
 /**
  * testComparisonAsArray method
  *
@@ -944,6 +967,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
 		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
 	}
+
 /**
  * testCustom method
  *
@@ -956,6 +980,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::custom('123.45', '/(?<!\\S)\\d++(?!\\S)/'));
 		$this->assertFalse(Validation::custom('missing regex'));
 	}
+
 /**
  * testCustomAsArray method
  *
@@ -967,6 +992,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::custom(array('check' => 'Text', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
 		$this->assertFalse(Validation::custom(array('check' => '123.45', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
 	}
+
 /**
  * testDateDdmmyyyy method
  *
@@ -987,6 +1013,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('31/11/2006', array('dmy')));
 		$this->assertFalse(Validation::date('31 11 2006', array('dmy')));
 	}
+
 /**
  * testDateDdmmyyyyLeapYear method
  *
@@ -1003,6 +1030,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('29/02/2006', array('dmy')));
 		$this->assertFalse(Validation::date('29 02 2006', array('dmy')));
 	}
+
 /**
  * testDateDdmmyy method
  *
@@ -1023,6 +1051,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('31/11/06', array('dmy')));
 		$this->assertFalse(Validation::date('31 11 06', array('dmy')));
 	}
+
 /**
  * testDateDdmmyyLeapYear method
  *
@@ -1039,6 +1068,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('29/02/06', array('dmy')));
 		$this->assertFalse(Validation::date('29 02 06', array('dmy')));
 	}
+
 /**
  * testDateDmyy method
  *
@@ -1059,6 +1089,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('32/2/06', array('dmy')));
 		$this->assertFalse(Validation::date('32 2 06', array('dmy')));
 	}
+
 /**
  * testDateDmyyLeapYear method
  *
@@ -1075,6 +1106,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('29/2/06', array('dmy')));
 		$this->assertFalse(Validation::date('29 2 06', array('dmy')));
 	}
+
 /**
  * testDateDmyyyy method
  *
@@ -1095,6 +1127,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('32/2/2006', array('dmy')));
 		$this->assertFalse(Validation::date('32 2 2006', array('dmy')));
 	}
+
 /**
  * testDateDmyyyyLeapYear method
  *
@@ -1111,6 +1144,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('29/2/2006', array('dmy')));
 		$this->assertFalse(Validation::date('29 2 2006', array('dmy')));
 	}
+
 /**
  * testDateMmddyyyy method
  *
@@ -1131,6 +1165,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('11/31/2006', array('mdy')));
 		$this->assertFalse(Validation::date('11 31 2006', array('mdy')));
 	}
+
 /**
  * testDateMmddyyyyLeapYear method
  *
@@ -1147,6 +1182,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('02/29/2006', array('mdy')));
 		$this->assertFalse(Validation::date('02 29 2006', array('mdy')));
 	}
+
 /**
  * testDateMmddyy method
  *
@@ -1167,6 +1203,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('11/31/06', array('mdy')));
 		$this->assertFalse(Validation::date('11 31 06', array('mdy')));
 	}
+
 /**
  * testDateMmddyyLeapYear method
  *
@@ -1183,6 +1220,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('02/29/06', array('mdy')));
 		$this->assertFalse(Validation::date('02 29 06', array('mdy')));
 	}
+
 /**
  * testDateMdyy method
  *
@@ -1203,6 +1241,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2/32/06', array('mdy')));
 		$this->assertFalse(Validation::date('2 32 06', array('mdy')));
 	}
+
 /**
  * testDateMdyyLeapYear method
  *
@@ -1219,6 +1258,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2/29/06', array('mdy')));
 		$this->assertFalse(Validation::date('2 29 06', array('mdy')));
 	}
+
 /**
  * testDateMdyyyy method
  *
@@ -1239,6 +1279,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2/32/2006', array('mdy')));
 		$this->assertFalse(Validation::date('2 32 2006', array('mdy')));
 	}
+
 /**
  * testDateMdyyyyLeapYear method
  *
@@ -1255,6 +1296,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2/29/2006', array('mdy')));
 		$this->assertFalse(Validation::date('2 29 2006', array('mdy')));
 	}
+
 /**
  * testDateYyyymmdd method
  *
@@ -1271,6 +1313,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2006/11/31', array('ymd')));
 		$this->assertFalse(Validation::date('2006 11 31', array('ymd')));
 	}
+
 /**
  * testDateYyyymmddLeapYear method
  *
@@ -1287,6 +1330,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
 		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
 	}
+
 /**
  * testDateYymmdd method
  *
@@ -1307,6 +1351,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('06/11/31', array('ymd')));
 		$this->assertFalse(Validation::date('06 11 31', array('ymd')));
 	}
+
 /**
  * testDateYymmddLeapYear method
  *
@@ -1323,6 +1368,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
 		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
 	}
+
 /**
  * testDateDdMMMMyyyy method
  *
@@ -1335,6 +1381,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('2006 Dec 27', array('dMy')));
 		$this->assertFalse(Validation::date('2006 December 27', array('dMy')));
 	}
+
 /**
  * testDateDdMMMMyyyyLeapYear method
  *
@@ -1345,6 +1392,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::date('29 February 2004', array('dMy')));
 		$this->assertFalse(Validation::date('29 February 2006', array('dMy')));
 	}
+
 /**
  * testDateMmmmDdyyyy method
  *
@@ -1359,6 +1407,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('27 Dec 2006', array('Mdy')));
 		$this->assertFalse(Validation::date('2006 December 27', array('Mdy')));
 	}
+
 /**
  * testDateMmmmDdyyyyLeapYear method
  *
@@ -1372,6 +1421,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::date('Feb 29 2004', array('Mdy')));
 		$this->assertFalse(Validation::date('February 29, 2006', array('Mdy')));
 	}
+
 /**
  * testDateMy method
  *
@@ -1384,6 +1434,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::date('December/2006', array('My')));
 		$this->assertTrue(Validation::date('Dec/2006', array('My')));
 	}
+
 /**
  * testDateMyNumeric method
  *
@@ -1400,6 +1451,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::date('12.06', array('my')));
 		$this->assertFalse(Validation::date('12 06', array('my')));
 	}
+
 /**
  * testTime method
  *
@@ -1421,6 +1473,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::time('13:00pm'));
 		$this->assertFalse(Validation::time('9:00'));
 	}
+
 /**
  * testBoolean method
  *
@@ -1440,6 +1493,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::boolean('2'));
 		$this->assertFalse(Validation::boolean('Boo!'));
 	}
+
 /**
  * testDateCustomRegx method
  *
@@ -1450,6 +1504,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::date('2006-12-27', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
 		$this->assertFalse(Validation::date('12-27-2006', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
 	}
+
 /**
  * testDecimal method
  *
@@ -1468,6 +1523,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::decimal('-1234'));
 		$this->assertFalse(Validation::decimal('+1234'));
 	}
+
 /**
  * testDecimalWithPlaces method
  *
@@ -1492,6 +1548,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::decimal(-1234.5678, 3));
 		$this->assertFalse(Validation::decimal(+1234.5678, 3));
 	}
+
 /**
  * testDecimalCustomRegex method
  *
@@ -1502,6 +1559,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::decimal('1.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
 		$this->assertFalse(Validation::decimal('.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
 	}
+
 /**
  * testEmail method
  *
@@ -1577,6 +1635,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::email('abc@example_underscored.com'));
 		$this->assertFalse(Validation::email('raw@test.ra.ru....com'));
 	}
+
 /**
  * testEmailDeep method
  *
@@ -1588,6 +1647,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::email('abc.efg@caphpkeinvalid.com', true));
 		$this->assertFalse(Validation::email('abc@example.abcd', true));
 	}
+
 /**
  * testEmailCustomRegex method
  *
@@ -1598,6 +1658,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::email('abc.efg@cakephp.org', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
 		$this->assertFalse(Validation::email('abc.efg@com.caphpkeinvalid', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
 	}
+
 /**
  * testEqualTo method
  *
@@ -1612,6 +1673,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::equalTo(0, false));
 		$this->assertFalse(Validation::equalTo(null, false));
 	}
+
 /**
  * testIp method
  *
@@ -1626,6 +1688,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::ip('127.0.0.a'));
 		$this->assertFalse(Validation::ip('127.0.0.256'));
 	}
+
 /**
  * testMaxLength method
  *
@@ -1637,6 +1700,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::maxLength('abc', 3));
 		$this->assertFalse(Validation::maxLength('abcd', 3));
 	}
+
 /**
  * testMinLength method
  *
@@ -1648,6 +1712,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::minLength('abc', 3));
 		$this->assertTrue(Validation::minLength('abcd', 3));
 	}
+
 /**
  * testUrl method
  *
@@ -1691,6 +1756,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::url('www.cakephp.org', true));
 		$this->assertTrue(Validation::url('http://www.cakephp.org', true));
 	}
+
 /**
  * testInList method
  *
@@ -1702,6 +1768,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::inList('two', array('one', 'two')));
 		$this->assertFalse(Validation::inList('three', array('one', 'two')));
 	}
+
 /**
  * testValidNumber method
  *
@@ -1728,6 +1795,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::custom('.2345', VALID_NUMBER));
 		$this->assertFalse(Validation::custom('12345.', VALID_NUMBER));
 	}
+
 /**
  * testRange method
  *
@@ -1743,6 +1811,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::range(-5, -10, 1));
 		$this->assertFalse(Validation::range('word'));
 	}
+
 /**
  * testExtension method
  *
@@ -1772,6 +1841,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::extension(array('noextension', 'extension.JPG', 'extension.gif', 'extension.png')));
 		$this->assertFalse(Validation::extension(array('extension.pdf', 'extension.JPG', 'extension.gif', 'extension.png')));
 	}
+
 /**
  * testMoney method
  *
@@ -1804,6 +1874,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::money('100.1€', 'right'));
 		$this->assertFalse(Validation::money('100.1111€', 'right'));
 	}
+
 /**
  * Test Multiple Select Validation
  *
@@ -1843,6 +1914,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
 		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
 	}
+
 /**
  * testNumeric method
  *
@@ -1859,6 +1931,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::numeric(2.2));
 		$this->assertTrue(Validation::numeric('2.2'));
 	}
+
 /**
  * testPhone method
  *
@@ -1890,6 +1963,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::phone('1.(333).333.4444'));
 		$this->assertTrue(Validation::phone('1-333-333-4444'));
 	}
+
 /**
  * testPostal method
  *
@@ -1942,6 +2016,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::postal('13A89-4333'));
 		$this->assertTrue(Validation::postal('13089-3333'));
 	}
+
 /**
  * testSsn method
  *
@@ -1963,6 +2038,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::ssn('111-33-333', null, 'us'));
 		$this->assertTrue(Validation::ssn('111-33-4333', null, 'us'));
 	}
+
 /**
  * testUserDefined method
  *
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index e380650b9..6b314dece 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * HelperTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', array('View', 'Helper'));
+
 /**
  * HelperTestPost class
  *
@@ -32,6 +34,7 @@ App::import('Core', array('View', 'Helper'));
  * @subpackage    cake.tests.cases.libs.view
  */
 class HelperTestPost extends Model {
+
 /**
  * useTable property
  *
@@ -39,6 +42,7 @@ class HelperTestPost extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -57,6 +61,7 @@ class HelperTestPost extends Model {
 		);
 		return $this->_schema;
 	}
+
 /**
  * hasAndBelongsToMany property
  *
@@ -65,6 +70,7 @@ class HelperTestPost extends Model {
  */
 	var $hasAndBelongsToMany = array('HelperTestTag'=> array('with' => 'HelperTestPostsTag'));
 }
+
 /**
  * HelperTestComment class
  *
@@ -72,6 +78,7 @@ class HelperTestPost extends Model {
  * @subpackage    cake.tests.cases.libs.view
  */
 class HelperTestComment extends Model {
+
 /**
  * useTable property
  *
@@ -79,6 +86,7 @@ class HelperTestComment extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -97,6 +105,7 @@ class HelperTestComment extends Model {
 		return $this->_schema;
 	}
 }
+
 /**
  * HelperTestTag class
  *
@@ -104,6 +113,7 @@ class HelperTestComment extends Model {
  * @subpackage    cake.tests.cases.libs.view
  */
 class HelperTestTag extends Model {
+
 /**
  * useTable property
  *
@@ -111,6 +121,7 @@ class HelperTestTag extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -127,6 +138,7 @@ class HelperTestTag extends Model {
 		return $this->_schema;
 	}
 }
+
 /**
  * HelperTestPostsTag class
  *
@@ -134,6 +146,7 @@ class HelperTestTag extends Model {
  * @subpackage    cake.tests.cases.libs.view
  */
 class HelperTestPostsTag extends Model {
+
 /**
  * useTable property
  *
@@ -141,6 +154,7 @@ class HelperTestPostsTag extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -155,6 +169,7 @@ class HelperTestPostsTag extends Model {
 		return $this->_schema;
 	}
 }
+
 /**
  * HelperTest class
  *
@@ -162,6 +177,7 @@ class HelperTestPostsTag extends Model {
  * @subpackage    cake.tests.cases.libs
  */
 class HelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -178,6 +194,7 @@ class HelperTest extends CakeTestCase {
 		ClassRegistry::addObject('HelperTestComment', new HelperTestComment());
 		ClassRegistry::addObject('HelperTestTag', new HelperTestTag());
 	}
+
 /**
  * tearDown method
  *
@@ -188,6 +205,7 @@ class HelperTest extends CakeTestCase {
 		unset($this->Helper, $this->View);
 		ClassRegistry::flush();
 	}
+
 /**
  * testFormFieldNameParsing method
  *
@@ -324,6 +342,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($this->View->association, null);
 		$this->assertEqual($this->View->fieldSuffix, null);
 	}
+
 /**
  * test getting values from Helper
  *
@@ -355,6 +374,7 @@ class HelperTest extends CakeTestCase {
 		$result = $this->Helper->value('Post.2.created.year');
 		$this->assertEqual($result, '2008');
 	}
+
 /**
  * Ensure HTML escaping of url params.  So link addresses are valid and not exploited
  *
@@ -385,11 +405,12 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($result, "/posts/index/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24");
 
 		$result = $this->Helper->url(array(
-			'controller' => 'posts', 'action' => 'index', 'page' => '1', 
+			'controller' => 'posts', 'action' => 'index', 'page' => '1',
 			'?' => array('one' => 'value', 'two' => 'value', 'three' => 'purple')
 		));
 		$this->assertEqual($result, "/posts/index/page:1?one=value&amp;two=value&amp;three=purple");
 	}
+
 /**
  * testFieldsWithSameName method
  *
@@ -425,6 +446,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($this->View->fieldSuffix, null);
 
 	}
+
 /**
  * testFieldSameAsModel method
  *
@@ -446,6 +468,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($this->View->fieldSuffix, null);
 
 	}
+
 /**
  * testFieldSuffixForDate method
  *
@@ -471,6 +494,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($this->View->association, null);
 		$this->assertEqual($this->View->fieldSuffix, 'month');
 	}
+
 /**
  * testMulitDimensionValue method
  *
@@ -504,6 +528,7 @@ class HelperTest extends CakeTestCase {
 		$result = $this->Helper->value('0.id');
 		$this->assertEqual($result, 100);
 	}
+
 /**
  * testClean method
  *
diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php
index 439846e0d..c6977d0c3 100644
--- a/cake/tests/cases/libs/view/helpers/ajax.test.php
+++ b/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AjaxHelperTest file
  *
@@ -37,6 +38,7 @@ uses(
 	'view' . DS . 'helpers' . DS . 'form',
 	'view' . DS . 'helpers' . DS . 'javascript'
 	);
+
 /**
  * AjaxTestController class
  *
@@ -44,6 +46,7 @@ uses(
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class AjaxTestController extends Controller {
+
 /**
  * name property
  *
@@ -51,6 +54,7 @@ class AjaxTestController extends Controller {
  * @access public
  */
 	var $name = 'AjaxTest';
+
 /**
  * uses property
  *
@@ -59,6 +63,7 @@ class AjaxTestController extends Controller {
  */
 	var $uses = null;
 }
+
 /**
  * PostAjaxTest class
  *
@@ -66,6 +71,7 @@ class AjaxTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class PostAjaxTest extends Model {
+
 /**
  * primaryKey property
  *
@@ -73,6 +79,7 @@ class PostAjaxTest extends Model {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -80,6 +87,7 @@ class PostAjaxTest extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema method
  *
@@ -95,6 +103,7 @@ class PostAjaxTest extends Model {
 		);
 	}
 }
+
 /**
  * TestAjaxHelper class
  *
@@ -102,6 +111,7 @@ class PostAjaxTest extends Model {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TestAjaxHelper extends AjaxHelper {
+
 /**
  * stop method
  *
@@ -111,6 +121,7 @@ class TestAjaxHelper extends AjaxHelper {
 	function _stop() {
 	}
 }
+
 /**
  * TestJavascriptHelper class
  *
@@ -118,6 +129,7 @@ class TestAjaxHelper extends AjaxHelper {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TestJavascriptHelper extends JavascriptHelper {
+
 /**
  * codeBlocks property
  *
@@ -125,6 +137,7 @@ class TestJavascriptHelper extends JavascriptHelper {
  * @access public
  */
 	var $codeBlocks;
+
 /**
  * codeBlock method
  *
@@ -139,6 +152,7 @@ class TestJavascriptHelper extends JavascriptHelper {
 		$this->codeBlocks[] = $parameter;
 	}
 }
+
 /**
  * AjaxTest class
  *
@@ -146,18 +160,21 @@ class TestJavascriptHelper extends JavascriptHelper {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class AjaxHelperTest extends CakeTestCase {
+
 /**
  * Regexp for CDATA start block
  *
  * @var string
  */
 	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+
 /**
  * Regexp for CDATA end block
  *
  * @var string
  */
 	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+
 /**
  * setUp method
  *
@@ -175,6 +192,7 @@ class AjaxHelperTest extends CakeTestCase {
 		ClassRegistry::addObject('view', $view);
 		ClassRegistry::addObject('PostAjaxTest', new PostAjaxTest());
 	}
+
 /**
  * tearDown method
  *
@@ -185,6 +203,7 @@ class AjaxHelperTest extends CakeTestCase {
 		unset($this->Ajax);
 		ClassRegistry::flush();
 	}
+
 /**
  * testEvalScripts method
  *
@@ -218,6 +237,7 @@ class AjaxHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testAutoComplete method
  *
@@ -264,6 +284,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/{parameters:\'key=value&key2=value2\'}/', $result);
 
 	}
+
 /**
  * testAsynchronous method
  *
@@ -284,6 +305,7 @@ class AjaxHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testDraggable method
  *
@@ -305,6 +327,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/onDrag:doDrag/', $result);
 		$this->assertPattern('/onEnd:doEnd/', $result);
 	}
+
 /**
  * testDroppable method
  *
@@ -352,6 +375,7 @@ class AjaxHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testForm method
  *
@@ -366,6 +390,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/id="MyFormID"/', $result);
 		$this->assertPattern('/name="SomeFormName"/', $result);
 	}
+
 /**
  * testSortable method
  *
@@ -439,6 +464,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$expected = "Sortable.create('div', {scroll:$('someElement')});";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSubmitWithIndicator method
  *
@@ -450,6 +476,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/onLoading:function\(request\) {doSomething\(\);\s+Element.show\(\'loading\'\);}/', $result);
 		$this->assertPattern('/onComplete:function\(request, json\) {doSomethingElse\(\) ;\s+Element.hide\(\'loading\'\);}/', $result);
 	}
+
 /**
  * testLink method
  *
@@ -559,6 +586,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertNoPattern('/^<a[^<>]+complete="test"[^<>]*>Ajax Link<\/a>/', $result);
 		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
 	}
+
 /**
  * testRemoteTimer method
  *
@@ -614,6 +642,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
 		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, postBody:\'var1=value1\'})')) . '/', $result);
 	}
+
 /**
  * testObserveField method
  *
@@ -645,6 +674,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new Form.Element.EventObserver\(\'field\', function\(element, value\) {.+}\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
 		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Updater(\'divId\',\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, parameters:Form.Element.serialize(\'otherField\'), requestHeaders:[\'X-Update\', \'divId\']})')) . '/', $result);
 	}
+
 /**
  * testObserveForm method
  *
@@ -692,6 +722,7 @@ class AjaxHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSlider method
  *
@@ -769,6 +800,7 @@ class AjaxHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testRemoteFunction method
  *
@@ -792,6 +824,7 @@ class AjaxHelperTest extends CakeTestCase {
 		$expected = "if (confirm('Are you sure?')) { new Ajax.Updater('myDiv','/', {asynchronous:true, evalScripts:true, requestHeaders:['X-Update', 'myDiv']}); } else { event.returnValue = false; return false; }";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDiv method
  *
@@ -824,6 +857,7 @@ class AjaxHelperTest extends CakeTestCase {
 
 		$_SERVER['HTTP_X_UPDATE'] = $oldXUpdate;
 	}
+
 /**
  * testAfterRender method
  *
@@ -851,6 +885,7 @@ class AjaxHelperTest extends CakeTestCase {
 
 		$_SERVER['HTTP_X_UPDATE'] = $oldXUpdate;
 	}
+
 /**
  * testEditor method
  *
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index 907146e24..ee3e7ff1c 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CacheHelperTest file
  *
@@ -29,6 +30,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 }
 App::import('Core', array('Controller', 'Model', 'View'));
 App::import('Helper', 'Cache');
+
 /**
  * TestCacheHelper class
  *
@@ -37,6 +39,7 @@ App::import('Helper', 'Cache');
  */
 class TestCacheHelper extends CacheHelper {
 }
+
 /**
  * CacheTestController class
  *
@@ -44,6 +47,7 @@ class TestCacheHelper extends CacheHelper {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class CacheTestController extends Controller {
+
 /**
  * helpers property
  *
@@ -51,6 +55,7 @@ class CacheTestController extends Controller {
  * @access public
  */
 	var $helpers = array('Html', 'Cache');
+
 /**
  * cache_parsing method
  *
@@ -64,6 +69,7 @@ class CacheTestController extends Controller {
 		$this->set('superman', 'clark kent');
 	}
 }
+
 /**
  * CacheHelperTest class
  *
@@ -71,6 +77,7 @@ class CacheTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class CacheHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -83,6 +90,7 @@ class CacheHelperTest extends CakeTestCase {
 		Configure::write('Cache.check', true);
 		Configure::write('Cache.disable', false);
 	}
+
 /**
  * Start Case - switch view paths
  *
@@ -94,6 +102,7 @@ class CacheHelperTest extends CakeTestCase {
 			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 	}
+
 /**
  * End Case - restore view Paths
  *
@@ -103,6 +112,7 @@ class CacheHelperTest extends CakeTestCase {
 	function endCase() {
 		App::build();
 	}
+
 /**
  * tearDown method
  *
@@ -110,8 +120,10 @@ class CacheHelperTest extends CakeTestCase {
  * @return void
  */
 	function tearDown() {
+		clearCache();
 		unset($this->Cache);
 	}
+
 /**
  * test cache parsing with no cake:nocache tags in view file.
  *
@@ -137,6 +149,27 @@ class CacheHelperTest extends CakeTestCase {
 		$this->assertPattern('/php echo microtime()/', $contents);
 		$this->assertPattern('/clark kent/', $result);
 
+		@unlink($filename);
+	}
+
+/**
+ * test cache parsing with non-latin characters in current route
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheNonLatinCharactersInRoute() {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/posts/view/風街ろまん';
+		$this->Controller->action = 'view';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$filename = CACHE . 'views' . DS . 'posts_view_風街ろまん.php';
+		$this->assertTrue(file_exists($filename));
+
 		@unlink($filename);
 	}
 /**
@@ -166,6 +199,7 @@ class CacheHelperTest extends CakeTestCase {
 
 		@unlink($filename);
 	}
+
 /**
  * testComplexNoCache method
  *
@@ -220,6 +254,7 @@ class CacheHelperTest extends CakeTestCase {
 		//$this->assertPattern('/6\. in element with no cache tags/', $contents);
 		$this->assertPattern('/7\. layout after content and after element with no cache tags/', $contents);
 	}
+
 /**
  * testCacheEmptySections method
  *
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index ff6895ec7..f0d010fdf 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * FormHelperTest file
  *
@@ -30,6 +31,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 App::import('Core', array('ClassRegistry', 'Controller', 'View', 'Model', 'Security'));
 App::import('Helper', 'Html');
 App::import('Helper', 'Form');
+
 /**
  * ContactTestController class
  *
@@ -37,6 +39,7 @@ App::import('Helper', 'Form');
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ContactTestController extends Controller {
+
 /**
  * name property
  *
@@ -44,6 +47,7 @@ class ContactTestController extends Controller {
  * @access public
  */
 	var $name = 'ContactTest';
+
 /**
  * uses property
  *
@@ -52,6 +56,7 @@ class ContactTestController extends Controller {
  */
 	var $uses = null;
 }
+
 /**
  * Contact class
  *
@@ -59,6 +64,7 @@ class ContactTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class Contact extends CakeTestModel {
+
 /**
  * primaryKey property
  *
@@ -66,6 +72,7 @@ class Contact extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -73,6 +80,7 @@ class Contact extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -80,6 +88,7 @@ class Contact extends CakeTestModel {
  * @access public
  */
 	var $name = 'Contact';
+
 /**
  * Default schema
  *
@@ -96,6 +105,7 @@ class Contact extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * validate property
  *
@@ -110,6 +120,7 @@ class Contact extends CakeTestModel {
 		'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric'),
 		'imalsonotrequired' => array('alpha' => array('rule' => 'alphaNumeric','required' => false),
 		'between' => array('rule' => array('between', 5, 30))));
+
 /**
  * schema method
  *
@@ -119,6 +130,7 @@ class Contact extends CakeTestModel {
 	function setSchema($schema) {
 		$this->_schema = $schema;
 	}
+
 /**
  * hasAndBelongsToMany property
  *
@@ -127,6 +139,7 @@ class Contact extends CakeTestModel {
  */
 	var $hasAndBelongsToMany = array('ContactTag' => array('with' => 'ContactTagsContact'));
 }
+
 /**
  * ContactTagsContact class
  *
@@ -134,6 +147,7 @@ class Contact extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ContactTagsContact extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -141,6 +155,7 @@ class ContactTagsContact extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -148,6 +163,7 @@ class ContactTagsContact extends CakeTestModel {
  * @access public
  */
 	var $name = 'ContactTagsContact';
+
 /**
  * Default schema
  *
@@ -160,6 +176,7 @@ class ContactTagsContact extends CakeTestModel {
 			'type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'
 		)
 	);
+
 /**
  * schema method
  *
@@ -170,6 +187,7 @@ class ContactTagsContact extends CakeTestModel {
 		$this->_schema = $schema;
 	}
 }
+
 /**
  * ContactNonStandardPk class
  *
@@ -177,6 +195,7 @@ class ContactTagsContact extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ContactNonStandardPk extends Contact {
+
 /**
  * primaryKey property
  *
@@ -184,6 +203,7 @@ class ContactNonStandardPk extends Contact {
  * @access public
  */
 	var $primaryKey = 'pk';
+
 /**
  * name property
  *
@@ -191,6 +211,7 @@ class ContactNonStandardPk extends Contact {
  * @access public
  */
 	var $name = 'ContactNonStandardPk';
+
 /**
  * schema method
  *
@@ -204,6 +225,7 @@ class ContactNonStandardPk extends Contact {
 		return $this->_schema;
 	}
 }
+
 /**
  * ContactTag class
  *
@@ -211,6 +233,7 @@ class ContactNonStandardPk extends Contact {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ContactTag extends Model {
+
 /**
  * useTable property
  *
@@ -218,6 +241,7 @@ class ContactTag extends Model {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema definition
  *
@@ -231,6 +255,7 @@ class ContactTag extends Model {
 		'modified' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null)
 	);
 }
+
 /**
  * UserForm class
  *
@@ -238,6 +263,7 @@ class ContactTag extends Model {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class UserForm extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -245,6 +271,7 @@ class UserForm extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * primaryKey property
  *
@@ -252,6 +279,7 @@ class UserForm extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * name property
  *
@@ -259,6 +287,7 @@ class UserForm extends CakeTestModel {
  * @access public
  */
 	var $name = 'UserForm';
+
 /**
  * hasMany property
  *
@@ -268,6 +297,7 @@ class UserForm extends CakeTestModel {
 	var $hasMany = array(
 		'OpenidUrl' => array('className' => 'OpenidUrl', 'foreignKey' => 'user_form_id'
 	));
+
 /**
  * schema definition
  *
@@ -284,6 +314,7 @@ class UserForm extends CakeTestModel {
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
 }
+
 /**
  * OpenidUrl class
  *
@@ -291,6 +322,7 @@ class UserForm extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class OpenidUrl extends CakeTestModel {
+
 /**
  * useTable property
  *
@@ -298,6 +330,7 @@ class OpenidUrl extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * primaryKey property
  *
@@ -305,6 +338,7 @@ class OpenidUrl extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * name property
  *
@@ -312,6 +346,7 @@ class OpenidUrl extends CakeTestModel {
  * @access public
  */
 	var $name = 'OpenidUrl';
+
 /**
  * belongsTo property
  *
@@ -321,6 +356,7 @@ class OpenidUrl extends CakeTestModel {
 	var $belongsTo = array('UserForm' => array(
 		'className' => 'UserForm', 'foreignKey' => 'user_form_id'
 	));
+
 /**
  * validate property
  *
@@ -328,6 +364,7 @@ class OpenidUrl extends CakeTestModel {
  * @access public
  */
 	var $validate = array('openid_not_registered' => array());
+
 /**
  * schema method
  *
@@ -341,6 +378,7 @@ class OpenidUrl extends CakeTestModel {
 		),
 		'url' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 	);
+
 /**
  * beforeValidate method
  *
@@ -352,6 +390,7 @@ class OpenidUrl extends CakeTestModel {
 		return true;
 	}
 }
+
 /**
  * ValidateUser class
  *
@@ -359,6 +398,7 @@ class OpenidUrl extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ValidateUser extends CakeTestModel {
+
 /**
  * primaryKey property
  *
@@ -366,6 +406,7 @@ class ValidateUser extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -373,6 +414,7 @@ class ValidateUser extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -380,6 +422,7 @@ class ValidateUser extends CakeTestModel {
  * @access public
  */
 	var $name = 'ValidateUser';
+
 /**
  * hasOne property
  *
@@ -389,6 +432,7 @@ class ValidateUser extends CakeTestModel {
 	var $hasOne = array('ValidateProfile' => array(
 		'className' => 'ValidateProfile', 'foreignKey' => 'user_id'
 	));
+
 /**
  * schema method
  *
@@ -403,6 +447,7 @@ class ValidateUser extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * beforeValidate method
  *
@@ -414,6 +459,7 @@ class ValidateUser extends CakeTestModel {
 		return false;
 	}
 }
+
 /**
  * ValidateProfile class
  *
@@ -421,6 +467,7 @@ class ValidateUser extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ValidateProfile extends CakeTestModel {
+
 /**
  * primaryKey property
  *
@@ -428,6 +475,7 @@ class ValidateProfile extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -435,6 +483,7 @@ class ValidateProfile extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * schema property
  *
@@ -449,6 +498,7 @@ class ValidateProfile extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * name property
  *
@@ -456,6 +506,7 @@ class ValidateProfile extends CakeTestModel {
  * @access public
  */
 	var $name = 'ValidateProfile';
+
 /**
  * hasOne property
  *
@@ -465,6 +516,7 @@ class ValidateProfile extends CakeTestModel {
 	var $hasOne = array('ValidateItem' => array(
 		'className' => 'ValidateItem', 'foreignKey' => 'profile_id'
 	));
+
 /**
  * belongsTo property
  *
@@ -474,6 +526,7 @@ class ValidateProfile extends CakeTestModel {
 	var $belongsTo = array('ValidateUser' => array(
 		'className' => 'ValidateUser', 'foreignKey' => 'user_id'
 	));
+
 /**
  * beforeValidate method
  *
@@ -486,6 +539,7 @@ class ValidateProfile extends CakeTestModel {
 		return false;
 	}
 }
+
 /**
  * ValidateItem class
  *
@@ -493,6 +547,7 @@ class ValidateProfile extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class ValidateItem extends CakeTestModel {
+
 /**
  * primaryKey property
  *
@@ -500,6 +555,7 @@ class ValidateItem extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -507,6 +563,7 @@ class ValidateItem extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -514,6 +571,7 @@ class ValidateItem extends CakeTestModel {
  * @access public
  */
 	var $name = 'ValidateItem';
+
 /**
  * schema property
  *
@@ -530,6 +588,7 @@ class ValidateItem extends CakeTestModel {
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+
 /**
  * belongsTo property
  *
@@ -537,6 +596,7 @@ class ValidateItem extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('ValidateProfile' => array('foreignKey' => 'profile_id'));
+
 /**
  * beforeValidate method
  *
@@ -548,6 +608,7 @@ class ValidateItem extends CakeTestModel {
 		return false;
 	}
 }
+
 /**
  * TestMail class
  *
@@ -555,6 +616,7 @@ class ValidateItem extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TestMail extends CakeTestModel {
+
 /**
  * primaryKey property
  *
@@ -562,6 +624,7 @@ class TestMail extends CakeTestModel {
  * @access public
  */
 	var $primaryKey = 'id';
+
 /**
  * useTable property
  *
@@ -569,6 +632,7 @@ class TestMail extends CakeTestModel {
  * @access public
  */
 	var $useTable = false;
+
 /**
  * name property
  *
@@ -577,6 +641,7 @@ class TestMail extends CakeTestModel {
  */
 	var $name = 'TestMail';
 }
+
 /**
  * FormHelperTest class
  *
@@ -584,6 +649,7 @@ class TestMail extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class FormHelperTest extends CakeTestCase {
+
 /**
  * fixtures property
  *
@@ -591,6 +657,7 @@ class FormHelperTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array(null);
+
 /**
  * setUp method
  *
@@ -628,6 +695,7 @@ class FormHelperTest extends CakeTestCase {
 
 		Configure::write('Security.salt', 'foo!');
 	}
+
 /**
  * tearDown method
  *
@@ -647,6 +715,7 @@ class FormHelperTest extends CakeTestCase {
 		unset($this->Form->Html, $this->Form, $this->Controller, $this->View);
 		Configure::write('Security.salt', $this->oldSalt);
 	}
+
 /**
  * testFormCreateWithSecurity method
  *
@@ -674,6 +743,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected['form']['id'] = 'MyForm';
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Tests form hash generation with model-less data
  *
@@ -685,6 +755,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->secure(array('anything'));
 		$this->assertPattern('/540ac9c60d323c22bafe997b72c0790f39a8bdef/', $result);
 	}
+
 /**
  * Tests that models with identical field names get resolved properly
  *
@@ -713,6 +784,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertPattern('/name="data\[ValidateUser\]\[name\]"/', $result);
 		$this->assertPattern('/type="text"/', $result);
 	}
+
 /**
  * Tests that hidden fields generated for checkboxes don't get locked
  *
@@ -726,6 +798,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->Form->checkbox('check', array('value' => '1'));
 		$this->assertIdentical($this->Form->fields, array('check'));
 	}
+
 /**
  * testFormSecurityFields method
  *
@@ -753,6 +826,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Tests correct generation of text fields for double and float fields
  *
@@ -782,6 +856,7 @@ class FormHelperTest extends CakeTestCase {
 			'/div'
 		);
 	}
+
 /**
  * testFormSecurityMultipleFields method
  *
@@ -815,6 +890,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormSecurityMultipleSubmitButtons
  *
@@ -856,6 +932,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormSecurityMultipleInputFields method
  *
@@ -903,6 +980,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormSecurityMultipleInputDisabledFields method
  *
@@ -946,6 +1024,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormSecurityInputDisabledFields method
  *
@@ -989,6 +1068,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormSecuredInput method
  *
@@ -1094,6 +1174,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Tests that the correct keys are added to the field hash index
  *
@@ -1111,6 +1192,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertEqual($this->Form->fields, $expected);
 	}
+
 /**
  * test that multiple selects keys are added to field hash
  *
@@ -1130,6 +1212,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->Form->select('Model.select', $options, null, array('multiple' => true));
 		$this->assertEqual($this->Form->fields, $expected);
 	}
+
 /**
  * testFormSecuredRadio method
  *
@@ -1145,6 +1228,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array('Test.test');
 		$this->assertEqual($this->Form->fields, $expected);
 	}
+
 /**
  * testPasswordValidation method
  *
@@ -1172,6 +1256,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormValidationAssociated method
  *
@@ -1213,6 +1298,7 @@ class FormHelperTest extends CakeTestCase {
 
 		unset($this->UserForm->OpenidUrl, $this->UserForm);
 	}
+
 /**
  * testFormValidationAssociatedFirstLevel method
  *
@@ -1252,6 +1338,7 @@ class FormHelperTest extends CakeTestCase {
 		unset($this->ValidateUser->ValidateProfile);
 		unset($this->ValidateUser);
 	}
+
 /**
  * testFormValidationAssociatedSecondLevel method
  *
@@ -1296,6 +1383,7 @@ class FormHelperTest extends CakeTestCase {
 		unset($this->ValidateUser->ValidateProfile);
 		unset($this->ValidateUser);
 	}
+
 /**
  * testFormValidationMultiRecord method
  *
@@ -1344,6 +1432,7 @@ class FormHelperTest extends CakeTestCase {
 			'/div'
 		);
 	}
+
 /**
  * testMultipleInputValidation method
  *
@@ -1416,6 +1505,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormInput method
  *
@@ -1921,6 +2011,7 @@ class FormHelperTest extends CakeTestCase {
 			$this->assertTags($result, $expected);
 		}
 	}
+
 /**
  * testFormInputs method
  *
@@ -2115,6 +2206,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSelectAsCheckbox method
  *
@@ -2148,6 +2240,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testLabel method
  *
@@ -2183,6 +2276,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->label('Person.2.name', '');
 		$this->assertTags($result, array('label' => array('for' => 'Person2Name'), '/label'));
 	}
+
 /**
  * testTextbox method
  *
@@ -2217,6 +2311,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testDefaultValue method
  *
@@ -2234,6 +2329,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->text('Model.field', array('default' => 'default value'));
 		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => 'default value', 'id' => 'ModelField')));
 	}
+
 /**
  * testFieldError method
  *
@@ -2270,6 +2366,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->error('Model.field', "<strong>Badness!</strong>", array('wrap' => false, 'escape' => false));
 		$this->assertEqual($result, '<strong>Badness!</strong>');
 	}
+
 /**
  * testPassword method
  *
@@ -2287,6 +2384,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->password('Model.passwd', array('id' => 'theID'));
 		$this->assertTags($result, array('input' => array('type' => 'password', 'name' => 'data[Model][passwd]', 'value' => 'test', 'id' => 'theID', 'class' => 'form-error')));
 	}
+
 /**
  * testRadio method
  *
@@ -2574,6 +2672,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSelect method
  *
@@ -2657,6 +2756,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Tests that FormHelper::select() allows null to be passed in the $attributes parameter
  *
@@ -2677,6 +2777,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testNestedSelect method
  *
@@ -2739,6 +2840,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSelectMultiple method
  *
@@ -2821,6 +2923,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * test generation of multi select elements in checkbox format
  *
@@ -2926,6 +3029,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Checks the security hash array generated for multiple-input checkbox elements
  *
@@ -2946,6 +3050,7 @@ class FormHelperTest extends CakeTestCase {
 		$key = 'f7d573650a295b94e0938d32b323fde775e5f32b%3An%3A0%3A%7B%7D';
 		$this->assertPattern('/"' . $key . '"/', $result);
 	}
+
 /**
  * testInputMultipleCheckboxes method
  *
@@ -3037,6 +3142,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testCheckbox method
  *
@@ -3152,6 +3258,7 @@ class FormHelperTest extends CakeTestCase {
 			);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Test that disabling a checkbox also disables the hidden input so no value is submitted
  *
@@ -3165,7 +3272,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
-	
+
 /**
  * Test that specifying false in the 'disabled' option will not disable either the hidden input or the checkbox input
  *
@@ -3179,7 +3286,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
-	
+
 /**
  * testDateTime method
  *
@@ -3676,6 +3783,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormDateTimeMulti method
  *
@@ -3765,6 +3873,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testMonth method
  *
@@ -3802,6 +3911,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testDay method
  *
@@ -3890,6 +4000,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testMinute method
  *
@@ -3982,6 +4093,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testHour method
  *
@@ -4076,6 +4188,7 @@ class FormHelperTest extends CakeTestCase {
 		$optValue = date('G');
 		$this->assertPattern('/<option value="' . $thisHour . '" selected="selected">'. $optValue .'<\/option>/', $result);
 	}
+
 /**
  * testYear method
  *
@@ -4222,6 +4335,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testTextArea method
  *
@@ -4271,6 +4385,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testTextAreaWithStupidCharacters method
  *
@@ -4295,6 +4410,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testHiddenField method
  *
@@ -4307,6 +4423,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->hidden('Model.field', array('id' => 'theID'));
 		$this->assertTags($result, array('input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'id' => 'theID', 'value' => 'test')));
 	}
+
 /**
  * testFileUploadField method
  *
@@ -4329,6 +4446,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * test File upload input on a model not used in create();
  *
@@ -4349,6 +4467,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testButton method
  *
@@ -4374,6 +4493,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->button('Upload Text', array('onClick' => "$('#postAddForm').ajaxSubmit({target: '#postTextUpload', url: '/posts/text'});return false;'", 'escape' => false));
 		$this->assertNoPattern('/\&039/', $result);
 	}
+
 /**
  * testSubmitButton method
  *
@@ -4457,6 +4577,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormCreate method
  *
@@ -4574,6 +4695,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * Test base form url when url param is passed with multiple parameters (&)
  *
@@ -4600,6 +4722,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected, true);
 	}
+
 /**
  * testGetFormCreate method
  *
@@ -4628,6 +4751,7 @@ class FormHelperTest extends CakeTestCase {
 			'name' => 'user_form', 'type' => 'text', 'value' => '', 'id' => 'ContactUserForm'
 		)));
 	}
+
 /**
  * testEditFormWithData method
  *
@@ -4666,6 +4790,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormMagicInput method
  *
@@ -4891,6 +5016,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testForMagicInputNonExistingNorValidated method
  *
@@ -4950,6 +5076,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormMagicInputLabel method
  *
@@ -5070,6 +5197,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFormEnd method
  *
@@ -5135,6 +5263,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testMultipleFormWithIdFields method
  *
@@ -5161,6 +5290,7 @@ class FormHelperTest extends CakeTestCase {
 			'value' => '', 'id' => 'ValidateUserId'
 		)));
 	}
+
 /**
  * testDbLessModel method
  *
@@ -5200,6 +5330,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testBrokenness method
  *
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index efdbdafcc..946e4388d 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * HtmlHelperTest file
  *
@@ -26,6 +27,7 @@
  */
 App::import('Core', array('Helper', 'AppHelper', 'ClassRegistry', 'Controller', 'Model'));
 App::import('Helper', array('Html', 'Form'));
+
 /**
  * TheHtmlTestController class
  *
@@ -33,6 +35,7 @@ App::import('Helper', array('Html', 'Form'));
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TheHtmlTestController extends Controller {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class TheHtmlTestController extends Controller {
  * @access public
  */
 	var $name = 'TheTest';
+
 /**
  * uses property
  *
@@ -48,6 +52,7 @@ class TheHtmlTestController extends Controller {
  */
 	var $uses = null;
 }
+
 /**
  * HtmlHelperTest class
  *
@@ -55,13 +60,39 @@ class TheHtmlTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class HtmlHelperTest extends CakeTestCase {
+
 /**
- * html property
+ * Html property
  *
- * @var mixed null
+ * @var object
  * @access public
  */
-	var $html = null;
+	var $Html = null;
+
+/**
+ * Backup of app encoding configuration setting
+ *
+ * @var string
+ * @access protected
+ */
+	var $_appEncoding;
+
+/**
+ * Backup of asset configuration settings
+ *
+ * @var string
+ * @access protected
+ */
+	var $_asset;
+
+/**
+ * Backup of debug configuration setting
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_debug;
+
 /**
  * setUp method
  *
@@ -73,7 +104,10 @@ class HtmlHelperTest extends CakeTestCase {
 		$view =& new View(new TheHtmlTestController());
 		ClassRegistry::addObject('view', $view);
 		$this->_appEncoding = Configure::read('App.encoding');
+		$this->_asset = Configure::read('Asset');
+		$this->_debug = Configure::read('debug');
 	}
+
 /**
  * tearDown method
  *
@@ -82,8 +116,11 @@ class HtmlHelperTest extends CakeTestCase {
  */
 	function tearDown() {
 		Configure::write('App.encoding', $this->_appEncoding);
+		Configure::write('Asset', $this->_asset);
+		Configure::write('debug', $this->_debug);
 		ClassRegistry::flush();
 	}
+
 /**
  * testDocType method
  *
@@ -101,6 +138,7 @@ class HtmlHelperTest extends CakeTestCase {
 
 		$this->assertNull($this->Html->docType('non-existing-doctype'));
 	}
+
 /**
  * testLink method
  *
@@ -228,6 +266,7 @@ class HtmlHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testImageTag method
  *
@@ -254,15 +293,37 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->image('cake.icon.gif');
 		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
 
-		$back = Configure::read('debug');
 		Configure::write('debug', 0);
 		Configure::write('Asset.timestamp', 'force');
 
 		$result = $this->Html->image('cake.icon.gif');
 		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
-
-		Configure::write('debug', $back);
 	}
+
+/**
+ * Tests creation of an image tag using a theme and asset timestamping
+ *
+ * @access public
+ * @return void
+ * @link https://trac.cakephp.org/ticket/6490
+ */
+	function testImageTagWithTheme() {
+		$file = WWW_ROOT . 'themed' . DS . 'default' . DS . 'img' . DS . 'cake.power.gif';
+		$message = "File '{$file}' not present. %s";
+		$this->skipUnless(file_exists($file), $message);
+
+		Configure::write('Asset.timestamp', true);
+		Configure::write('debug', 1);
+		$this->Html->themeWeb = 'themed/default/';
+
+		$result = $this->Html->image('cake.power.gif');
+		$this->assertTags($result, array(
+			'img' => array(
+				'src' => 'preg:/themed\/default\/img\/cake\.power\.gif\?\d+/',
+				'alt' => ''
+		)));
+	}
+
 /**
  * testStyle method
  *
@@ -279,6 +340,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$this->assertPattern('/^\s*display\s*:\s*none\s*;\s*$/', $lines[0]);
 		$this->assertPattern('/^\s*margin\s*:\s*10px\s*;?$/', $lines[1]);
 	}
+
 /**
  * testCssLink method
  *
@@ -331,7 +393,6 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css\?[0-9]+/';
 		$this->assertTags($result, $expected);
 
-		$debug = Configure::read('debug');
 		Configure::write('debug', 0);
 
 		$result = $this->Html->css('cake.generic');
@@ -357,9 +418,8 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected['link']['href'] = 'preg:/\/testing\/longer\/css\/cake\.generic\.css\?/';
 		$this->assertTags($result, $expected);
 		$this->Html->webroot = $webroot;
-
-		Configure::write('debug', $debug);
 	}
+
 /**
  * testCharsetTag method
  *
@@ -378,6 +438,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->charset('UTF-7');
 		$this->assertTags($result, array('meta' => array('http-equiv' => 'Content-Type', 'content' => 'text/html; charset=UTF-7')));
 	}
+
 /**
  * testBreadcrumb method
  *
@@ -447,6 +508,7 @@ class HtmlHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testNestedList method
  *
@@ -714,6 +776,7 @@ class HtmlHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testMeta method
  *
@@ -770,6 +833,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $view->__scripts[0];
 		$this->assertTags($result, array('meta' => array('name' => 'ROBOTS', 'content' => 'ALL')));
 	}
+
 /**
  * testTableHeaders method
  *
@@ -781,6 +845,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected = array('<tr', '<th', 'ID', '/th', '<th', 'Name', '/th', '<th', 'Date', '/th', '/tr');
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testTableCells method
  *
@@ -854,6 +919,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected = "<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testTag method
  *
@@ -873,6 +939,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->tag('div', '<text>', 'class-name', true);
 		$this->assertTags($result, array('div' => array('class' => 'class-name'), '&lt;text&gt;', '/div'));
 	}
+
 /**
  * testDiv method
  *
@@ -889,6 +956,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->div('class-name', '<text>', array(), true);
 		$this->assertTags($result, array('div' => array('class' => 'class-name'), '&lt;text&gt;', '/div'));
 	}
+
 /**
  * testPara method
  *
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 124f8a092..a9d546e06 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * JavascriptHelperTest file
  *
@@ -26,6 +27,7 @@
  */
 App::import('Core', array('Controller', 'View', 'ClassRegistry', 'View'));
 App::import('Helper', array('Javascript', 'Html', 'Form'));
+
 /**
  * TheJsTestController class
  *
@@ -33,6 +35,7 @@ App::import('Helper', array('Javascript', 'Html', 'Form'));
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TheJsTestController extends Controller {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class TheJsTestController extends Controller {
  * @access public
  */
 	var $name = 'TheTest';
+
 /**
  * uses property
  *
@@ -48,6 +52,7 @@ class TheJsTestController extends Controller {
  */
 	var $uses = null;
 }
+
 /**
  * TheView class
  *
@@ -55,6 +60,7 @@ class TheJsTestController extends Controller {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TheView extends View {
+
 /**
  * scripts method
  *
@@ -65,6 +71,7 @@ class TheView extends View {
 		return $this->__scripts;
 	}
 }
+
 /**
  * TestJavascriptObject class
  *
@@ -72,6 +79,7 @@ class TheView extends View {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TestJavascriptObject {
+
 /**
  * property1 property
  *
@@ -79,6 +87,7 @@ class TestJavascriptObject {
  * @access public
  */
 	var $property1 = 'value1';
+
 /**
  * property2 property
  *
@@ -87,6 +96,7 @@ class TestJavascriptObject {
  */
 	var $property2 = 2;
 }
+
 /**
  * JavascriptTest class
  *
@@ -95,32 +105,49 @@ class TestJavascriptObject {
  * @since         CakePHP Test Suite v 1.0.0.0
  */
 class JavascriptTest extends CakeTestCase {
+
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+
+/**
+ * Regexp for CDATA end block
+ *
+ * @var string
+ */
+	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+
 /**
  * setUp method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Javascript =& new JavascriptHelper();
 		$this->Javascript->Html =& new HtmlHelper();
 		$this->Javascript->Form =& new FormHelper();
 		$this->View =& new TheView(new TheJsTestController());
 		ClassRegistry::addObject('view', $this->View);
 	}
+
 /**
  * tearDown method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Javascript->Html);
 		unset($this->Javascript->Form);
 		unset($this->Javascript);
 		ClassRegistry::removeObject('view');
 		unset($this->View);
 	}
+
 /**
  * testConstruct method
  *
@@ -134,6 +161,7 @@ class JavascriptTest extends CakeTestCase {
 		$Javascript =& new JavascriptHelper(array('safe' => false));
 		$this->assertFalse($Javascript->safe);
 	}
+
 /**
  * testLink method
  *
@@ -195,6 +223,7 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertEqual(count($resultScripts), 1);
 		$this->assertEqual(current($resultScripts), $expected);
 	}
+
 /**
  * testFilteringAndTimestamping method
  *
@@ -261,6 +290,7 @@ class JavascriptTest extends CakeTestCase {
 
 		unlink(JS . '__cake_js_test.js');
 	}
+
 /**
  * testValue method
  *
@@ -307,6 +337,7 @@ class JavascriptTest extends CakeTestCase {
 		$expected = '"CakePHP: \\\'Rapid Development Framework\\\'"';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testObjectGeneration method
  *
@@ -356,11 +387,14 @@ class JavascriptTest extends CakeTestCase {
 
 		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
 		$result = $this->Javascript->object($object, array('block' => true));
-		$expected = '{"title":"New thing","indexes":[5,6,7,8]}';
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote($expected)) . '\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'{"title":"New thing","indexes":[5,6,7,8]}',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
 		$result = $this->Javascript->object($object);
@@ -378,6 +412,7 @@ class JavascriptTest extends CakeTestCase {
 			$this->Javascript->useNative = true;
 		}
 	}
+
 /**
  * testObjectNonNative method
  *
@@ -410,68 +445,101 @@ class JavascriptTest extends CakeTestCase {
  * @return void
  */
 	function testScriptBlock() {
-		ob_flush();
+		$result = $this->Javascript->codeBlock('something');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Javascript->codeBlock('something', array('allowCache' => true, 'safe' => false));
-		$this->assertPattern('/^<script[^<>]+>something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('allowCache' => false, 'safe' => false));
-		$this->assertPattern('/^<script[^<>]+>something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', true);
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', false);
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('safe' => false));
-		$this->assertPattern('/^<script[^<>]+>something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
-
-		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^<\/script>$/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('safe' => true));
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock(null, array('safe' => true, 'allowCache' => false));
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*$/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$this->assertNull($result);
+		echo 'this is some javascript';
 
 		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-
-		$result = $this->Javascript->codeBlock('something');
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'this is some javascript',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock();
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*$/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
-
+		$this->assertNull($result);
+		echo "alert('hey');";
 		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"alert('hey');",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Javascript->cacheEvents(false, true);
 		$this->assertFalse($this->Javascript->inBlock);
+
 		$result = $this->Javascript->codeBlock();
 		$this->assertIdentical($result, null);
 		$this->assertTrue($this->Javascript->inBlock);
@@ -484,6 +552,7 @@ class JavascriptTest extends CakeTestCase {
 		$result = $this->Javascript->getCache();
 		$this->assertEqual('alert("this is a buffered script");', $result);
 	}
+
 /**
  * testOutOfLineScriptWriting method
  *
@@ -491,12 +560,18 @@ class JavascriptTest extends CakeTestCase {
  * @return void
  */
 	function testOutOfLineScriptWriting() {
-		echo $this->Javascript->codeBlock('$(document).ready(function() { /* ... */ });', array('inline' => false));
+		echo $this->Javascript->codeBlock('$(document).ready(function() { });', array('inline' => false));
 
 		$this->Javascript->codeBlock(null, array('inline' => false));
-		echo '$(function(){ /* ... */ });';
+		echo '$(function(){ });';
 		$this->Javascript->blockEnd();
+		$script = $this->View->scripts();
+
+		$this->assertEqual(count($script), 2);
+		$this->assertPattern('/' . preg_quote('$(document).ready(function() { });', '/') . '/', $script[0]);
+		$this->assertPattern('/' . preg_quote('$(function(){ });', '/') . '/', $script[1]);
 	}
+
 /**
  * testEvent method
  *
@@ -505,52 +580,78 @@ class JavascriptTest extends CakeTestCase {
  */
 	function testEvent() {
 		$result = $this->Javascript->event('myId', 'click', 'something();');
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', array('safe' => false));
-		$this->assertPattern('/^<script[^<>]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click');
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) {  }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', false);
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', array('useCapture' => true));
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, true);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, true);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('document', 'load');
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe(document, \'load\', function(event) {  }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe(document, 'load', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('$(\'myId\')', 'click', 'something();', array('safe' => false));
-		$this->assertPattern('/^<script[^<>]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('\'document\'', 'load', 'something();', array('safe' => false));
-		$this->assertPattern('/^<script[^<>]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe(\'document\', \'load\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe('document', 'load', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Javascript->cacheEvents();
 		$result = $this->Javascript->event('myId', 'click', 'something();');
@@ -565,6 +666,7 @@ class JavascriptTest extends CakeTestCase {
 		$result = $this->Javascript->getCache();
 		$this->assertPattern('/^\s*var Rules = {\s*\'#myId\': function\(element, event\)\s*{\s*alert\(event\);\s*}\s*}\s*EventSelectors\.start\(Rules\);\s*$/s', $result);
 	}
+
 /**
  * testWriteEvents method
  *
@@ -577,10 +679,14 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertNull($result);
 
 		$result = $this->Javascript->writeEvents();
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
@@ -595,14 +701,20 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertNull($result);
 		$this->assertEqual(count($resultScripts), 1);
 		$result = current($resultScripts);
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
 	}
+
 /**
  * testEscapeScript method
  *
@@ -630,6 +742,7 @@ class JavascriptTest extends CakeTestCase {
 		$expected = 'CakePHP: \\\'Rapid Development Framework\\\'';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testEscapeString method
  *
@@ -673,6 +786,7 @@ class JavascriptTest extends CakeTestCase {
 		$expected = 'String with \\\n string that looks like newline';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test string escaping and compare to json_encode()
  *
@@ -698,10 +812,11 @@ class JavascriptTest extends CakeTestCase {
 
 		$data['mystring'] = "a \"double-quoted\" string";
 		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
-		
+
 		$data['mystring'] = 'a \\"double-quoted\\" string';
 		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
 	}
+
 /**
  * test that text encoded with Javascript::object decodes properly
  *
@@ -725,6 +840,7 @@ class JavascriptTest extends CakeTestCase {
 		$result = $this->Javascript->object($data);
 		$this->assertEqual(json_decode($result), $data);
 	}
+
 /**
  * testAfterRender method
  *
@@ -740,10 +856,14 @@ class JavascriptTest extends CakeTestCase {
 		$this->Javascript->afterRender();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*.+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index d0307089b..220da8285 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * JsHelperTest file
  *
@@ -34,6 +35,7 @@ uses(
 	'view' . DS . 'helper',
 	'view' . DS . 'helpers' . DS . 'js'
 	);
+
 /**
  * JsHelperTest class
  *
@@ -41,6 +43,7 @@ uses(
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class JsHelperTest extends UnitTestCase {
+
 /**
  * skip method
  *
@@ -50,6 +53,7 @@ class JsHelperTest extends UnitTestCase {
 	function skip() {
 		$this->skipIf(true, '%s JsHelper test not implemented');
 	}
+
 /**
  * setUp method
  *
@@ -59,6 +63,7 @@ class JsHelperTest extends UnitTestCase {
 	function setUp() {
 		$this->Js = new JsHelper();
 	}
+
 /**
  * tearDown method
  *
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php
index ccc54540b..e1213f119 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/cake/tests/cases/libs/view/helpers/number.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * NumberHelperTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Helper', 'Number');
+
 /**
  * NumberHelperTest class
  *
@@ -32,6 +34,7 @@ App::import('Helper', 'Number');
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class NumberHelperTest extends CakeTestCase {
+
 /**
  * helper property
  *
@@ -39,6 +42,7 @@ class NumberHelperTest extends CakeTestCase {
  * @access public
  */
 	var $helper = null;
+
 /**
  * setUp method
  *
@@ -48,6 +52,7 @@ class NumberHelperTest extends CakeTestCase {
 	function setUp() {
 		$this->Number =& new NumberHelper();
 	}
+
 /**
  * tearDown method
  *
@@ -57,6 +62,7 @@ class NumberHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Number);
 	}
+
 /**
  * testFormatAndCurrency method
  *
@@ -111,6 +117,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testCurrencyPositive method
  *
@@ -144,6 +151,7 @@ class NumberHelperTest extends CakeTestCase {
 		$expected = '&#163;100,100,100.00';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testCurrencyNegative method
  *
@@ -178,6 +186,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testCurrencyCentsPositive method
  *
@@ -200,6 +209,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testCurrencyCentsNegative method
  *
@@ -234,6 +244,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testCurrencyZero method
  *
@@ -260,6 +271,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testCurrencyOptions method
  *
@@ -282,6 +294,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 	}
+
 /**
  * testToReadableSize method
  *
@@ -345,6 +358,7 @@ class NumberHelperTest extends CakeTestCase {
 		$expected = (1024 * 1024) . '.00 TB';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testToPercentage method
  *
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 467115167..329328ae8 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * PaginatorHelperTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Helper', array('Html', 'Paginator', 'Form', 'Ajax', 'Javascript'));
+
 /**
  * PaginatorHelperTest class
  *
@@ -32,6 +34,7 @@ App::import('Helper', array('Html', 'Paginator', 'Form', 'Ajax', 'Javascript'));
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class PaginatorHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -69,6 +72,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		Configure::write('Routing.admin', '');
 		Router::reload();
 	}
+
 /**
  * tearDown method
  *
@@ -78,6 +82,7 @@ class PaginatorHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Paginator);
 	}
+
 /**
  * testHasPrevious method
  *
@@ -90,6 +95,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertIdentical($this->Paginator->hasPrev(), true);
 		$this->Paginator->params['paging']['Article']['prevPage'] = false;
 	}
+
 /**
  * testHasNext method
  *
@@ -102,6 +108,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertIdentical($this->Paginator->hasNext(), false);
 		$this->Paginator->params['paging']['Article']['nextPage'] = true;
 	}
+
 /**
  * testDisabledLink method
  *
@@ -116,10 +123,13 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['prevPage'] = false;
-		$result = $this->Paginator->prev('prev', array('update'=> 'theList', 'indicator'=> 'loading', 'url'=> array('controller' => 'posts')), null, array('class' => 'disabled', 'tag' => 'span'));
-		$expected = '<span class="disabled">prev</span>';
-		$this->assertEqual($result, $expected);
+		$result = $this->Paginator->prev('prev', array('update' => 'theList', 'indicator' => 'loading', 'url' => array('controller' => 'posts')), null, array('class' => 'disabled', 'tag' => 'span'));
+		$expected = array(
+			'span' => array('class' => 'disabled'), 'prev', '/span'
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSortLinks method
  *
@@ -135,25 +145,62 @@ class PaginatorHelperTest extends CakeTestCase {
 		));
 		$this->Paginator->options(array('url' => array('param')));
 		$result = $this->Paginator->sort('title');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc">Title<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->sort('date');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:date\/direction:desc">Date<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:date/direction:desc'),
+			'Date',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(array('modulus'=> '2', 'url'=> array('controller'=>'projects', 'action'=>'sort'),'update'=>'list'));
 		$this->assertPattern('/\/projects\/sort\/page:2/', $result);
 		$this->assertPattern('/<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*Event.observe/', $result);
 
 		$result = $this->Paginator->sort('TestTitle', 'title');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc">TestTitle<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'TestTitle',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->sort(array('asc' => 'ascending', 'desc' => 'descending'), 'title');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc">ascending<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'ascending',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['sort'] = 'title';
 		$result = $this->Paginator->sort(array('asc' => 'ascending', 'desc' => 'descending'), 'title');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc">descending<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:desc'),
+			'descending',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('title');
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc">Title<\/a>$/', $result);
+
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('title');
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc">Title<\/a>$/', $result);
 	}
+
 /**
  * testSortLinksUsingDotNotation method
  *
@@ -170,17 +217,32 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
 		$result = $this->Paginator->sort('Title','Article.title');
-		$this->assertPattern('/\/accounts\/index\/page:1\/sort:Article.title\/direction:asc">Title<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:Article.title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
 		$result = $this->Paginator->sort('Title','Article.title');
-		$this->assertPattern('/\/accounts\/index\/page:1\/sort:Article.title\/direction:desc">Title<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:Article.title/direction:desc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('Account.title' => 'asc');
 		$result = $this->Paginator->sort('title');
-		$this->assertPattern('/\/accounts\/index\/page:1\/sort:title\/direction:asc">Title<\/a>$/', $result);
-
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testSortKey method
  *
@@ -188,81 +250,82 @@ class PaginatorHelperTest extends CakeTestCase {
  * @return void
  */
 	function testSortKey() {
-
 		$result = $this->Paginator->sortKey(null, array(
 				'order' => array('Article.title' => 'desc'
 		)));
 		$this->assertEqual('Article.title', $result);
 	}
+
 /**
  * testSortDir method
  *
  * @access public
  * @return void
  */
-    function testSortDir() {
-        $result = $this->Paginator->sortDir();
-        $expected = 'asc';
+	function testSortDir() {
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
-        $result = $this->Paginator->sortDir();
-        $expected = 'desc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->Paginator->params['paging']['Article']['options']);
+		unset($this->Paginator->params['paging']['Article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
-        $result = $this->Paginator->sortDir();
-        $expected = 'asc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->Paginator->params['paging']['Article']['options']);
+		unset($this->Paginator->params['paging']['Article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('title' => 'desc');
-        $result = $this->Paginator->sortDir();
-        $expected = 'desc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->Paginator->params['paging']['Article']['options']);
+		unset($this->Paginator->params['paging']['Article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['order'] = array('title' => 'asc');
-        $result = $this->Paginator->sortDir();
-        $expected = 'asc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->Paginator->params['paging']['Article']['options']);
+		unset($this->Paginator->params['paging']['Article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['direction'] = 'asc';
-        $result = $this->Paginator->sortDir();
-        $expected = 'asc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->paginator->params['paging']['article']['options']);
+		unset($this->paginator->params['paging']['article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['direction'] = 'desc';
-        $result = $this->Paginator->sortDir();
-        $expected = 'desc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        unset($this->Paginator->params['paging']['Article']['options']);
-        $result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
-        $expected = 'asc';
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
+		$expected = 'asc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        $result = $this->Paginator->sortDir('Article', array('direction' => 'desc'));
-        $expected = 'desc';
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'desc'));
+		$expected = 'desc';
 
-        $this->assertEqual($result, $expected);
+		$this->assertEqual($result, $expected);
 
-        $result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
-        $expected = 'asc';
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+	}
 
-        $this->assertEqual($result, $expected);
-    }
 /**
  * testSortAdminLinks method
  *
@@ -280,8 +343,12 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::parse('/admin/users');
 		$this->Paginator->params['paging']['Article']['page'] = 1;
 		$result = $this->Paginator->next('Next');
-		$this->assertPattern('/^<a[^<>]+>Next<\/a>$/', $result);
-		$this->assertPattern('/href="\/admin\/users\/index\/page:2"/', $result);
+		$expected = array(
+			'a' => array('href' => '/admin/users/index/page:2'),
+			'Next',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		Router::reload();
 		Router::setRequestInfo(array(
@@ -291,13 +358,23 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::parse('/');
 		$this->Paginator->options(array('url' => array('param')));
 		$result = $this->Paginator->sort('title');
-		$this->assertPattern('/\/admin\/test\/index\/param\/page:1\/sort:title\/direction:asc"\s*>Title<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/admin/test/index/param/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->options(array('url' => array('param')));
 		$result = $this->Paginator->sort('Title', 'Article.title');
-		$this->assertPattern('/\/admin\/test\/index\/param\/page:1\/sort:Article.title\/direction:asc"\s*>Title<\/a>$/', $result);
-
+		$expected = array(
+			'a' => array('href' => '/admin/test/index/param/page:1/sort:Article.title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testUrlGeneration method
  *
@@ -306,8 +383,12 @@ class PaginatorHelperTest extends CakeTestCase {
  */
 	function testUrlGeneration() {
 		$result = $this->Paginator->sort('controller');
-		$this->assertPattern('/\/page:1\//', $result);
-		$this->assertPattern('/\/sort:controller\//', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:1/sort:controller/direction:asc'),
+			'Controller',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->url();
 		$this->assertEqual($result, '/index/page:1');
@@ -325,6 +406,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->url($options);
 		$this->assertEqual($result, '/index/page:3/sort:Article.name/direction:desc');
 	}
+
 /**
  * test URL generation with prefix routes
  *
@@ -351,16 +433,28 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Paginator->sort('name', null, array('url' => $options));
-		$expected = '<a href="/members/posts/index/page:2/sort:name/direction:asc">Name</a>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'a' => array('href' => '/members/posts/index/page:2/sort:name/direction:asc'),
+			'Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected, true);
 
 		$result = $this->Paginator->next('next', array('url' => $options));
-		$expected = '<a href="/members/posts/index/page:3">next</a>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'a' => array('href' => '/members/posts/index/page:3'),
+			'next',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('prev', array('url' => $options));
-		$expected = '<a href="/members/posts/index/page:1">prev</a>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'a' => array('href' => '/members/posts/index/page:1'),
+			'prev',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$options = array('members' => true, 'controller' => 'posts', 'order' => array('name' => 'desc'));
 		$result = $this->Paginator->url($options);
@@ -372,6 +466,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = '/posts/index/page:2/sort:Article.name/direction:desc';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testOptions method
  *
@@ -419,6 +514,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		));
 		$this->assertEqual($expected, $this->Paginator->params['paging']);
 	}
+
 /**
  * testPagingLinks method
  *
@@ -432,28 +528,54 @@ class PaginatorHelperTest extends CakeTestCase {
 			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
 		);
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
-		$expected = '<div class="disabled">&lt;&lt; Previous</div>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'div' => array('class' => 'disabled'),
+			'&lt;&lt; Previous',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled', 'tag' => 'span'));
-		$expected = '<span class="disabled">&lt;&lt; Previous</span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'span' => array('class' => 'disabled'),
+			'&lt;&lt; Previous',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Client']['page'] = 2;
 		$this->Paginator->params['paging']['Client']['prevPage'] = true;
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
-		$this->assertPattern('/^<a[^<>]+>&lt;&lt; Previous<\/a>$/', $result);
-		$this->assertPattern('/href="\/index\/page:1"/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt; Previous',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->next('Next');
-		$this->assertPattern('/^<a[^<>]+>Next<\/a>$/', $result);
-		$this->assertPattern('/href="\/index\/page:3"/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:3'),
+			'Next',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('<< Previous', array('escape' => true));
-		$this->assertPattern('/^<a[^<>]+>&lt;&lt; Previous<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt; Previous',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('<< Previous', array('escape' => false));
-		$this->assertPattern('/^<a[^<>]+><< Previous<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:1'),
+			'preg:/<< Previous/',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 1, 'current' => 1, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
@@ -462,13 +584,28 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
-		$this->assertPattern('/^<div>&lt;strong&gt;Disabled&lt;\/strong&gt;<\/div>$/', $result);
+		$expected = array(
+			'<div',
+			'&lt;strong&gt;Disabled&lt;/strong&gt;',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>', array('escape' => true));
-		$this->assertPattern('/^<div>&lt;strong&gt;Disabled&lt;\/strong&gt;<\/div>$/', $result);
+		$expected = array(
+			'<div',
+			'&lt;strong&gt;Disabled&lt;/strong&gt;',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>', array('escape' => false));
-		$this->assertPattern('/^<div><strong>Disabled<\/strong><\/div>$/', $result);
+		$expected = array(
+			'<div',
+			'<strong', 'Disabled', '/strong',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
@@ -479,10 +616,20 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->Paginator->params['paging']['Client']['page'] = 2;
 		$this->Paginator->params['paging']['Client']['prevPage'] = true;
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
-		$this->assertPattern('/\/sort:Client.name\/direction:DESC"/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:1/limit:3/sort:Client.name/direction:DESC'),
+			'&lt;&lt; Previous',
+			'/a'
+		);
+		$this->assertTags($result, $expected, true);
 
 		$result = $this->Paginator->next('Next');
-		$this->assertPattern('/\/sort:Client.name\/direction:DESC"/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:3/limit:3/sort:Client.name/direction:DESC'),
+			'Next',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 2, 'current' => 1, 'count' => 13, 'prevPage' => true, 'nextPage' => false, 'pageCount' => 2,
@@ -497,6 +644,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testPagingLinksNotDefaultModel
  *
@@ -520,12 +668,18 @@ class PaginatorHelperTest extends CakeTestCase {
 			)
 		);
 		$result = $this->Paginator->next('Next', array('model' => 'Client'));
-		$this->assertPattern('/^<a[^<>]+>Next<\/a>$/', $result);
-		$this->assertPattern('/href="\/index\/page:2"/', $result); // These is passed.
+		$expected = array(
+			'a' => array('href' => '/index/page:2'), 'Next', '/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->next('Next', array('model' => 'Server'), 'No Next', array('model' => 'Server'));
-		$this->assertPattern('/^<div>No Next<\/div>$/', $result);
+		$expected = array(
+			'<div', 'No Next', '/div'
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testGenericLinks method
  *
@@ -534,25 +688,32 @@ class PaginatorHelperTest extends CakeTestCase {
  */
 	function testGenericLinks() {
 		$result = $this->Paginator->link('Sort by title on page 5', array('sort' => 'title', 'page' => 5, 'direction' => 'desc'));
-		$this->assertPattern('/^<a href=".+"[^<>]*>Sort by title on page 5<\/a>$/', $result);
-		$this->assertPattern('/\/page:5/', $result);
-		$this->assertPattern('/\/sort:title/', $result);
-		$this->assertPattern('/\/direction:desc/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:5/sort:title/direction:desc'),
+			'Sort by title on page 5',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['page'] = 2;
 		$result = $this->Paginator->link('Sort by title', array('sort' => 'title', 'direction' => 'desc'));
-		$this->assertPattern('/^<a href=".+"[^<>]*>Sort by title<\/a>$/', $result);
-		$this->assertPattern('/\/page:2/', $result);
-		$this->assertPattern('/\/sort:title/', $result);
-		$this->assertPattern('/\/direction:desc/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:2/sort:title/direction:desc'),
+			'Sort by title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['options']['page'] = 4;
 		$result = $this->Paginator->link('Sort by title on page 4', array('sort' => 'Article.title', 'direction' => 'desc'));
-		$this->assertPattern('/^<a href=".+"[^<>]*>Sort by title on page 4<\/a>$/', $result);
-		$this->assertPattern('/\/page:4/', $result);
-		$this->assertPattern('/\/sort:Article.title/', $result);
-		$this->assertPattern('/\/direction:desc/', $result);
+		$expected = array(
+			'a' => array('href' => '/index/page:4/sort:Article.title/direction:desc'),
+			'Sort by title on page 4',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * Tests generation of generic links with preset options
  *
@@ -590,6 +751,7 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/a'
 		));
 	}
+
 /**
  * testNumbers method
  *
@@ -603,29 +765,116 @@ class PaginatorHelperTest extends CakeTestCase {
 			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
 		);
 		$result = $this->Paginator->numbers();
-		$expected = '<span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span class="current">8</span> | <span><a href="/index/page:9">9</a></span> | <span><a href="/index/page:10">10</a></span> | <span><a href="/index/page:11">11</a></span> | <span><a href="/index/page:12">12</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '8', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(array('tag' => 'li'));
-		$expected = '<li><a href="/index/page:4">4</a></li> | <li><a href="/index/page:5">5</a></li> | <li><a href="/index/page:6">6</a></li> | <li><a href="/index/page:7">7</a></li> | <li class="current">8</li> | <li><a href="/index/page:9">9</a></li> | <li><a href="/index/page:10">10</a></li> | <li><a href="/index/page:11">11</a></li> | <li><a href="/index/page:12">12</a></li>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('li' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/li',
+			' | ',
+			array('li' => array('class' => 'current')), '8', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/li',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(array('tag' => 'li', 'separator' => false));
-		$expected = '<li><a href="/index/page:4">4</a></li><li><a href="/index/page:5">5</a></li><li><a href="/index/page:6">6</a></li><li><a href="/index/page:7">7</a></li><li class="current">8</li><li><a href="/index/page:9">9</a></li><li><a href="/index/page:10">10</a></li><li><a href="/index/page:11">11</a></li><li><a href="/index/page:12">12</a></li>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('li' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/li',
+			array('li' => array('class' => 'current')), '8', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/li',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(true);
-		$expected = '<span><a href="/index/page:1">first</a></span> | <span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span class="current">8</span> | <span><a href="/index/page:9">9</a></span> | <span><a href="/index/page:10">10</a></span> | <span><a href="/index/page:11">11</a></span> | <span><a href="/index/page:12">12</a></span> | <span><a href="/index/page:15">last</a></span>';
-		$this->assertEqual($result, $expected);
-
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), 'first', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '8', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), 'last', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 1, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
 			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
 			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
 		);
 		$result = $this->Paginator->numbers();
-		$expected = '<span class="current">1</span> | <span><a href="/index/page:2">2</a></span> | <span><a href="/index/page:3">3</a></span> | <span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 14, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
@@ -633,8 +882,26 @@ class PaginatorHelperTest extends CakeTestCase {
 			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
 		);
 		$result = $this->Paginator->numbers();
-		$expected = '<span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span> | <span><a href="/index/page:10">10</a></span> | <span><a href="/index/page:11">11</a></span> | <span><a href="/index/page:12">12</a></span> | <span><a href="/index/page:13">13</a></span> | <span class="current">14</span> | <span><a href="/index/page:15">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '14', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), '15', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 2, 'current' => 3, 'count' => 27, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 9,
@@ -643,12 +910,48 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span> | <span class="current">2</span> | <span><a href="/index/page:3">3</a></span> | <span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(array('last' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span> | <span class="current">2</span> | <span><a href="/index/page:3">3</a></span> | <span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
@@ -657,8 +960,29 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span>...<span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span> | <span><a href="/index/page:10">10</a></span> | <span><a href="/index/page:11">11</a></span> | <span><a href="/index/page:12">12</a></span> | <span><a href="/index/page:13">13</a></span> | <span><a href="/index/page:14">14</a></span> | <span class="current">15</span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:14')), '14', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '15', '/span',
+
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 10, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
@@ -667,8 +991,30 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span>...<span><a href="/index/page:6">6</a></span> | <span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span> | <span class="current">10</span> | <span><a href="/index/page:11">11</a></span> | <span><a href="/index/page:12">12</a></span> | <span><a href="/index/page:13">13</a></span> | <span><a href="/index/page:14">14</a></span> | <span><a href="/index/page:15">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '10', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:14')), '14', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), '15', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 6, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
@@ -677,8 +1023,30 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span> | <span><a href="/index/page:2">2</a></span> | <span><a href="/index/page:3">3</a></span> | <span><a href="/index/page:4">4</a></span> | <span><a href="/index/page:5">5</a></span> | <span class="current">6</span> | <span><a href="/index/page:7">7</a></span> | <span><a href="/index/page:8">8</a></span> | <span><a href="/index/page:9">9</a></span> | <span><a href="/index/page:10">10</a></span>...<span><a href="/index/page:42">42</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '6', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:42')), '42', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 37, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
@@ -687,8 +1055,30 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
-		$expected = '<span><a href="/index/page:1">1</a></span>...<span><a href="/index/page:33">33</a></span> | <span><a href="/index/page:34">34</a></span> | <span><a href="/index/page:35">35</a></span> | <span><a href="/index/page:36">36</a></span> | <span class="current">37</span> | <span><a href="/index/page:38">38</a></span> | <span><a href="/index/page:39">39</a></span> | <span><a href="/index/page:40">40</a></span> | <span><a href="/index/page:41">41</a></span> | <span><a href="/index/page:42">42</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:33')), '33', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:34')), '34', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:35')), '35', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:36')), '36', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '37', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:38')), '38', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:39')), '39', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:40')), '40', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:41')), '41', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:42')), '42', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array(
 			'Client' => array(
@@ -714,8 +1104,14 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$options = array('modulus' => 10);
 		$result = $this->Paginator->numbers($options);
-		$expected = '<span class="current">1</span> | <span><a href="/index/page:2">2</a></span> | <span><a href="/index/page:3">3</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 2, 'current' => 10, 'count' => 31, 'prevPage' => true, 'nextPage' => true, 'pageCount' => 4,
@@ -723,9 +1119,194 @@ class PaginatorHelperTest extends CakeTestCase {
 			'options' => array('page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
 		);
 		$result = $this->Paginator->numbers();
-		$expected = '<span><a href="/index/page:1/sort:Client.name/direction:DESC">1</a></span> | <span class="current">2</span> | <span><a href="/index/page:3/sort:Client.name/direction:DESC">3</a></span> | <span><a href="/index/page:4/sort:Client.name/direction:DESC">4</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3/sort:Client.name/direction:DESC')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4/sort:Client.name/direction:DESC')), '4', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 4895, 'current' => 10, 'count' => 48962, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 4897,
+			'defaults' => array('limit' => 10),
+			'options' => array('page' => 4894, 'limit' => 10, 'order' => 'Client.name DESC', 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '4895', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 3;
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 5, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
+		$this->Paginator->params['paging']['Client']['page'] = 4893;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4891')), '4891', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4892')), '4892', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '4893', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
+		$this->Paginator->params['paging']['Client']['page'] = 58;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:56')), '56', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:57')), '57', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '58', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:59')), '59', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:60')), '60', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+		
+		$this->Paginator->params['paging']['Client']['page'] = 5;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '5', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testFirstAndLast method
  *
@@ -750,28 +1331,71 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->first();
-		$expected = '<span><a href="/index/page:1">&lt;&lt; first</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt; first',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->first('<<', array('tag' => 'li'));
-		$expected = '<li><a href="/index/page:1">&lt;&lt;</a></li>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'<li',
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt;',
+			'/a',
+			'/li'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last();
-		$expected = '<span><a href="/index/page:15">last &gt;&gt;</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:15'),
+			'last &gt;&gt;',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last(1);
-		$expected = '...<span><a href="/index/page:15">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'...',
+			'<span',
+			'a' => array('href' => '/index/page:15'),
+			'15',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last(2);
-		$expected = '...<span><a href="/index/page:14">14</a></span> | <span><a href="/index/page:15">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:14')), '14', '/a',
+			'/span',
+			' | ',
+			'<span',
+			array('a' => array('href' => '/index/page:15')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last(2, array('tag' => 'li'));
-		$expected = '...<li><a href="/index/page:14">14</a></li> | <li><a href="/index/page:15">15</a></li>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'...',
+			'<li',
+			array('a' => array('href' => '/index/page:14')), '14', '/a',
+			'/li',
+			' | ',
+			'<li',
+			array('a' => array('href' => '/index/page:15')), '15', '/a',
+			'/li',
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->params['paging'] = array('Client' => array(
 			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
@@ -789,21 +1413,44 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 
 		$result = $this->Paginator->first();
-		$expected = '<span><a href="/index/page:1/sort:Client.name/direction:DESC">&lt;&lt; first</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'<span',
+			array('a' => array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '&lt;&lt; first', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last();
-		$expected = '<span><a href="/index/page:15/sort:Client.name/direction:DESC">last &gt;&gt;</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), 'last &gt;&gt;', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last(1);
-		$expected = '...<span><a href="/index/page:15/sort:Client.name/direction:DESC">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->last(2);
-		$expected = '...<span><a href="/index/page:14/sort:Client.name/direction:DESC">14</a></span> | <span><a href="/index/page:15/sort:Client.name/direction:DESC">15</a></span>';
-		$this->assertEqual($result, $expected);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:14/sort:Client.name/direction:DESC')), '14', '/a',
+			'/span',
+			' | ',
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
 	}
+
 /**
  * testCounter method
  *
@@ -862,8 +1509,8 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->counter(array('format' => 'range'));
 		$expected = '1 - 3 of 13';
 		$this->assertEqual($result, $expected);
-
 	}
+
 /**
  * testHasPage method
  *
@@ -883,6 +1530,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->hasPage(2);
 		$this->assertTrue($result);
 	}
+
 /**
  * testWithPlugin method
  *
@@ -900,23 +1548,37 @@ class PaginatorHelperTest extends CakeTestCase {
 		));
 
 		$result = $this->Paginator->link('Page 3', array('page' => 3));
-		$this->assertPattern('/["\']\/my_plugin\/magazines\/index\/page:3["\']/', $result);
+		$expected = array(
+			'a' => array('href' => '/my_plugin/magazines/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->options(array('url' => array('action' => 'another_index')));
 		$result = $this->Paginator->link('Page 3', array('page' => 3));
-		$this->assertPattern('/["\']\/my_plugin\/magazines\/another_index\/page:3["\']/', $result);
+		$expected = array(
+			'a' => array('href' => '/my_plugin/magazines/another_index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->options(array('url' => array('controller' => 'issues')));
 		$result = $this->Paginator->link('Page 3', array('page' => 3));
-		$this->assertPattern('/["\']\/my_plugin\/issues\/index\/page:3["\']/', $result);
+		$expected = array(
+			'a' => array('href' => '/my_plugin/issues/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Paginator->options(array('url' => array('plugin' => null)));
 		$result = $this->Paginator->link('Page 3', array('page' => 3));
-		$this->assertPattern('/["\']\/magazines\/index\/page:3["\']/', $result);
+		$expected = array(
+			'a' => array('/magazines/index/page:3'), 'Page 3', '/a'
+		);
 
 		$this->Paginator->options(array('url' => array('plugin' => null, 'controller' => 'issues')));
 		$result = $this->Paginator->link('Page 3', array('page' => 3));
-		$this->assertPattern('/["\']\/issues\/index\/page:3["\']/', $result);
+		$expected = array(
+			'a' => array('href' => '/issues/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
 	}
 
 /**
@@ -944,7 +1606,12 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->Paginator->options($test);
 
 		$result = $this->Paginator->next('Next');
-		$this->assertPattern('/\/accounts\/index\/page:2\/sort:Article.title\/direction:asc">Next<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:2/sort:Article.title/direction:asc'),
+			'Next',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php
index 0f49570ff..eb0f321d3 100644
--- a/cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * RssHelperTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Helper', array('Rss', 'Time'));
+
 /**
  * RssHelperTest class
  *
@@ -32,6 +34,7 @@ App::import('Helper', array('Rss', 'Time'));
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class RssHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -46,6 +49,7 @@ class RssHelperTest extends CakeTestCase {
 		$manager =& XmlManager::getInstance();
 		$manager->namespaces = array();
 	}
+
 /**
  * tearDown method
  *
@@ -55,6 +59,7 @@ class RssHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Rss);
 	}
+
 /**
  * testAddNamespace method
  *
@@ -82,6 +87,7 @@ class RssHelperTest extends CakeTestCase {
 
 		$this->Rss->removeNs('dummy');
 	}
+
 /**
  * testRemoveNamespace method
  *
@@ -143,6 +149,7 @@ class RssHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testChannel method
  *
@@ -172,6 +179,7 @@ class RssHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * test correct creation of channel sub elements.
  *
@@ -261,6 +269,7 @@ class RssHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testItems method
  *
@@ -301,6 +310,7 @@ class RssHelperTest extends CakeTestCase {
 		$expected = '';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testItem method
  *
@@ -516,6 +526,7 @@ class RssHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 	}
+
 /**
  * testTime method
  *
@@ -524,6 +535,7 @@ class RssHelperTest extends CakeTestCase {
  */
 	function testTime() {
 	}
+
 /**
  * testElementAttrNotInParent method
  *
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index fb4d9d984..260b92b70 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * SessionHelperTest file
  *
@@ -29,6 +30,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 }
 App::import('Core', array('Helper', 'AppHelper', 'Controller', 'View'));
 App::import('Helper', array('Session'));
+
 /**
  * SessionHelperTest class
  *
@@ -36,6 +38,7 @@ App::import('Helper', array('Session'));
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class SessionHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -73,6 +76,7 @@ class SessionHelperTest extends CakeTestCase {
 			'Deeply' => array('nested' => array('key' => 'value')),
 		);
 	}
+
 /**
  * tearDown method
  *
@@ -83,6 +87,7 @@ class SessionHelperTest extends CakeTestCase {
 		$_SESSION = array();
 		unset($this->Session);
 	}
+
 /**
  * endTest
  *
@@ -91,7 +96,8 @@ class SessionHelperTest extends CakeTestCase {
  */
 	function endTest() {
 		App::build();
-	}	
+	}
+
 /**
  * testRead method
  *
@@ -105,6 +111,7 @@ class SessionHelperTest extends CakeTestCase {
 		$result = $this->Session->read('test');
 		$this->assertEqual($result, 'info');
 	}
+
 /**
  * testCheck method
  *
@@ -120,6 +127,7 @@ class SessionHelperTest extends CakeTestCase {
 
 		$this->assertFalse($this->Session->check('Nope'));
 	}
+
 /**
  * testWrite method
  *
@@ -130,6 +138,7 @@ class SessionHelperTest extends CakeTestCase {
 		$this->expectError();
 		$this->Session->write('NoWay', 'AccessDenied');
 	}
+
 /**
  * testFlash method
  *
@@ -177,6 +186,7 @@ class SessionHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 		$this->assertFalse($this->Session->check('Message.bare'));
 	}
+
 /**
  * testID method
  *
@@ -188,6 +198,7 @@ class SessionHelperTest extends CakeTestCase {
 		$result = $this->Session->id();
 		$this->assertEqual($id, $result);
 	}
+
 /**
  * testError method
  *
@@ -203,6 +214,7 @@ class SessionHelperTest extends CakeTestCase {
 		$expected = "CauseError doesn't exist";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDisabling method
  *
@@ -224,6 +236,7 @@ class SessionHelperTest extends CakeTestCase {
 		ob_clean();
 		$this->assertFalse($result);
 	}
+
 /**
  * testValid method
  *
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index 3360b8639..600882fef 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TextHelperTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Helper', 'Text');
+
 /**
  * TextHelperTest class
  *
@@ -32,6 +34,7 @@ App::import('Helper', 'Text');
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TextHelperTest extends CakeTestCase {
+
 /**
  * helper property
  *
@@ -39,6 +42,7 @@ class TextHelperTest extends CakeTestCase {
  * @access public
  */
 	var $helper = null;
+
 /**
  * setUp method
  *
@@ -48,6 +52,7 @@ class TextHelperTest extends CakeTestCase {
 	function setUp() {
 		$this->Text = new TextHelper();
 	}
+
 /**
  * tearDown method
  *
@@ -57,6 +62,7 @@ class TextHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Text);
 	}
+
 /**
  * testTruncate method
  *
@@ -106,6 +112,7 @@ class TextHelperTest extends CakeTestCase {
 			$this->testTruncate();
 		}
 	}
+
 /**
  * testHighlight method
  *
@@ -130,6 +137,7 @@ class TextHelperTest extends CakeTestCase {
 		$result = $this->Text->highlight($text, $phrases, '<b>\1</b>');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHighlightConsiderHtml method
  *
@@ -140,11 +148,22 @@ class TextHelperTest extends CakeTestCase {
 		$text1 = '<p>strongbow isn&rsquo;t real cider</p>';
 		$text2 = '<p>strongbow <strong>isn&rsquo;t</strong> real cider</p>';
 		$text3 = '<img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$text4 = 'What a strong mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+
+		$expected = '<p><b>strong</b>bow isn&rsquo;t real cider</p>';
+		$this->assertEqual($this->Text->highlight($text1, 'strong', '<b>\1</b>', true), $expected);
+
+		$expected = '<p><b>strong</b>bow <strong>isn&rsquo;t</strong> real cider</p>';
+		$this->assertEqual($this->Text->highlight($text2, 'strong', '<b>\1</b>', true), $expected);
 
-		$this->assertEqual($this->Text->highlight($text1, 'strong', '<b>\1</b>', true), '<p><b>strong</b>bow isn&rsquo;t real cider</p>');
-		$this->assertEqual($this->Text->highlight($text2, 'strong', '<b>\1</b>', true), '<p><b>strong</b>bow <strong>isn&rsquo;t</strong> real cider</p>');
 		$this->assertEqual($this->Text->highlight($text3, 'strong', '<b>\1</b>', true), $text3);
+
+		$this->assertEqual($this->Text->highlight($text3, array('strong', 'what'), '<b>\1</b>', true), $text3);
+
+		$expected = '<b>What</b> a <b>strong</b> mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$this->assertEqual($this->Text->highlight($text4, array('strong', 'what'), '<b>\1</b>', true), $expected);
 	}
+
 /**
  * testStripLinks method
  *
@@ -172,6 +191,7 @@ class TextHelperTest extends CakeTestCase {
 		$result = $this->Text->stripLinks($text);
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testAutoLink method
  *
@@ -189,6 +209,7 @@ class TextHelperTest extends CakeTestCase {
 		$expected = 'Text with a partial <a href="http://www.cakephp.org">www.cakephp.org</a> URL and <a href="mailto:test@cakephp\.org">test@cakephp\.org</a> email address';
 		$this->assertPattern('#^' . $expected . '$#', $result);
 	}
+
 /**
  * testAutoLinkUrls method
  *
@@ -227,6 +248,7 @@ class TextHelperTest extends CakeTestCase {
 		$this->assertPattern('#^' . $expected . '$#', $result);
 
 	}
+
 /**
  * testAutoLinkEmails method
  *
@@ -249,6 +271,7 @@ class TextHelperTest extends CakeTestCase {
 		$result = $this->Text->autoLinkEmails($text, array('class' => 'link'));
 		$this->assertPattern('#^' . $expected . '$#', $result);
 	}
+
 /**
  * testHighlightCaseInsensitivity method
  *
@@ -265,6 +288,7 @@ class TextHelperTest extends CakeTestCase {
 		$result = $this->Text->highlight($text, array('test'), '<b>\1</b>');
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testExcerpt method
  *
@@ -293,7 +317,18 @@ class TextHelperTest extends CakeTestCase {
 		$expected = '...phrase...';
 		$result = $this->Text->excerpt($text, 'phrase', 2, '...');
 		$this->assertEqual($expected, $result);
+
+		$phrase = 'This is a phrase with test';
+		$expected = $text;
+		$result = $this->Text->excerpt($text, $phrase, strlen($phrase) + 3, '...');
+		$this->assertEqual($expected, $result);
+
+		$phrase = 'This is a phrase with text';
+		$expected = $text;
+		$result = $this->Text->excerpt($text, $phrase, 10, '...');
+		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testExcerptCaseInsensitivity method
  *
@@ -311,6 +346,7 @@ class TextHelperTest extends CakeTestCase {
 		$result = $this->Text->excerpt($text, 'NOT_FOUND', 9, '...');
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testListGeneration method
  *
diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 1a92336c8..5f79549e5 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TimeHelperTest file
  *
@@ -28,6 +29,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 App::import('Helper', 'Time');
+
 /**
  * TimeHelperTest class
  *
@@ -35,6 +37,7 @@ App::import('Helper', 'Time');
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TimeHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -44,6 +47,7 @@ class TimeHelperTest extends CakeTestCase {
 	function setUp() {
 		$this->Time = new TimeHelper();
 	}
+
 /**
  * tearDown method
  *
@@ -53,6 +57,7 @@ class TimeHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Time);
 	}
+
 /**
  * testToQuarter method
  *
@@ -81,6 +86,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->toQuarter('2007-12-25', true);
 		$this->assertEqual($result, array('2007-10-01', '2007-12-31'));
 	}
+
 /**
  * testTimeAgoInWords method
  *
@@ -276,7 +282,25 @@ class TimeHelperTest extends CakeTestCase {
 		$fourHours = $this->Time->timeAgoInWords(strtotime('-5 days, -2 hours'), array('userOffset' => -4));
 		$result = $this->Time->timeAgoInWords(strtotime('-5 days, -2 hours'), array('userOffset' => 4));
 		$this->assertEqual($fourHours, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 hours'));
+		$expected = '2 hours ago';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-12 minutes'));
+		$expected = '12 minutes ago';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-12 seconds'));
+		$expected = '12 seconds ago';
+		$this->assertEqual($expected, $result);
+
+		$time = strtotime('-3 years -12 months');
+		$result = $this->Time->timeAgoInWords($time);
+		$expected = 'on ' . date('j/n/y', $time);
+		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testRelative method
  *
@@ -289,6 +313,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->relativeTime('+1 week');
 		$this->assertEqual($result, '1 week');
 	}
+
 /**
  * testNice method
  *
@@ -311,6 +336,7 @@ class TimeHelperTest extends CakeTestCase {
 		$time = null;
 		$this->assertEqual(date('D, M jS Y, H:i', time()), $this->Time->nice($time));
 	}
+
 /**
  * testNiceShort method
  *
@@ -331,6 +357,7 @@ class TimeHelperTest extends CakeTestCase {
 		$time = time() - DAY;
 		$this->assertEqual('Yesterday, '.date('H:i', $time), $this->Time->niceShort($time));
 	}
+
 /**
  * testDaysAsSql method
  *
@@ -344,6 +371,7 @@ class TimeHelperTest extends CakeTestCase {
 		$expected = '(my_field >= \''.date('Y-m-d', $begin).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $end).' 23:59:59\')';
 		$this->assertEqual($expected, $this->Time->daysAsSql($begin, $end, $field));
 	}
+
 /**
  * testDayAsSql method
  *
@@ -356,6 +384,7 @@ class TimeHelperTest extends CakeTestCase {
 		$expected = '(my_field >= \''.date('Y-m-d', $time).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $time).' 23:59:59\')';
 		$this->assertEqual($expected, $this->Time->dayAsSql($time, $field));
 	}
+
 /**
  * testToUnix method
  *
@@ -370,6 +399,7 @@ class TimeHelperTest extends CakeTestCase {
 		$this->assertEqual(false, $this->Time->toUnix(''));
 		$this->assertEqual(false, $this->Time->toUnix(null));
 	}
+
 /**
  * testToAtom method
  *
@@ -379,6 +409,7 @@ class TimeHelperTest extends CakeTestCase {
 	function testToAtom() {
 		$this->assertEqual(date('Y-m-d\TH:i:s\Z'), $this->Time->toAtom(time()));
 	}
+
 /**
  * testToRss method
  *
@@ -388,6 +419,7 @@ class TimeHelperTest extends CakeTestCase {
 	function testToRss() {
 		$this->assertEqual(date('r'), $this->Time->toRss(time()));
 	}
+
 /**
  * testFormat method
  *
@@ -404,6 +436,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->format('Y-m-d', null, 'never');
 		$this->assertEqual($result, 'never');
 	}
+
 /**
  * testOfGmt method
  *
@@ -430,6 +463,7 @@ class TimeHelperTest extends CakeTestCase {
 		$expected = gmmktime($hour, $min, $sec, $month, $day, $year);
 		$this->assertEqual($expected, $this->Time->gmt(null));
 	}
+
 /**
  * testIsToday method
  *
@@ -446,6 +480,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->isToday('-1 day');
 		$this->assertFalse($result);
 	}
+
 /**
  * testIsThisWeek method
  *
@@ -505,6 +540,7 @@ class TimeHelperTest extends CakeTestCase {
 				break;
 		}
 	}
+
 /**
  * testIsThisMonth method
  *
@@ -522,6 +558,7 @@ class TimeHelperTest extends CakeTestCase {
 		$this->assertFalse($result);
 
 	}
+
 /**
  * testIsThisYear method
  *
@@ -570,6 +607,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->isTomorrow('-1 day');
 		$this->assertFalse($result);
 	}
+
 /**
  * testWasWithinLast method
  *
@@ -630,6 +668,7 @@ class TimeHelperTest extends CakeTestCase {
 		$result = $this->Time->fromString(time(), $yourTimezone);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test fromString()
  *
diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php
index 514de9495..4a74943c4 100644
--- a/cake/tests/cases/libs/view/helpers/xml.test.php
+++ b/cake/tests/cases/libs/view/helpers/xml.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XmlHelperTest file
  *
@@ -28,6 +29,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 App::import('Helper', 'Xml');
+
 /**
  * TestXml class
  *
@@ -35,6 +37,7 @@ App::import('Helper', 'Xml');
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class TestXml extends Object {
+
 /**
  * content property
  *
@@ -42,6 +45,7 @@ class TestXml extends Object {
  * @access public
  */
 	var $content = '';
+
 /**
  * construct method
  *
@@ -52,6 +56,7 @@ class TestXml extends Object {
 	function __construct($content) {
 		$this->content = $content;
 	}
+
 /**
  * toString method
  *
@@ -62,6 +67,7 @@ class TestXml extends Object {
 		return $this->content;
 	}
 }
+
 /**
  * XmlHelperTest class
  *
@@ -69,6 +75,7 @@ class TestXml extends Object {
  * @subpackage    cake.tests.cases.libs.view.helpers
  */
 class XmlHelperTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -81,6 +88,7 @@ class XmlHelperTest extends CakeTestCase {
 		$manager =& XmlManager::getInstance();
 		$manager->namespaces = array();
 	}
+
 /**
  * tearDown method
  *
@@ -90,6 +98,7 @@ class XmlHelperTest extends CakeTestCase {
 	function tearDown() {
 		unset($this->Xml);
 	}
+
 /**
  * testAddNamespace method
  *
@@ -103,6 +112,7 @@ class XmlHelperTest extends CakeTestCase {
 		$expected = array('custom' => 'http://example.com/dtd.xml');
 		$this->assertEqual($manager->namespaces, $expected);
 	}
+
 /**
  * testRemoveNamespace method
  *
@@ -121,6 +131,7 @@ class XmlHelperTest extends CakeTestCase {
 		$expected = array('custom2' => 'http://example.com/dtd2.xml');
 		$this->assertEqual($manager->namespaces, $expected);
 	}
+
 /**
  * testRenderZeroElement method
  *
@@ -132,6 +143,7 @@ class XmlHelperTest extends CakeTestCase {
 		$expected = '<count>0</count>';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRenderElementWithNamespace method
  *
@@ -166,6 +178,7 @@ class XmlHelperTest extends CakeTestCase {
 		$expected = '<myNameSpace:count><![CDATA[content]]></myNameSpace:count>';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSerialize method
  *
@@ -210,6 +223,7 @@ class XmlHelperTest extends CakeTestCase {
 		$expected = '<pages id="2" url="http://www.url.com/rb/153/?id=bbbb&amp;t=access" />';
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testHeader method
  *
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index 4644bf11c..166e175d4 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ThemeViewTest file
  *
@@ -32,6 +33,7 @@ if (!class_exists('ErrorHandler')) {
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
+
 /**
  * ThemePostsController class
  *
@@ -39,6 +41,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
  * @subpackage    cake.tests.cases.libs.view
  */
 class ThemePostsController extends Controller {
+
 /**
  * name property
  *
@@ -46,6 +49,7 @@ class ThemePostsController extends Controller {
  * @access public
  */
 	var $name = 'ThemePosts';
+
 /**
  * index method
  *
@@ -59,6 +63,7 @@ class ThemePostsController extends Controller {
 		$this->set(compact('test2', 'test3'));
 	}
 }
+
 /**
  * ThemeViewTestErrorHandler class
  *
@@ -66,6 +71,7 @@ class ThemePostsController extends Controller {
  * @subpackage    cake.tests.cases.libs.view
  */
 class ThemeViewTestErrorHandler extends ErrorHandler {
+
 /**
  * stop method
  *
@@ -76,6 +82,7 @@ class ThemeViewTestErrorHandler extends ErrorHandler {
 		return;
 	}
 }
+
 /**
  * TestThemeView class
  *
@@ -83,6 +90,7 @@ class ThemeViewTestErrorHandler extends ErrorHandler {
  * @subpackage    cake.tests.cases.libs.view
  */
 class TestThemeView extends ThemeView {
+
 /**
  * renderElement method
  *
@@ -94,6 +102,7 @@ class TestThemeView extends ThemeView {
 	function renderElement($name, $params = array()) {
 		return $name;
 	}
+
 /**
  * getViewFileName method
  *
@@ -104,6 +113,7 @@ class TestThemeView extends ThemeView {
 	function getViewFileName($name = null) {
 		return $this->_getViewFileName($name);
 	}
+
 /**
  * getLayoutFileName method
  *
@@ -114,6 +124,7 @@ class TestThemeView extends ThemeView {
 	function getLayoutFileName($name = null) {
 		return $this->_getLayoutFileName($name);
 	}
+
 /**
  * cakeError method
  *
@@ -127,6 +138,7 @@ class TestThemeView extends ThemeView {
 		return $error;
 	}
 }
+
 /**
  * ThemeViewTest class
  *
@@ -134,6 +146,7 @@ class TestThemeView extends ThemeView {
  * @subpackage    cake.tests.cases.libs
  */
 class ThemeViewTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -148,6 +161,7 @@ class ThemeViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->ThemeView = new ThemeView($this->PostsController);
 	}
+
 /**
  * tearDown method
  *
@@ -159,6 +173,20 @@ class ThemeViewTest extends CakeTestCase {
 		unset($this->PostsController);
 		unset($this->Controller);
 	}
+
+/**
+ * startTest
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+	}
+
 /**
  * endTest
  *
@@ -167,7 +195,8 @@ class ThemeViewTest extends CakeTestCase {
  */
 	function endTest() {
 		App::build();
-	}	
+	}
+
 /**
  * testPluginGetTemplate method
  *
@@ -182,11 +211,6 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->theme = 'test_plugin_theme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
-		));
-
 		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'themed' . DS . 'test_plugin_theme' . DS .'tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
@@ -195,6 +219,7 @@ class ThemeViewTest extends CakeTestCase {
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testGetTemplate method
  *
@@ -210,12 +235,6 @@ class ThemeViewTest extends CakeTestCase {
 
 		$ThemeView = new TestThemeView($this->Controller);
 		$ThemeView->theme = 'test_theme';
-
-		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
-		));
-
 		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEqual($result, $expected);
@@ -238,6 +257,7 @@ class ThemeViewTest extends CakeTestCase {
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMissingView method
  *
@@ -262,6 +282,7 @@ class ThemeViewTest extends CakeTestCase {
 		$this->assertPattern("/PagesController::/", $expected);
 		$this->assertPattern("/views(\/|\\\)themed(\/|\\\)my_theme(\/|\\\)pages(\/|\\\)does_not_exist.ctp/", $expected);
 	}
+
 /**
  * testMissingLayout method
  *
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index aa678fb86..98f1caa2f 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ViewTest file
  *
@@ -32,6 +33,7 @@ if (!class_exists('ErrorHandler')) {
 if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
+
 /**
  * ViewPostsController class
  *
@@ -39,6 +41,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
  * @subpackage    cake.tests.cases.libs.view
  */
 class ViewPostsController extends Controller {
+
 /**
  * name property
  *
@@ -46,6 +49,7 @@ class ViewPostsController extends Controller {
  * @access public
  */
 	var $name = 'Posts';
+
 /**
  * uses property
  *
@@ -53,6 +57,7 @@ class ViewPostsController extends Controller {
  * @access public
  */
 	var $uses = null;
+
 /**
  * index method
  *
@@ -65,6 +70,7 @@ class ViewPostsController extends Controller {
 		$test3 = 'even more data';
 		$this->set(compact('test2', 'test3'));
 	}
+
 /**
  * nocache_tags_with_element method
  *
@@ -76,6 +82,7 @@ class ViewPostsController extends Controller {
 		$this->set('bar', 'this is bar var');
 	}
 }
+
 /**
  * ViewTestErrorHandler class
  *
@@ -83,6 +90,7 @@ class ViewPostsController extends Controller {
  * @subpackage    cake.tests.cases.libs.view
  */
 class ViewTestErrorHandler extends ErrorHandler {
+
 /**
  * stop method
  *
@@ -93,6 +101,7 @@ class ViewTestErrorHandler extends ErrorHandler {
 		return;
 	}
 }
+
 /**
  * TestView class
  *
@@ -100,6 +109,7 @@ class ViewTestErrorHandler extends ErrorHandler {
  * @subpackage    cake.tests.cases.libs.view
  */
 class TestView extends View {
+
 /**
  * renderElement method
  *
@@ -111,6 +121,7 @@ class TestView extends View {
 	function renderElement($name, $params = array()) {
 		return $name;
 	}
+
 /**
  * getViewFileName method
  *
@@ -121,6 +132,7 @@ class TestView extends View {
 	function getViewFileName($name = null) {
 		return $this->_getViewFileName($name);
 	}
+
 /**
  * getLayoutFileName method
  *
@@ -131,6 +143,7 @@ class TestView extends View {
 	function getLayoutFileName($name = null) {
 		return $this->_getLayoutFileName($name);
 	}
+
 /**
  * loadHelpers method
  *
@@ -143,6 +156,7 @@ class TestView extends View {
 	function loadHelpers(&$loaded, $helpers, $parent = null) {
 		return $this->_loadHelpers($loaded, $helpers, $parent);
 	}
+
 /**
  * cakeError method
  *
@@ -156,6 +170,7 @@ class TestView extends View {
 		return $error;
 	}
 }
+
 /**
  * TestAfterHelper class
  *
@@ -163,6 +178,7 @@ class TestView extends View {
  * @subpackage    cake.tests.cases.libs.view
  */
 class TestAfterHelper extends Helper {
+
 /**
  * property property
  *
@@ -170,6 +186,7 @@ class TestAfterHelper extends Helper {
  * @access public
  */
 	var $property = '';
+
 /**
  * beforeLayout method
  *
@@ -179,6 +196,7 @@ class TestAfterHelper extends Helper {
 	function beforeLayout() {
 		$this->property = 'Valuation';
 	}
+
 /**
  * afterLayout method
  *
@@ -191,6 +209,7 @@ class TestAfterHelper extends Helper {
 	}
 }
 Mock::generate('Helper', 'CallbackMockHelper');
+
 /**
  * ViewTest class
  *
@@ -198,6 +217,7 @@ Mock::generate('Helper', 'CallbackMockHelper');
  * @subpackage    cake.tests.cases.libs
  */
 class ViewTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -212,6 +232,7 @@ class ViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->View = new View($this->PostsController);
 	}
+
 /**
  * tearDown method
  *
@@ -223,6 +244,7 @@ class ViewTest extends CakeTestCase {
 		unset($this->PostsController);
 		unset($this->Controller);
 	}
+
 /**
  * endTest
  *
@@ -234,7 +256,8 @@ class ViewTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
-	}	
+	}
+
 /**
  * endTest
  *
@@ -243,7 +266,8 @@ class ViewTest extends CakeTestCase {
  */
 	function endTest() {
 		App::build();
-	}	
+	}
+
 /**
  * testPluginGetTemplate method
  *
@@ -266,6 +290,7 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test that CamelCase plugins still find their view files.
  *
@@ -289,6 +314,7 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testGetTemplate method
  *
@@ -303,7 +329,7 @@ class ViewTest extends CakeTestCase {
 		$this->Controller->params['pass'] = array('home');
 
 		$View = new TestView($this->Controller);
-		
+
 		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
 		$result = $View->getViewFileName('home');
 		$this->assertEqual($result, $expected);
@@ -331,6 +357,7 @@ class ViewTest extends CakeTestCase {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMissingView method
  *
@@ -352,6 +379,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern("/PagesController::/", $expected);
 		$this->assertPattern("/pages(\/|\\\)does_not_exist.ctp/", $expected);
 	}
+
 /**
  * testMissingLayout method
  *
@@ -372,6 +400,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern("/Missing Layout/", $expected);
 		$this->assertPattern("/layouts(\/|\\\)whatever.ctp/", $expected);
 	}
+
 /**
  * testViewVars method
  *
@@ -381,6 +410,7 @@ class ViewTest extends CakeTestCase {
 	function testViewVars() {
 		$this->assertEqual($this->View->viewVars, array('testData' => 'Some test data', 'test2' => 'more data', 'test3' => 'even more data'));
 	}
+
 /**
  * testUUIDGeneration method
  *
@@ -395,6 +425,7 @@ class ViewTest extends CakeTestCase {
 		$result = $this->View->uuid('form', array('controller' => 'posts', 'action' => 'index'));
 		$this->assertEqual($result, 'form3ecf2e3e96');
 	}
+
 /**
  * testAddInlineScripts method
  *
@@ -409,6 +440,7 @@ class ViewTest extends CakeTestCase {
 		$this->View->addScript('mainEvent', 'Event.observe(window, "load", function() { doSomething(); }, true);');
 		$this->assertEqual($this->View->__scripts, array('prototype.js', 'mainEvent' => 'Event.observe(window, "load", function() { doSomething(); }, true);'));
 	}
+
 /**
  * testElement method
  *
@@ -423,6 +455,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern('/Not Found:/', $result);
 		$this->assertPattern('/non_existant_element/', $result);
 	}
+
 /**
  * testElementCacheHelperNoCache method
  *
@@ -438,6 +471,7 @@ class ViewTest extends CakeTestCase {
 		$result = $View->element('test_element', array('ram' => 'val', 'test' => array('foo', 'bar')));
 		$this->assertEqual($result, 'this is the test element');
 	}
+
 /**
  * testElementCache method
  *
@@ -485,6 +519,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 	}
+
 /**
  * testLoadHelpers method
  *
@@ -506,6 +541,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertTrue(is_object($result['PluggedHelper']));
 		$this->assertTrue(is_object($result['PluggedHelper']->OtherHelper));
 	}
+
 /**
  * test the correct triggering of helper callbacks
  *
@@ -522,6 +558,7 @@ class ViewTest extends CakeTestCase {
 		$View->loaded['CallbackMock']->expectOnce('afterLayout');
 		$View->render('index');
 	}
+
 /**
  * testBeforeLayout method
  *
@@ -534,6 +571,7 @@ class ViewTest extends CakeTestCase {
 		$out = $View->render('index');
 		$this->assertEqual($View->loaded['testAfter']->property, 'Valuation');
 	}
+
 /**
  * testAfterLayout method
  *
@@ -552,6 +590,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern('/modified in the afterlife/', $result);
 		$this->assertPattern('/This is my view output/', $result);
 	}
+
 /**
  * testRenderLoadHelper method
  *
@@ -584,6 +623,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertTrue(is_object($helpers['ajax']->Html));
 		$this->assertTrue(is_object($helpers['pluggedHelper']->OtherHelper));
 	}
+
 /**
  * testRender method
  *
@@ -623,6 +663,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
 		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
 	}
+
 /**
  * testGetViewFileName method
  *
@@ -649,6 +690,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 	}
+
 /**
  * testRenderCache method
  *
@@ -679,12 +721,14 @@ class ViewTest extends CakeTestCase {
 		$this->assertFalse(empty($result));
 		@unlink($path);
 	}
+
 /**
  * testRenderNocache method
  *
  * @access public
  * @return void
  */
+
 /* This is a new test case for a pending enhancement
 	function testRenderNocache() {
 		$this->PostsController->helpers = array('Cache', 'Html');
@@ -716,6 +760,7 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern('/printing: "in sub1"/', $result);
 	}
 */
+
 /**
  * testSet method
  *
@@ -744,6 +789,7 @@ class ViewTest extends CakeTestCase {
 		$View->set(array('key3' => 'value3'));
 		$this->assertIdentical($View->getVar('key3'), 'value3');
 	}
+
 /**
  * testEntityReference method
  *
@@ -760,6 +806,7 @@ class ViewTest extends CakeTestCase {
 		$View->field = 'user_id';
 		$this->assertEqual($View->entity(), array('Comment', 'user_id'));
 	}
+
 /**
  * testBadExt method
  *
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 386a9d94b..88f70c55c 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XmlTest file
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Xml');
+
 /**
  * XmlTest class
  *
@@ -32,6 +34,7 @@ App::import('Core', 'Xml');
  * @subpackage    cake.tests.cases.libs
  */
 class XmlTest extends CakeTestCase {
+
 /**
  * setUp method
  *
@@ -42,6 +45,7 @@ class XmlTest extends CakeTestCase {
 		$manager =& new XmlManager();
 		$manager->namespaces = array();
 	}
+
 /**
  * testRootTagParsing method
  *
@@ -59,6 +63,7 @@ class XmlTest extends CakeTestCase {
 		$this->assertEqual($xml->children[0]->children[0]->name, 'current');
 		$this->assertEqual($xml->toString(true), $input);
 	}
+
 /**
  * testSerialization method
  *
@@ -118,7 +123,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(false);
 		$expected = '<data example="" />';
 		$this->assertEqual($result, $expected, 'Boolean values incorrectly handled. %s');
-		
+
 		$xml =& new Xml(array('data' => array('example' => 0)));
 		$result = $xml->toString(false);
 		$expected = '<data example="0" />';
@@ -129,6 +134,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<data example="1" />';
 		$this->assertEqual($result, $expected, 'Boolean-ish values incorrectly handled. %s');
 	}
+
 /**
  * testSimpleArray method
  *
@@ -142,6 +148,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<hello><![CDATA[world]]></hello>';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testSimpleObject method
  *
@@ -157,6 +164,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<hello><![CDATA[world]]></hello>';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testHeader method
  *
@@ -172,6 +180,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<'.'?xml version="1.0" encoding="UTF-8" ?'.'>'."\n".'<hello><![CDATA[world]]></hello>';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testOwnerAssignment method
  *
@@ -188,6 +197,7 @@ class XmlTest extends CakeTestCase {
 		$childOwner =& $children[0]->document();
 		$this->assertTrue($xml === $childOwner);
 	}
+
 /**
  * testArraySingleSerialization method
  *
@@ -220,6 +230,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(false);
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testArraySerialization method
  *
@@ -247,6 +258,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('header' => false, 'cdata' => false));
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testNestedArraySerialization method
  *
@@ -288,6 +300,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('header' => false, 'cdata' => false));
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * Prove that serialization with a given root node works
  * as expected.
@@ -308,6 +321,7 @@ class XmlTest extends CakeTestCase {
 		$result = $Xml->toString(array('header' => false));
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testCloneNode
  *
@@ -319,6 +333,7 @@ class XmlTest extends CakeTestCase {
 		$twin =& $node->cloneNode();
 		$this->assertEqual($node, $twin);
 	}
+
 /**
  * testNextSibling
  *
@@ -352,6 +367,7 @@ class XmlTest extends CakeTestCase {
 		$noFriends =& $xml->children[0]->children[12];
 		$this->assertNull($noFriends->nextSibling());
 	}
+
 /**
  * testPreviousSibling
  *
@@ -381,6 +397,7 @@ class XmlTest extends CakeTestCase {
 
 		$this->assertNull($prevSibling->previousSibling());
 	}
+
 /**
  * testAddAndRemoveAttributes
  *
@@ -578,6 +595,7 @@ class XmlTest extends CakeTestCase {
 	 	$result = $xml->toString(array('header' => false, 'cdata' => false));
 	 	$this->assertEqual($expected, $result);
 	} */
+
 /**
  * testAllCData method
  *
@@ -613,6 +631,7 @@ class XmlTest extends CakeTestCase {
 	 	$expected = '<project>&#233;c&#238;t</project>';
 	 	$this->assertEqual($result, $expected);
 	} */
+
 /**
  * testWhitespace method
  *
@@ -640,6 +659,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('header' => false, 'cdata' => false, 'whitespace' => true));
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testSetSerialization method
  *
@@ -667,6 +687,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('header' => false, 'cdata' => false));
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testSimpleParsing method
  *
@@ -679,6 +700,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString();
 		$this->assertEqual($source, $result);
 	}
+
 /**
  * test that elements with empty tag values do not collapse and corrupt data structures
  *
@@ -740,6 +762,7 @@ class XmlTest extends CakeTestCase {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMixedParsing method
  *
@@ -752,6 +775,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString();
 		$this->assertEqual($source, $result);
 	}
+
 /**
  * testComplexParsing method
  *
@@ -764,6 +788,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('cdata' => false));
 		$this->assertEqual($source, $result);
 	}
+
 /**
  * testNamespaceParsing method
  *
@@ -783,6 +808,7 @@ class XmlTest extends CakeTestCase {
 		$children = $children[0]->children('rule');
 		$this->assertEqual($children[0]->namespace, 'b');
 	}
+
 /**
  * testNamespaces method
  *
@@ -800,6 +826,7 @@ class XmlTest extends CakeTestCase {
 		$result = $xml->toString(array('cdata' => false));
 		$this->assertEqual($expects, $result);
 	}
+
 /**
  * testEscapeCharSerialization method
  *
@@ -813,6 +840,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<std_class text="JavaScript &amp; DHTML" />';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testCompleteEscapeCharSerialization method
  *
@@ -826,6 +854,7 @@ class XmlTest extends CakeTestCase {
 		$expected = '<std_class text="&lt;&gt;&amp;&quot;&#039;" />';
 		$this->assertEqual($expected, $result);
 	}
+
 /**
  * testToArray method
  *
@@ -1105,6 +1134,7 @@ class XmlTest extends CakeTestCase {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testAppend method
  *
@@ -1126,6 +1156,7 @@ class XmlTest extends CakeTestCase {
 		$this->expectError();
 		$parentNode->append($parentNode);
 	}
+
 /**
  * testNamespacing method
  *
@@ -1148,6 +1179,7 @@ class XmlTest extends CakeTestCase {
 		$node->addNamespace('cake', 'http://cakephp.org');
 		$this->assertEqual($node->toString(), '<xml xmlns:cake="http://cakephp.org" />');
 	}
+
 /**
  * testCamelize method
  *
@@ -1174,6 +1206,7 @@ class XmlTest extends CakeTestCase {
 						'Param' => array('Value' => array('i4' => 41)))));
 		$this->assertEqual($expected, $Xml->toArray());
 	}
+
 /**
  * testNumericDataHandling method
  *
diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php
index 5bd0e28c4..e0c786e3b 100644
--- a/cake/tests/fixtures/account_fixture.php
+++ b/cake/tests/fixtures/account_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AccountFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class AccountFixture extends CakeTestFixture {
  */
 	var $name = 'Account';
 	var $table = 'Accounts';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class AccountFixture extends CakeTestFixture {
 		'iAccountId'		=> array('type' => 'integer', 'key' => 'primary'),
 		'cDescription'	=> array('type' => 'string', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php
index 2c35d5fe6..88e6ba5bb 100644
--- a/cake/tests/fixtures/aco_action_fixture.php
+++ b/cake/tests/fixtures/aco_action_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AcoActionFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AcoActionFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AcoAction';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class AcoActionFixture extends CakeTestFixture {
 		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
 		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class AcoActionFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php
index 316925e81..57e0172dd 100644
--- a/cake/tests/fixtures/aco_fixture.php
+++ b/cake/tests/fixtures/aco_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AcoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AcoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Aco';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class AcoFixture extends CakeTestFixture {
 		'lft'		=> array('type' => 'integer', 'length' => 10, 'null' => true),
 		'rght'		=> array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php
index f139c9266..e372626ca 100644
--- a/cake/tests/fixtures/aco_two_fixture.php
+++ b/cake/tests/fixtures/aco_two_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AcoTwoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AcoTwoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AcoTwo';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class AcoTwoFixture extends CakeTestFixture {
 		'lft'		=> array('type' => 'integer', 'length' => 10, 'null' => true),
 		'rght'		=> array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php
index 370f98daa..cf7e88c2d 100644
--- a/cake/tests/fixtures/ad_fixture.php
+++ b/cake/tests/fixtures/ad_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for ad_fixture.php
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * AdFixture class
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AdFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -37,6 +40,7 @@ class AdFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Ad';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class AdFixture extends CakeTestFixture {
 		'rght' => array('type' => 'integer'),
 		'name' => array('type' => 'string', 'length' => 255, 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php
index f5062336a..4209bb838 100644
--- a/cake/tests/fixtures/advertisement_fixture.php
+++ b/cake/tests/fixtures/advertisement_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AdvertisementFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AdvertisementFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Advertisement';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class AdvertisementFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class AdvertisementFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php
index 68cd6fba7..3e1fc968e 100644
--- a/cake/tests/fixtures/after_tree_fixture.php
+++ b/cake/tests/fixtures/after_tree_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for after_tree_fixture.php
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * AdFixture class
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AfterTreeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -37,6 +40,7 @@ class AfterTreeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AfterTree';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class AfterTreeFixture extends CakeTestFixture {
 		'rght' => array('type' => 'integer'),
 		'name' => array('type' => 'string', 'length' => 255, 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php
index ec3d19c0c..86f01692d 100644
--- a/cake/tests/fixtures/another_article_fixture.php
+++ b/cake/tests/fixtures/another_article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AnotherArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AnotherArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AnotherArticle';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class AnotherArticleFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -63,4 +68,4 @@ class AnotherArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php
index d8d3e1250..2bc85a64a 100644
--- a/cake/tests/fixtures/apple_fixture.php
+++ b/cake/tests/fixtures/apple_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AppleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AppleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Apple';
+
 /**
  * fields property
  *
@@ -54,6 +58,7 @@ class AppleFixture extends CakeTestFixture {
 		'modified' => 'datetime',
 		'mytime' => 'time'
 	);
+
 /**
  * records property
  *
@@ -71,4 +76,4 @@ class AppleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php
index 96ae59828..b83038e40 100644
--- a/cake/tests/fixtures/aro_fixture.php
+++ b/cake/tests/fixtures/aro_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AroFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AroFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Aro';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class AroFixture extends CakeTestFixture {
 		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
 		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -67,4 +72,4 @@ class AroFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php
index a61d35c0b..55aca57c1 100644
--- a/cake/tests/fixtures/aro_two_fixture.php
+++ b/cake/tests/fixtures/aro_two_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AroTwoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AroTwoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AroTwo';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class AroTwoFixture extends CakeTestFixture {
 		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
 		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -73,4 +78,4 @@ class AroTwoFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php
index be181c6fb..ae0761769 100644
--- a/cake/tests/fixtures/aros_aco_fixture.php
+++ b/cake/tests/fixtures/aros_aco_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArosAcoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArosAcoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ArosAco';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class ArosAcoFixture extends CakeTestFixture {
 		'_update' => array('type' => 'string', 'length' => 2, 'default' => 0),
 		'_delete' => array('type' => 'string', 'length' => 2, 'default' => 0)
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class ArosAcoFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php
index 74866e5fe..a14e68d71 100644
--- a/cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArosAcoTwoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArosAcoTwoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ArosAcoTwo';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class ArosAcoTwoFixture extends CakeTestFixture {
 		'_update' => array('type' => 'string', 'length' => 2, 'default' => 0),
 		'_delete' => array('type' => 'string', 'length' => 2, 'default' => 0)
 	);
+
 /**
  * records property
  *
@@ -83,4 +88,4 @@ class ArosAcoTwoFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php
index 67b967499..01707a2f7 100644
--- a/cake/tests/fixtures/article_featured_fixture.php
+++ b/cake/tests/fixtures/article_featured_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArticleFeaturedFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArticleFeaturedFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ArticleFeatured';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class ArticleFeaturedFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -66,4 +71,4 @@ class ArticleFeaturedFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php
index e1ac130f6..56c5ae692 100644
--- a/cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArticleFeaturedsTagsFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArticleFeaturedsTagsFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ArticleFeaturedsTags';
+
 /**
  * fields property
  *
@@ -51,4 +55,4 @@ class ArticleFeaturedsTagsFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php
index fe2721d74..bacf5f433 100644
--- a/cake/tests/fixtures/article_fixture.php
+++ b/cake/tests/fixtures/article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Article';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class ArticleFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -66,4 +71,4 @@ class ArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php
index a19bcd142..52ad94ab3 100644
--- a/cake/tests/fixtures/articles_tag_fixture.php
+++ b/cake/tests/fixtures/articles_tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ArticlesTagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ArticlesTagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ArticlesTag';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class ArticlesTagFixture extends CakeTestFixture {
 		'tag_id' => array('type' => 'integer', 'null' => false),
 		'indexes' => array('UNIQUE_TAG' => array('column'=> array('article_id', 'tag_id'), 'unique'=>1))
 	);
+
 /**
  * records property
  *
@@ -63,4 +68,4 @@ class ArticlesTagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php
index de0d8b492..c12e26c46 100644
--- a/cake/tests/fixtures/attachment_fixture.php
+++ b/cake/tests/fixtures/attachment_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AttachmentFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AttachmentFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Attachment';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class AttachmentFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class AttachmentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php
index ebc2c3f29..c9731dd99 100644
--- a/cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AuthUserCustomFieldFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AuthUserCustomFieldFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AuthUserCustomField';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class AuthUserCustomFieldFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -67,4 +72,4 @@ class AuthUserCustomFieldFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php
index d16c7759e..1bd3e81e5 100644
--- a/cake/tests/fixtures/auth_user_fixture.php
+++ b/cake/tests/fixtures/auth_user_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AuthUserFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AuthUserFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'AuthUser';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class AuthUserFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -67,4 +72,4 @@ class AuthUserFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php
index 96ee0ea44..d511bcbb5 100644
--- a/cake/tests/fixtures/author_fixture.php
+++ b/cake/tests/fixtures/author_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class AuthorFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class AuthorFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Author';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class AuthorFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class AuthorFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php
index c20014ff3..346d91895 100644
--- a/cake/tests/fixtures/basket_fixture.php
+++ b/cake/tests/fixtures/basket_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class BasketFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class BasketFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Basket';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class BasketFixture extends CakeTestFixture {
 		'object_id' => array('type' => 'integer'),
 		'user_id' => array('type' => 'integer'),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php
index 9b118cca8..1c9fa4e7c 100644
--- a/cake/tests/fixtures/bid_fixture.php
+++ b/cake/tests/fixtures/bid_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class BidFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class BidFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Bid';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class BidFixture extends CakeTestFixture {
 		'message_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -63,4 +68,4 @@ class BidFixture extends CakeTestFixture {
 		array('message_id' => 2, 'name' => 'Bid 2.2')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php
index b9c09cbe2..dfe27d917 100644
--- a/cake/tests/fixtures/binary_test_fixture.php
+++ b/cake/tests/fixtures/binary_test_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class BinaryTestFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class BinaryTestFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'BinaryTest';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class BinaryTestFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'data' => 'binary'
 	);
+
 /**
  * records property
  *
@@ -57,4 +62,4 @@ class BinaryTestFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php
index 823408c8f..297251ea3 100644
--- a/cake/tests/fixtures/book_fixture.php
+++ b/cake/tests/fixtures/book_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class BookFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class BookFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Book';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class BookFixture extends CakeTestFixture {
 		'year' => array('type' => 'integer', 'null' => true),
 		'pages' => array('type' => 'integer', 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php
index ff4f855c0..e5cd6e0d5 100644
--- a/cake/tests/fixtures/cache_test_model_fixture.php
+++ b/cake/tests/fixtures/cache_test_model_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CacheTestModelFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CacheTestModelFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'CacheTestModel';
+
 /**
  * fields property
  *
@@ -51,4 +55,4 @@ class CacheTestModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index 6ef3d1eb5..299db85fa 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CallbackFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CallbackFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Callback';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class CallbackFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class CallbackFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php
index 2e91feb5e..9594b6a37 100644
--- a/cake/tests/fixtures/campaign_fixture.php
+++ b/cake/tests/fixtures/campaign_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for campaign_fixture.php
  *
@@ -23,6 +24,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * CampaignFixture class
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CampaignFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -37,6 +40,7 @@ class CampaignFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Campaign';
+
 /**
  * fields property
  *
@@ -47,6 +51,7 @@ class CampaignFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php
index 5cb04f106..54f3c9ddb 100644
--- a/cake/tests/fixtures/category_fixture.php
+++ b/cake/tests/fixtures/category_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CategoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CategoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Category';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class CategoryFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -69,4 +74,4 @@ class CategoryFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php
index 5da10d7d8..6c9b80b3d 100644
--- a/cake/tests/fixtures/category_thread_fixture.php
+++ b/cake/tests/fixtures/category_thread_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CategoryThreadFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CategoryThreadFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'CategoryThread';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class CategoryThreadFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -68,4 +73,4 @@ class CategoryThreadFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php
index 16b74f565..0cf6702be 100644
--- a/cake/tests/fixtures/cd_fixture.php
+++ b/cake/tests/fixtures/cd_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CdFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CdFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Cd';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class CdFixture extends CakeTestFixture {
 		'artist' => array('type' => 'string', 'length' => 255, 'null' => true),
 		'genre' => array('type' => 'string', 'length' => 255, 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php
index b2283c9af..45db545ac 100644
--- a/cake/tests/fixtures/comment_fixture.php
+++ b/cake/tests/fixtures/comment_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class CommentFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class CommentFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Comment';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class CommentFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -69,4 +74,4 @@ class CommentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php
index 8eb7be738..b92c74849 100644
--- a/cake/tests/fixtures/content_account_fixture.php
+++ b/cake/tests/fixtures/content_account_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ContentAccountFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class ContentAccountFixture extends CakeTestFixture {
  */
 	var $name = 'ContentAccount';
 	var $table = 'ContentAccounts';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class ContentAccountFixture extends CakeTestFixture {
 		'iContentId'		=> array('type' => 'integer'),
 		'iAccountId'		=> array('type' => 'integer')
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php
index b7e3131cd..f6b62500a 100644
--- a/cake/tests/fixtures/content_fixture.php
+++ b/cake/tests/fixtures/content_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ContentFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class ContentFixture extends CakeTestFixture {
  */
 	var $name = 'Content';
 	var $table = 'Content';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class ContentFixture extends CakeTestFixture {
 		'iContentId'		=> array('type' => 'integer', 'key' => 'primary'),
 		'cDescription'	=> array('type' => 'string', 'length' => 50, 'null' => true)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php
index eb9413072..68847d0ae 100644
--- a/cake/tests/fixtures/counter_cache_post_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_fixture.php
@@ -1,50 +1,52 @@
-<?php
-/* SVN FILE: $Id: counter_cache_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
-/**
- * Short description for file.
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
- * @since         CakePHP(tm) v 1.2.0.4667
- * @version       $Revision: 7848 $
- * @modifiedby    $LastChangedBy: renan.saddam $
- * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-/**
- * Short description for class.
- *
- * @package       cake
- * @subpackage    cake.tests.fixtures
- */
-class CounterCachePostFixture extends CakeTestFixture {
-
-	var $name = 'CounterCachePost';
-    
-	var $fields = array(
-		'id' => array('type' => 'integer', 'key' => 'primary'),
-		'title' => array('type' => 'string', 'length' => 255, 'null' => false),
-		'user_id' => array('type' => 'integer', 'null' => true),
-	);
-
-    var $records = array(
-		array('id' => 1, 'title' => 'Rock and Roll',  'user_id' => 66),
-		array('id' => 2, 'title' => 'Music',   'user_id' => 66),
-		array('id' => 3, 'title' => 'Food',   'user_id' => 301),
-    );
-}
-
+<?php
+/* SVN FILE: $Id: counter_cache_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
+
+/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @version       $Revision: 7848 $
+ * @modifiedby    $LastChangedBy: renan.saddam $
+ * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCachePostFixture extends CakeTestFixture {
+
+	var $name = 'CounterCachePost';
+
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'user_id' => array('type' => 'integer', 'null' => true),
+	);
+
+    var $records = array(
+		array('id' => 1, 'title' => 'Rock and Roll',  'user_id' => 66),
+		array('id' => 2, 'title' => 'Music',   'user_id' => 66),
+		array('id' => 3, 'title' => 'Food',   'user_id' => 301),
+    );
+}
+
 ?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
index 15c577dc2..34280e139 100644
--- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: counter_cache_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php
index ad592386a..253747059 100644
--- a/cake/tests/fixtures/counter_cache_user_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_fixture.php
@@ -1,49 +1,51 @@
-<?php
-/* SVN FILE: $Id: counter_cache_user_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
-/**
- * Short description for file.
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
- * @since         CakePHP(tm) v 1.2.0.4667
- * @version       $Revision: 7848 $
- * @modifiedby    $LastChangedBy: renan.saddam $
- * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-/**
- * Short description for class.
- *
- * @package       cake
- * @subpackage    cake.tests.fixtures
- */
-class CounterCacheUserFixture extends CakeTestFixture {
-
-	var $name = 'CounterCacheUser';
-
-	var $fields = array(
-		'id' => array('type' => 'integer', 'key' => 'primary'),
-		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
-		'post_count' => array('type' => 'integer', 'null' => true)
-	);
-
-	var $records = array(
-		array('id' => 66, 'name' => 'Alexander','post_count' => 2),
-		array('id' => 301, 'name' => 'Steven','post_count' => 1),
-	);
-}
-
+<?php
+/* SVN FILE: $Id: counter_cache_user_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
+
+/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @version       $Revision: 7848 $
+ * @modifiedby    $LastChangedBy: renan.saddam $
+ * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCacheUserFixture extends CakeTestFixture {
+
+	var $name = 'CounterCacheUser';
+
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'post_count' => array('type' => 'integer', 'null' => true)
+	);
+
+	var $records = array(
+		array('id' => 66, 'name' => 'Alexander','post_count' => 2),
+		array('id' => 301, 'name' => 'Steven','post_count' => 1),
+	);
+}
+
 ?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
index e7bb7658b..c1bdede1c 100644
--- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: counter_cache_user_fixture.php 7848 2008-11-08 02:58:37Z nate $ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date: 2008-11-07 21:58:37 -0500 (Fri, 07 Nov 2008) $
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index afed9aa9b..858fe2b9b 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DataTestFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DataTestFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'DataTest';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class DataTestFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'default' => null),
 		'updated' => array('type' => 'datetime', 'default' => null)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class DataTestFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 281da2f48..2c50095cb 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DatatypeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DatatypeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Datatype';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class DatatypeFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'null'=> false, 'default'=> 0, 'key' => 'primary'),
 		'float_field' => array('type' => 'float', 'length' => '5,2', 'null' => false, 'default' => null),
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class DatatypeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index 8b1720798..6f5b4ee9b 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -34,6 +36,7 @@
  * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
  */
 class DependencyFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -41,6 +44,7 @@ class DependencyFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Dependency';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class DependencyFixture extends CakeTestFixture {
 		'child_id' => 'integer',
 		'parent_id' => 'integer'
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class DependencyFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php
index 3b0638d15..83930aa35 100644
--- a/cake/tests/fixtures/device_fixture.php
+++ b/cake/tests/fixtures/device_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DeviceFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DeviceFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Device';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class DeviceFixture extends CakeTestFixture {
 		'name' => array('type' => 'string', 'null' => false),
 		'typ' => array('type' => 'integer', 'null' => false),
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class DeviceFixture extends CakeTestFixture {
 		array('device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php
index ee33c18b2..9a88e68e0 100644
--- a/cake/tests/fixtures/device_type_category_fixture.php
+++ b/cake/tests/fixtures/device_type_category_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DeviceTypeCategoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DeviceTypeCategoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'DeviceTypeCategory';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class DeviceTypeCategoryFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -58,4 +63,4 @@ class DeviceTypeCategoryFixture extends CakeTestFixture {
 		array('name' => 'DeviceTypeCategory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php
index cb8970a57..7f53948ad 100644
--- a/cake/tests/fixtures/device_type_fixture.php
+++ b/cake/tests/fixtures/device_type_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DeviceTypeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DeviceTypeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'DeviceType';
+
 /**
  * fields property
  *
@@ -55,6 +59,7 @@ class DeviceTypeFixture extends CakeTestFixture {
 		'name' => array('type' => 'string', 'null' => false),
 		'order' => array('type' => 'integer', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class DeviceTypeFixture extends CakeTestFixture {
 		array('device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php
index ff67dfa47..5be9aa916 100644
--- a/cake/tests/fixtures/document_directory_fixture.php
+++ b/cake/tests/fixtures/document_directory_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DocumentDirectoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DocumentDirectoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'DocumentDirectory';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class DocumentDirectoryFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -58,4 +63,4 @@ class DocumentDirectoryFixture extends CakeTestFixture {
 		array('name' => 'DocumentDirectory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php
index fde15f92d..6731b5389 100644
--- a/cake/tests/fixtures/document_fixture.php
+++ b/cake/tests/fixtures/document_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class DocumentFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class DocumentFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Document';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class DocumentFixture extends CakeTestFixture {
 		'document_directory_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class DocumentFixture extends CakeTestFixture {
 		array('document_directory_id' => 1, 'name' => 'Document 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php
index 0905c3eca..6672b5d2c 100644
--- a/cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ExteriorTypeCategoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ExteriorTypeCategory';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture {
 		'image_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture {
 		array('image_id' => 1, 'name' => 'ExteriorTypeCategory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php
index 533601535..a9df1ff29 100644
--- a/cake/tests/fixtures/feature_set_fixture.php
+++ b/cake/tests/fixtures/feature_set_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FeatureSetFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class FeatureSetFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'FeatureSet';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class FeatureSetFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -58,4 +63,4 @@ class FeatureSetFixture extends CakeTestFixture {
 		array('name' => 'FeatureSet 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php
index 3f3e83372..8ab6c992b 100644
--- a/cake/tests/fixtures/featured_fixture.php
+++ b/cake/tests/fixtures/featured_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FeaturedFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class FeaturedFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Featured';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class FeaturedFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class FeaturedFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php
index 1483947a3..f5a88d421 100644
--- a/cake/tests/fixtures/film_file_fixture.php
+++ b/cake/tests/fixtures/film_file_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FilmFileFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class FilmFileFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'FilmFile';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class FilmFileFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'length' => 255)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index d81744261..7cd9546bf 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Tree behavior class test fixture.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Flag Tree Test Fixture
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FlagTreeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class FlagTreeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'FlagTree';
+
 /**
  * fields property
  *
@@ -56,4 +60,4 @@ class FlagTreeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php
index bf90baea8..208e79144 100644
--- a/cake/tests/fixtures/fruit_fixture.php
+++ b/cake/tests/fixtures/fruit_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FruitFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class FruitFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Fruit';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class FruitFixture extends CakeTestFixture {
 		'shape' => array('type' => 'string', 'length' =>  255),
 		'taste' => array('type' => 'string', 'length' => 255)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
index 7c84c660d..9c1305b61 100644
--- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php
+++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class FruitsUuidTagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class FruitsUuidTagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'FruitsUuidTag';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class FruitsUuidTagFixture extends CakeTestFixture {
 			'unique_fruits_tags' => array('unique' => true, 'column' => array('fruit_id', 'uuid_tag_id')),
 		),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php
index f88b8f7b0..623936037 100644
--- a/cake/tests/fixtures/home_fixture.php
+++ b/cake/tests/fixtures/home_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class HomeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class HomeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Home';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class HomeFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class HomeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php
index e30862fc9..30fdc591c 100644
--- a/cake/tests/fixtures/image_fixture.php
+++ b/cake/tests/fixtures/image_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ImageFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ImageFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Image';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class ImageFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class ImageFixture extends CakeTestFixture {
 		array('name' => 'Image 5')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php
index 1602fb698..04e0cf075 100644
--- a/cake/tests/fixtures/item_fixture.php
+++ b/cake/tests/fixtures/item_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ItemFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ItemFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Item';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class ItemFixture extends CakeTestFixture {
 		'published' => array('type' => 'boolean', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class ItemFixture extends CakeTestFixture {
 		array('syfile_id' => 6, 'published' => 0, 'name' => 'Item 6')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php
index fb7dd71bb..693038a6f 100644
--- a/cake/tests/fixtures/items_portfolio_fixture.php
+++ b/cake/tests/fixtures/items_portfolio_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ItemsPortfolioFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ItemsPortfolioFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ItemsPortfolio';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class ItemsPortfolioFixture extends CakeTestFixture {
 		'item_id' => array('type' => 'integer', 'null' => false),
 		'portfolio_id' => array('type' => 'integer', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class ItemsPortfolioFixture extends CakeTestFixture {
 		array('item_id' => 6, 'portfolio_id' => 2)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php
index c1a5db5df..476d68284 100644
--- a/cake/tests/fixtures/join_a_b_fixture.php
+++ b/cake/tests/fixtures/join_a_b_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinABFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinABFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinAsJoinB';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class JoinABFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class JoinABFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php
index 2fc335b3e..2fd5ebff9 100644
--- a/cake/tests/fixtures/join_a_c_fixture.php
+++ b/cake/tests/fixtures/join_a_c_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinACFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinACFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinAsJoinC';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class JoinACFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class JoinACFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php
index a4401e452..63bb6bdfa 100644
--- a/cake/tests/fixtures/join_a_fixture.php
+++ b/cake/tests/fixtures/join_a_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinAFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinAFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinA';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class JoinAFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class JoinAFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php
index 16294ce97..630d96ff3 100644
--- a/cake/tests/fixtures/join_b_fixture.php
+++ b/cake/tests/fixtures/join_b_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinBFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinBFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinB';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class JoinBFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class JoinBFixture extends CakeTestFixture {
 		array('name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php
index 333f3e28b..9462226bc 100644
--- a/cake/tests/fixtures/join_c_fixture.php
+++ b/cake/tests/fixtures/join_c_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinCFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinCFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinC';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class JoinCFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class JoinCFixture extends CakeTestFixture {
 		array('name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index 59ebe680c..8be6fcdd1 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class JoinThingFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class JoinThingFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'JoinThing';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class JoinThingFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class JoinThingFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php
index 94b53d5ca..448ae8a70 100644
--- a/cake/tests/fixtures/message_fixture.php
+++ b/cake/tests/fixtures/message_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MessageFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MessageFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Message';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class MessageFixture extends CakeTestFixture {
 		'thread_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class MessageFixture extends CakeTestFixture {
 		array('thread_id' => 3, 'name' => 'Thread 3, Message 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php
index b570340fc..575504c2f 100644
--- a/cake/tests/fixtures/my_categories_my_products_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_products_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MyCategoriesMyProductsFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyCategoriesMyProductsFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'MyCategoriesMyProducts';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class MyCategoriesMyProductsFixture extends CakeTestFixture {
 		'my_category_id' => array('type' => 'integer'),
 		'my_product_id' => array('type' => 'integer'),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php
index d708d8dc5..af715716a 100644
--- a/cake/tests/fixtures/my_categories_my_users_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_users_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MyCategoriesMyUsersFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyCategoriesMyUsersFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'MyCategoriesMyUsers';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class MyCategoriesMyUsersFixture extends CakeTestFixture {
 		'my_category_id' => array('type' => 'integer'),
 		'my_user_id' => array('type' => 'integer'),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php
index c333890c3..0c03821b1 100644
--- a/cake/tests/fixtures/my_category_fixture.php
+++ b/cake/tests/fixtures/my_category_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MyCategoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyCategoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'MyCategory';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class MyCategoryFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php
index 9e2f7948a..2cbca54a9 100644
--- a/cake/tests/fixtures/my_product_fixture.php
+++ b/cake/tests/fixtures/my_product_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MyProductFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyProductFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'MyProduct';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class MyProductFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false),
 	);
+
 /**
  * records property
  *
@@ -60,4 +65,4 @@ class MyProductFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php
index 1806851a8..6a7e18cae 100644
--- a/cake/tests/fixtures/my_user_fixture.php
+++ b/cake/tests/fixtures/my_user_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class MyUserFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class MyUserFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'MyUser';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class MyUserFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'firstname' => array('type' => 'string', 'null' => false),
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index a75ac25ae..c290eba59 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Short description for file.
  *
@@ -34,6 +36,7 @@
  * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
  */
 class NodeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -41,6 +44,7 @@ class NodeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Node';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class NodeFixture extends CakeTestFixture {
 		'name' => 'string',
 		'state' => 'integer'
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class NodeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php
index 4e1b973e8..4e9bf55c5 100644
--- a/cake/tests/fixtures/number_tree_fixture.php
+++ b/cake/tests/fixtures/number_tree_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Tree behavior class.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Number Tree Test Fixture
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class NumberTreeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class NumberTreeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'NumberTree';
+
 /**
  * fields property
  *
@@ -55,4 +59,4 @@ class NumberTreeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php
index 244191c32..443b8b206 100644
--- a/cake/tests/fixtures/number_tree_two_fixture.php
+++ b/cake/tests/fixtures/number_tree_two_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Tree behavior class.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Number Tree Test Fixture
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class NumberTreeTwoFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -40,6 +43,7 @@ class NumberTreeTwoFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'NumberTreeTwo';
+
 /**
  * fields property
  *
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php
index 44fdce11c..ef22a13dd 100644
--- a/cake/tests/fixtures/numeric_article_fixture.php
+++ b/cake/tests/fixtures/numeric_article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class NumericArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class NumericArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'NumericArticle';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class NumericArticleFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -62,4 +67,4 @@ class NumericArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php
index b36ba1b44..bb8654363 100644
--- a/cake/tests/fixtures/overall_favorite_fixture.php
+++ b/cake/tests/fixtures/overall_favorite_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class OverallFavoriteFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class OverallFavoriteFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'OverallFavorite';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class OverallFavoriteFixture extends CakeTestFixture {
 		'model_id' => array('type' => 'integer'),
 		'priority' => array('type' => 'integer')
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php
index 160befaeb..57d5e0e87 100644
--- a/cake/tests/fixtures/person_fixture.php
+++ b/cake/tests/fixtures/person_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class PersonFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class PersonFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Person';
+
 /**
  * fields property
  *
@@ -54,6 +58,7 @@ class PersonFixture extends CakeTestFixture {
 			'mother_id' => array('column' => array('mother_id', 'father_id'), 'unique' => 0)
 		)
 	);
+
 /**
  * records property
  *
@@ -70,4 +75,4 @@ class PersonFixture extends CakeTestFixture {
 		array('name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php
index 7b4bcb584..d72c59d49 100644
--- a/cake/tests/fixtures/portfolio_fixture.php
+++ b/cake/tests/fixtures/portfolio_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class PortfolioFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class PortfolioFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Portfolio';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class PortfolioFixture extends CakeTestFixture {
 		'seller_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class PortfolioFixture extends CakeTestFixture {
 		array('seller_id' => 2, 'name' => 'Portfolio 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php
index 9277517ed..824435714 100644
--- a/cake/tests/fixtures/post_fixture.php
+++ b/cake/tests/fixtures/post_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class PostFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class PostFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Post';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class PostFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class PostFixture extends CakeTestFixture {
 		array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php
index 2c4ae6c7f..843516969 100644
--- a/cake/tests/fixtures/posts_tag_fixture.php
+++ b/cake/tests/fixtures/posts_tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class PostsTagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class PostsTagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'PostsTag';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class PostsTagFixture extends CakeTestFixture {
 		'tag_id' => array('type' => 'string', 'null' => false),
 		'indexes' => array('posts_tag' => array('column' => array('tag_id', 'post_id'), 'unique' => 1))
 	);
+
 /**
  * records property
  *
@@ -63,4 +68,4 @@ class PostsTagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php
index 8c0b3e7bc..e86f259dc 100644
--- a/cake/tests/fixtures/primary_model_fixture.php
+++ b/cake/tests/fixtures/primary_model_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class PrimaryModelFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class PrimaryModelFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'PrimaryModel';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class PrimaryModelFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'primary_name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class PrimaryModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php
index 9355030eb..e04527935 100644
--- a/cake/tests/fixtures/product_fixture.php
+++ b/cake/tests/fixtures/product_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ProductFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ProductFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Product';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class ProductFixture extends CakeTestFixture {
 		'type' => array('type' => 'string', 'length' => 255, 'null' => false),
 		'price' => array('type' => 'integer', 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php
index 6f48b05b8..26618de51 100644
--- a/cake/tests/fixtures/project_fixture.php
+++ b/cake/tests/fixtures/project_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ProjectFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ProjectFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Project';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class ProjectFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -60,4 +65,4 @@ class ProjectFixture extends CakeTestFixture {
 		array('name' => 'Project 3')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php
index 87448938a..20a331bb6 100644
--- a/cake/tests/fixtures/sample_fixture.php
+++ b/cake/tests/fixtures/sample_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SampleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SampleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Sample';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class SampleFixture extends CakeTestFixture {
 		'apple_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'length' => 40, 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class SampleFixture extends CakeTestFixture {
 		array('apple_id' => 4, 'name' => 'sample3'),
 		array('apple_id' => 5, 'name' => 'sample4')
 	);
-}
+}
\ No newline at end of file
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php
index 8c7ccfc3a..d16367f0b 100644
--- a/cake/tests/fixtures/secondary_model_fixture.php
+++ b/cake/tests/fixtures/secondary_model_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SecondaryModelFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SecondaryModelFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'SecondaryModel';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class SecondaryModelFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'secondary_name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class SecondaryModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php
index 1dc3c751a..e1e3d038d 100644
--- a/cake/tests/fixtures/session_fixture.php
+++ b/cake/tests/fixtures/session_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SessionFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SessionFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Session';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class SessionFixture extends CakeTestFixture {
 		'data' => array('type' => 'text','null' => true),
 		'expires' => array('type' => 'integer', 'length' => 11, 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -57,4 +62,4 @@ class SessionFixture extends CakeTestFixture {
  */
 	var $records = array();
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index 7b6dbd2cd..3bb061ff6 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SomethingElseFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SomethingElseFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'SomethingElse';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class SomethingElseFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class SomethingElseFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index cecfb3f9d..b6995cccc 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SomethingFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SomethingFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Something';
+
 /**
  * fields property
  *
@@ -52,6 +56,7 @@ class SomethingFixture extends CakeTestFixture {
 		'created' => array('type' => 'datetime', 'null' => true),
 		'updated' => array('type' => 'datetime', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class SomethingFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php
index b39566abb..52f69c7eb 100644
--- a/cake/tests/fixtures/stories_tag_fixture.php
+++ b/cake/tests/fixtures/stories_tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class StoriesTagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class StoriesTagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'StoriesTag';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class StoriesTagFixture extends CakeTestFixture {
 		'tag_id' => array('type' => 'integer', 'null' => false),
 		'indexes' => array('UNIQUE_STORY_TAG' => array('column'=> array('story', 'tag_id'), 'unique'=>1))
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class StoriesTagFixture extends CakeTestFixture {
 		array('story' => 1, 'tag_id' => 1)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php
index c8e90de6d..3cab86ff9 100644
--- a/cake/tests/fixtures/story_fixture.php
+++ b/cake/tests/fixtures/story_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class StoryFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class StoryFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Story';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class StoryFixture extends CakeTestFixture {
 		'story' => array('type' => 'integer', 'key' => 'primary'),
 		'title' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -59,4 +64,4 @@ class StoryFixture extends CakeTestFixture {
 		array('title' => 'Second Story')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php
index 8e5a075ad..52d50c0e8 100644
--- a/cake/tests/fixtures/syfile_fixture.php
+++ b/cake/tests/fixtures/syfile_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class SyfileFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class SyfileFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Syfile';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class SyfileFixture extends CakeTestFixture {
 		'name' => array('type' => 'string', 'null' => false),
 		'item_count' => array('type' => 'integer', 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -66,4 +71,4 @@ class SyfileFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php
index afc205e57..5d10f101b 100644
--- a/cake/tests/fixtures/tag_fixture.php
+++ b/cake/tests/fixtures/tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Tag';
+
 /**
  * fields property
  *
@@ -50,6 +54,7 @@ class TagFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -63,4 +68,4 @@ class TagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php
index 148fea15d..046b225ec 100644
--- a/cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TestPluginArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TestPluginArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TestPluginArticle';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class TestPluginArticleFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -66,4 +71,4 @@ class TestPluginArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php
index 847d2ce4b..0a5fee3bc 100644
--- a/cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TestPluginCommentFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TestPluginCommentFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TestPluginComment';
+
 /**
  * fields property
  *
@@ -53,6 +57,7 @@ class TestPluginCommentFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -69,4 +74,4 @@ class TestPluginCommentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index f8efce2db..f2796001e 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ThePaperMonkiesFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ThePaperMonkiesFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'ThePaperMonkies';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class ThePaperMonkiesFixture extends CakeTestFixture {
 		'apple_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
 		'device_id' => array('type' => 'integer', 'length' => 10, 'null' => true)
 	);
+
 /**
  * records property
  *
@@ -57,4 +62,4 @@ class ThePaperMonkiesFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php
index 118aa0ff2..75f647e1c 100644
--- a/cake/tests/fixtures/thread_fixture.php
+++ b/cake/tests/fixtures/thread_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class ThreadFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class ThreadFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Thread';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class ThreadFixture extends CakeTestFixture {
 		'project_id' => array('type' => 'integer', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class ThreadFixture extends CakeTestFixture {
 		array('project_id' => 2, 'name' => 'Project 2, Thread 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php
index 549872c34..2c808329e 100644
--- a/cake/tests/fixtures/translate_article_fixture.php
+++ b/cake/tests/fixtures/translate_article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TranslateArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TranslateArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TranslateArticle';
+
 /**
  * table property
  *
@@ -45,6 +49,7 @@ class TranslateArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $table = 'article_i18n';
+
 /**
  * fields property
  *
@@ -59,6 +64,7 @@ class TranslateArticleFixture extends CakeTestFixture {
 		'field' => array('type' => 'string', 'null' => false),
 		'content' => array('type' => 'text')
 	);
+
 /**
  * records property
  *
@@ -87,4 +93,4 @@ class TranslateArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php
index 17b97a956..47fb3caa2 100644
--- a/cake/tests/fixtures/translate_fixture.php
+++ b/cake/tests/fixtures/translate_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TranslateFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TranslateFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Translate';
+
 /**
  * table property
  *
@@ -45,6 +49,7 @@ class TranslateFixture extends CakeTestFixture {
  * @access public
  */
 	var $table = 'i18n';
+
 /**
  * fields property
  *
@@ -59,6 +64,7 @@ class TranslateFixture extends CakeTestFixture {
 		'field' => array('type' => 'string', 'null' => false),
 		'content' => array('type' => 'text')
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php
index 1a645e375..19ac09f40 100644
--- a/cake/tests/fixtures/translate_table_fixture.php
+++ b/cake/tests/fixtures/translate_table_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TranslateTableFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TranslateTableFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TranslateTable';
+
 /**
  * table property
  *
@@ -45,6 +49,7 @@ class TranslateTableFixture extends CakeTestFixture {
  * @access public
  */
 	var $table = 'another_i18n';
+
 /**
  * fields property
  *
@@ -58,6 +63,7 @@ class TranslateTableFixture extends CakeTestFixture {
 			'foreign_key' => array('type' => 'integer', 'null' => false),
 			'field' => array('type' => 'string', 'null' => false),
 			'content' => array('type' => 'text'));
+
 /**
  * records property
  *
@@ -70,4 +76,4 @@ class TranslateTableFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php
index bce536975..e4c99c51d 100644
--- a/cake/tests/fixtures/translated_article_fixture.php
+++ b/cake/tests/fixtures/translated_article_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TranslatedArticleFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TranslatedArticleFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TranslatedArticle';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class TranslatedArticleFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -64,4 +69,4 @@ class TranslatedArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php
index f8b93ce8a..7f17292ee 100644
--- a/cake/tests/fixtures/translated_item_fixture.php
+++ b/cake/tests/fixtures/translated_item_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class TranslatedItemFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class TranslatedItemFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'TranslatedItem';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class TranslatedItemFixture extends CakeTestFixture {
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'slug' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
@@ -61,4 +66,4 @@ class TranslatedItemFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php
index 87b517842..9972cda08 100644
--- a/cake/tests/fixtures/unconventional_tree_fixture.php
+++ b/cake/tests/fixtures/unconventional_tree_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Unconventional Tree behavior class test fixture.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * UnconventionalTreeFixture class
  *
@@ -32,6 +34,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UnconventionalTreeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -39,6 +42,7 @@ class UnconventionalTreeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'UnconventionalTree';
+
 /**
  * fields property
  *
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index c87ace540..8dca12de4 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * UnderscoreFieldFixture class
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UnderscoreFieldFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -66,4 +69,4 @@ class UnderscoreFieldFixture extends CakeTestFixture {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php
index bb8478034..269fa521c 100644
--- a/cake/tests/fixtures/user_fixture.php
+++ b/cake/tests/fixtures/user_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UserFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UserFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'User';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class UserFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class UserFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 12a0dd99f..723e6cd51 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuidFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuidFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Uuid';
+
 /**
  * fields property
  *
@@ -51,6 +55,7 @@ class UuidFixture extends CakeTestFixture {
 		'created' => 'datetime',
 		'updated' => 'datetime'
 	);
+
 /**
  * records property
  *
@@ -65,4 +70,4 @@ class UuidFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php
index 0665b4649..d57247443 100644
--- a/cake/tests/fixtures/uuid_tag_fixture.php
+++ b/cake/tests/fixtures/uuid_tag_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuidTagFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuidTagFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'UuidTag';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class UuidTagFixture extends CakeTestFixture {
 		'name' => array('type' => 'string', 'length' => 255),
 		'created' => array('type' => 'datetime')
 );
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php
index 6cc36c43b..6b487c665 100644
--- a/cake/tests/fixtures/uuid_tree_fixture.php
+++ b/cake/tests/fixtures/uuid_tree_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * UUID Tree behavior fixture.
  *
@@ -22,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * UuidTreeFixture class
  *
@@ -30,6 +32,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuidTreeFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -37,6 +40,7 @@ class UuidTreeFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'UuidTree';
+
 /**
  * fields property
  *
diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php
index bbc9b0592..3de1654d7 100644
--- a/cake/tests/fixtures/uuiditem_fixture.php
+++ b/cake/tests/fixtures/uuiditem_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuiditemFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuiditemFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Uuiditem';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class UuiditemFixture extends CakeTestFixture {
 		'published' => array('type' => 'boolean', 'null' => false),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
index c3c961282..6fc851be6 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuiditemsUuidportfolioFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuiditemsUuidportfolioFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'UuiditemsUuidportfolio';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class UuiditemsUuidportfolioFixture extends CakeTestFixture {
 		'uuiditem_id' => array('type' => 'string', 'length' => 36, 'null' => false),
 		'uuidportfolio_id' => array('type' => 'string', 'length' => 36, 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
index 9938db735..9a6845546 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'UuiditemsUuidportfolioNumericid';
+
 /**
  * fields property
  *
@@ -49,6 +53,7 @@ class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture {
 		'uuiditem_id' => array('type' => 'string', 'length' => 36, 'null' => false),
 		'uuidportfolio_id' => array('type' => 'string', 'length' => 36, 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php
index 96c65d978..0279044a1 100644
--- a/cake/tests/fixtures/uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuidportfolio_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.fixtures
  */
 class UuidportfolioFixture extends CakeTestFixture {
+
 /**
  * name property
  *
@@ -38,6 +41,7 @@ class UuidportfolioFixture extends CakeTestFixture {
  * @access public
  */
 	var $name = 'Uuidportfolio';
+
 /**
  * fields property
  *
@@ -48,6 +52,7 @@ class UuidportfolioFixture extends CakeTestFixture {
 		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false)
 	);
+
 /**
  * records property
  *
diff --git a/cake/tests/groups/acl.group.php b/cake/tests/groups/acl.group.php
index 7dad05ff2..25ec2712f 100644
--- a/cake/tests/groups/acl.group.php
+++ b/cake/tests/groups/acl.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * AclAndAuthGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * AclAndAuthGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class AclAndAuthGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class AclAndAuthGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'Acl and Auth';
+
 /**
  * AclAndAuthGroupTest method
  *
diff --git a/cake/tests/groups/bake.group.php b/cake/tests/groups/bake.group.php
new file mode 100644
index 000000000..3ce2a043d
--- /dev/null
+++ b/cake/tests/groups/bake.group.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Bake Group test file
+ *
+ * Run all the test cases related to bake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * BakeGroupTest class
+ *
+ * This test group will run all bake tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class BakeGroupTest extends GroupTest {
+
+/**
+ * label property
+ *
+ * @var string 'All core cache engines'
+ * @access public
+ */
+	var $label = 'All Tasks related to bake.';
+
+/**
+ * BakeGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function BakeGroupTest() {
+		$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'tasks' . DS;
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'bake');
+		TestManager::addTestFile($this, $path . 'controller');
+		TestManager::addTestFile($this, $path . 'model');
+		TestManager::addTestFile($this, $path . 'view');
+		TestManager::addTestFile($this, $path . 'fixture');
+		TestManager::addTestFile($this, $path . 'test');
+		TestManager::addTestFile($this, $path . 'db_config');
+		TestManager::addTestFile($this, $path . 'plugin');
+		TestManager::addTestFile($this, $path . 'project');
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/groups/cache.group.php b/cake/tests/groups/cache.group.php
index 85b40cc02..5da046203 100644
--- a/cake/tests/groups/cache.group.php
+++ b/cake/tests/groups/cache.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CacheGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * CacheGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class CacheGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class CacheGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'Cache and all CacheEngines';
+
 /**
  * CacheGroupTest method
  *
diff --git a/cake/tests/groups/components.group.php b/cake/tests/groups/components.group.php
index ad4c2e538..0ce40a622 100644
--- a/cake/tests/groups/components.group.php
+++ b/cake/tests/groups/components.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ComponentsGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ComponentsGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class ComponentsGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class ComponentsGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'All Components';
+
 /**
  * CoreComponentsGroupTest method
  *
diff --git a/cake/tests/groups/configure.group.php b/cake/tests/groups/configure.group.php
index e1e8f35fd..47317e9cd 100644
--- a/cake/tests/groups/configure.group.php
+++ b/cake/tests/groups/configure.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ConfigureGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ConfigureGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class ConfigureGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class ConfigureGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'Configure, App and ClassRegistry';
+
 /**
  * ConfigureGroupTest method
  *
diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php
index 9cc199124..0e4107b71 100644
--- a/cake/tests/groups/console.group.php
+++ b/cake/tests/groups/console.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ConsoleGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ConsoleGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class ConsoleGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class ConsoleGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'ShellDispatcher, Shell and all Tasks';
+
 /**
  * ConsoleGroupTest method
  *
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index a76073c2a..c6c828b76 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ControllerGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ControllerGroupTest
  *
@@ -31,6 +33,7 @@
  * @subpackage    cake.tests.groups
  */
 class ControllerGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -38,6 +41,7 @@ class ControllerGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'All Controllers and Components';
+
 /**
  * LibControllerGroupTest method
  *
@@ -48,4 +52,4 @@ class ControllerGroupTest extends GroupTest {
 		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller');
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php
new file mode 100644
index 000000000..90bc1a0d6
--- /dev/null
+++ b/cake/tests/groups/database.group.php
@@ -0,0 +1,60 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ * DatabaseGroupTest file
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.5517
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * DatabaseGroupTest class
+ *
+ * This test group will run all behavior, schema and datasource tests excluding database
+ * driver-specific tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class DatabaseGroupTest extends GroupTest {
+
+/**
+ * label property
+ *
+ * @var string 'All model tests'
+ * @access public
+ */
+	var $label = 'Datasources, Schema and DbAcl tests';
+
+/**
+ * ModelGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function DatabaseGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'db_acl');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'schema');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'datasources' . DS . 'dbo_source');
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/groups/helpers.group.php b/cake/tests/groups/helpers.group.php
index a7dfbba70..4694ccff4 100644
--- a/cake/tests/groups/helpers.group.php
+++ b/cake/tests/groups/helpers.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * HelpersGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * HelpersGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class HelpersGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class HelpersGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'All Helpers';
+
 /**
  * HelpersGroupTest method
  *
diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
index 07e6ab41b..fc095b922 100644
--- a/cake/tests/groups/lib.group.php
+++ b/cake/tests/groups/lib.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * LibGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * LibGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class LibGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class LibGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'All Libs';
+
 /**
  * LibGroupTest method
  *
diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php
index 867b1ba50..10463a1ea 100644
--- a/cake/tests/groups/model.group.php
+++ b/cake/tests/groups/model.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ModelGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ModelGroupTest class
  *
@@ -34,13 +36,15 @@
  * @subpackage    cake.tests.groups
  */
 class ModelGroupTest extends GroupTest {
+
 /**
  * label property
  *
- * @var string 'All model tests'
+ * @var string
  * @access public
  */
-	var $label = 'Model, all Behaviors and Datasources';
+	var $label = 'Model & Behavior tests';
+
 /**
  * ModelGroupTest method
  *
@@ -49,9 +53,6 @@ class ModelGroupTest extends GroupTest {
  */
 	function ModelGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'db_acl');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'schema');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'datasources' . DS . 'dbo_source');
 		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behaviors');
 	}
 }
diff --git a/cake/tests/groups/no_cross_contamination.group.php b/cake/tests/groups/no_cross_contamination.group.php
index 7a72c88a3..7a66bd757 100644
--- a/cake/tests/groups/no_cross_contamination.group.php
+++ b/cake/tests/groups/no_cross_contamination.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * NoCrossContaminationGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * NoCrossContaminationGroupTest class
  *
@@ -35,6 +37,7 @@
  * @subpackage    cake.tests.groups
  */
 class NoCrossContaminationGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -42,6 +45,7 @@ class NoCrossContaminationGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'No Cross Contamination';
+
 /**
  * blacklist property
  *
@@ -49,6 +53,7 @@ class NoCrossContaminationGroupTest extends GroupTest {
  * @access public
  */
 	var $blacklist = array('cake_test_case.test.php', 'object.test.php');
+
 /**
  * NoCrossContaminationGroupTest method
  *
diff --git a/cake/tests/groups/no_database.group.php b/cake/tests/groups/no_database.group.php
index 278c89056..c71c2a7b8 100644
--- a/cake/tests/groups/no_database.group.php
+++ b/cake/tests/groups/no_database.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * NoDatabaseGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * NoDatabaseGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class NoDatabaseGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class NoDatabaseGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'All Libs not requiring a database connection';
+
 /**
  * NoDatabaseGroupTest method
  *
diff --git a/cake/tests/groups/routing_system.group.php b/cake/tests/groups/routing_system.group.php
index 1afb59f12..d5d0e819e 100644
--- a/cake/tests/groups/routing_system.group.php
+++ b/cake/tests/groups/routing_system.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * RoutingSystemGroupTest
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * RoutingSystemGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class RoutingSystemGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class RoutingSystemGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'Router and Dispatcher';
+
 /**
  * RoutingSystemGroupTest method
  *
diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php
index 59d0ea569..ec8e41373 100644
--- a/cake/tests/groups/socket.group.php
+++ b/cake/tests/groups/socket.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /** Socket and HttpSocket tests
  *
  * This test group will run socket class tests (socket, http_socket).
@@ -31,6 +33,7 @@
  * @package       cake.tests
  * @subpackage    cake.tests.groups
  */
+
 /**
  * SocketGroupTest class
  *
@@ -38,6 +41,7 @@
  * @subpackage    cake.tests.groups
  */
 class SocketGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -45,6 +49,7 @@ class SocketGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'CakeSocket and HttpSocket tests';
+
 /**
  * SocketGroupTest method
  *
@@ -56,4 +61,4 @@ class SocketGroupTest extends GroupTest {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'http_socket');
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/groups/test_suite.group.php b/cake/tests/groups/test_suite.group.php
index bccb39955..17ca0a55d 100644
--- a/cake/tests/groups/test_suite.group.php
+++ b/cake/tests/groups/test_suite.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TestSuiteGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * TestSuiteGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class TestSuiteGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class TestSuiteGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'TestSuite';
+
 /**
  * TestSuiteGroupTest method
  *
diff --git a/cake/tests/groups/view.group.php b/cake/tests/groups/view.group.php
index f79efc0d2..b1e0e158f 100644
--- a/cake/tests/groups/view.group.php
+++ b/cake/tests/groups/view.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * ViewsGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * ViewsGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class ViewsGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class ViewsGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'View and ThemeView';
+
 /**
  * ViewsGroupTest method
  *
diff --git a/cake/tests/groups/xml.group.php b/cake/tests/groups/xml.group.php
index 757153346..56a69a3af 100644
--- a/cake/tests/groups/xml.group.php
+++ b/cake/tests/groups/xml.group.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * XmlGroupTest file
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * XmlGroupTest class
  *
@@ -33,6 +35,7 @@
  * @subpackage    cake.tests.groups
  */
 class XmlGroupTest extends GroupTest {
+
 /**
  * label property
  *
@@ -40,6 +43,7 @@ class XmlGroupTest extends GroupTest {
  * @access public
  */
 	var $label = 'Xml based classes (Xml, XmlHelper and RssHelper)';
+
 /**
  * XmlGroupTest method
  *
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index f2688b440..0dd954898 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -33,6 +35,7 @@
 class CakeHtmlReporter extends SimpleReporter {
 	var $_character_set;
 	var $_show_passes = false;
+
 /**
  *    Does nothing yet. The first output will
  *    be sent on the first test start. For use
@@ -46,6 +49,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		$this->SimpleReporter();
 		$this->_character_set = $character_set;
 	}
+
 /**
  * Paints the top of the web page setting the
  * title to the name of the starting test.
@@ -57,6 +61,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo "<h2>$testName</h2>\n";
 		echo "<ul class='tests'>\n";
 	}
+
 /**
  * Send the headers necessary to ensure the page is
  * reloaded on every request. Otherwise you could be
@@ -73,6 +78,7 @@ class CakeHtmlReporter extends SimpleReporter {
 			header("Pragma: no-cache");
 		}
 	}
+
 /**
  * Paints the end of the test with a summary of
  * the passes and failures.
@@ -91,8 +97,8 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo "<strong>" . $this->getFailCount() . "</strong> fails and ";
 		echo "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
 		echo "</div>\n";
-		echo "</body>\n</html>\n";
 	}
+
 /**
  * Paints the test failure with a breadcrumbs
  * trail of the nesting test suites below the
@@ -111,6 +117,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
 		echo "</li>\n";
 	}
+
 /**
  * Paints the test pass with a breadcrumbs
  * trail of the nesting test suites below the
@@ -132,6 +139,7 @@ class CakeHtmlReporter extends SimpleReporter {
 			echo "</li>\n";
 		}
 	}
+
 /**
  * Paints a PHP error.
  * @param string $message Message is ignored.
@@ -147,6 +155,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
 		echo "</li>\n";
 	}
+
 /**
  * Paints a PHP exception.
  * @param Exception $exception Exception to display.
@@ -166,6 +175,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
 		echo "</li>\n";
 	}
+
 /**
  * Prints the message for skipping tests.
  * @param string $message    Text of skip condition.
@@ -178,6 +188,7 @@ class CakeHtmlReporter extends SimpleReporter {
 		echo $this->_htmlEntities($message);
 		echo "</li>\n";
 	}
+
 /**
  * Paints formatted text such as dumped variables.
  * @param string $message Text to show.
@@ -186,6 +197,7 @@ class CakeHtmlReporter extends SimpleReporter {
 	function paintFormattedMessage($message) {
 		echo '<pre>' . $this->_htmlEntities($message) . '</pre>';
 	}
+
 /**
  * Character set adjusted entity conversion.
  * @param string $message Plain text or Unicode message.
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index 795be9311..d21d4fa45 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CakeTestCase file
  *
@@ -30,6 +31,7 @@ if (!class_exists('dispatcher')) {
 require_once CAKE_TESTS_LIB . 'cake_test_model.php';
 require_once CAKE_TESTS_LIB . 'cake_test_fixture.php';
 App::import('Vendor', 'simpletest' . DS . 'unit_tester');
+
 /**
  * CakeTestDispatcher
  *
@@ -37,6 +39,7 @@ App::import('Vendor', 'simpletest' . DS . 'unit_tester');
  * @subpackage    cake.cake.tests.lib
  */
 class CakeTestDispatcher extends Dispatcher {
+
 /**
  * controller property
  *
@@ -45,6 +48,7 @@ class CakeTestDispatcher extends Dispatcher {
  */
 	var $controller;
 	var $testCase;
+
 /**
  * testCase method
  *
@@ -55,6 +59,7 @@ class CakeTestDispatcher extends Dispatcher {
 	function testCase(&$testCase) {
 		$this->testCase =& $testCase;
 	}
+
 /**
  * invoke method
  *
@@ -80,6 +85,7 @@ class CakeTestDispatcher extends Dispatcher {
 		return $result;
 	}
 }
+
 /**
  * CakeTestCase class
  *
@@ -87,6 +93,7 @@ class CakeTestDispatcher extends Dispatcher {
  * @subpackage    cake.cake.tests.lib
  */
 class CakeTestCase extends UnitTestCase {
+
 /**
  * Methods used internally.
  *
@@ -94,6 +101,7 @@ class CakeTestCase extends UnitTestCase {
  * @access public
  */
 	var $methods = array('start', 'end', 'startcase', 'endcase', 'starttest', 'endtest');
+
 /**
  * By default, all fixtures attached to this class will be truncated and reloaded after each test.
  * Set this to false to handle manually
@@ -102,6 +110,7 @@ class CakeTestCase extends UnitTestCase {
  * @access public
  */
 	var $autoFixtures = true;
+
 /**
  * Set this to false to avoid tables to be dropped if they already exist
  *
@@ -109,6 +118,7 @@ class CakeTestCase extends UnitTestCase {
  * @access public
  */
 	var $dropTables = true;
+
 /**
  * Maps fixture class names to fixture identifiers as included in CakeTestCase::$fixtures
  *
@@ -116,6 +126,7 @@ class CakeTestCase extends UnitTestCase {
  * @access protected
  */
 	var $_fixtureClassMap = array();
+
 /**
  * truncated property
  *
@@ -123,6 +134,7 @@ class CakeTestCase extends UnitTestCase {
  * @access private
  */
 	var $__truncated = true;
+
 /**
  * savedGetData property
  *
@@ -130,6 +142,7 @@ class CakeTestCase extends UnitTestCase {
  * @access private
  */
 	var $__savedGetData = array();
+
 /**
  * Called when a test case (group of methods) is about to start (to be overriden when needed.)
  *
@@ -139,6 +152,7 @@ class CakeTestCase extends UnitTestCase {
  */
 	function startCase() {
 	}
+
 /**
  * Called when a test case (group of methods) has been executed (to be overriden when needed.)
  *
@@ -148,6 +162,7 @@ class CakeTestCase extends UnitTestCase {
  */
 	function endCase() {
 	}
+
 /**
  * Called when a test case method is about to start (to be overriden when needed.)
  *
@@ -157,6 +172,7 @@ class CakeTestCase extends UnitTestCase {
  */
 	function startTest($method) {
 	}
+
 /**
  * Called when a test case method has been executed (to be overriden when needed.)
  *
@@ -166,6 +182,7 @@ class CakeTestCase extends UnitTestCase {
  */
 	function endTest($method) {
 	}
+
 /**
  * Overrides SimpleTestCase::assert to enable calling of skipIf() from within tests
  *
@@ -181,6 +198,7 @@ class CakeTestCase extends UnitTestCase {
 		}
 		return parent::assert($expectation, $compare, $message);
 	}
+
 /**
  * Overrides SimpleTestCase::skipIf to provide a boolean return value
  *
@@ -193,6 +211,7 @@ class CakeTestCase extends UnitTestCase {
 		parent::skipIf($shouldSkip, $message);
 		return $shouldSkip;
 	}
+
 /**
  * Callback issued when a controller's action is about to be invoked through testAction().
  *
@@ -261,6 +280,7 @@ class CakeTestCase extends UnitTestCase {
 			}
 		}
 	}
+
 /**
  * Callback issued when a controller's action has been invoked through testAction().
  *
@@ -276,6 +296,7 @@ class CakeTestCase extends UnitTestCase {
 			}
 		}
 	}
+
 /**
  * Executes a Cake URL, and can get (depending on the $params['return'] value):
  *
@@ -376,6 +397,7 @@ class CakeTestCase extends UnitTestCase {
 
 		return $result;
 	}
+
 /**
  * Announces the start of a test.
  *
@@ -407,6 +429,7 @@ class CakeTestCase extends UnitTestCase {
 			$this->startTest($method);
 		}
 	}
+
 /**
  * Runs as first test to create tables.
  *
@@ -425,15 +448,17 @@ class CakeTestCase extends UnitTestCase {
 				return;
 			}
 			foreach ($this->_fixtures as $fixture) {
-				if (in_array($fixture->table, $sources)) {
+				$table = $this->db->config['prefix'] . $fixture->table;
+				if (in_array($table, $sources)) {
 					$fixture->drop($this->db);
 					$fixture->create($this->db);
-				} elseif (!in_array($fixture->table, $sources)) {
+				} elseif (!in_array($table, $sources)) {
 					$fixture->create($this->db);
 				}
 			}
 		}
 	}
+
 /**
  * Runs as last test to drop tables.
  *
@@ -455,6 +480,7 @@ class CakeTestCase extends UnitTestCase {
 			ClassRegistry::flush();
 		}
 	}
+
 /**
  * Announces the end of a test.
  *
@@ -481,6 +507,7 @@ class CakeTestCase extends UnitTestCase {
 
 		parent::after($method);
 	}
+
 /**
  * Gets a list of test names. Normally that will be all internal methods that start with the
  * name "test". This method should be overridden if you want a different rule.
@@ -495,6 +522,7 @@ class CakeTestCase extends UnitTestCase {
 			array('endCase', 'end')
 		);
 	}
+
 /**
  * Chooses which fixtures to load for a given test
  *
@@ -517,6 +545,7 @@ class CakeTestCase extends UnitTestCase {
 			}
 		}
 	}
+
 /**
  * Takes an array $expected and generates a regex from it to match the provided $string.
  * Samples for $expected:
@@ -669,6 +698,7 @@ class CakeTestCase extends UnitTestCase {
 		}
 		return $this->assert(new TrueExpectation(), true, '%s');
 	}
+
 /**
  * Initialize DB connection.
  *
@@ -704,6 +734,7 @@ class CakeTestCase extends UnitTestCase {
 
 		ClassRegistry::config(array('ds' => 'test_suite'));
 	}
+
 /**
  * Load fixtures specified in var $fixtures.
  *
@@ -726,7 +757,7 @@ class CakeTestCase extends UnitTestCase {
 
 			if (strpos($fixture, 'core.') === 0) {
 				$fixture = substr($fixture, strlen('core.'));
-				foreach (Configure::corePaths('cake') as $key => $path) {
+				foreach (App::core('cake') as $key => $path) {
 					$fixturePaths[] = $path . 'tests' . DS . 'fixtures';
 				}
 			} elseif (strpos($fixture, 'app.') === 0) {
@@ -778,6 +809,7 @@ class CakeTestCase extends UnitTestCase {
 			unset($this->_fixtures);
 		}
 	}
+
 /**
  * Generates all permutation of an array $items and returns them in a new array.
  *
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index fc5a592d6..2e75b36dd 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Short description for class.
  *
@@ -31,19 +33,26 @@
  * @subpackage    cake.cake.tests.lib
  */
 class CakeTestFixture extends Object {
+
+/**
+ * Name of the object
+ *
+ * @var string
+ **/
+	var $name = null;
 /**
  * Cake's DBO driver (e.g: DboMysql).
  *
  * @access public
  */
 	var $db = null;
+
 /**
  * Full Table Name
  *
  * @access public
  */
 	var $table = null;
-
 /**
  * Instantiate the fixture.
  *
@@ -55,6 +64,7 @@ class CakeTestFixture extends Object {
 
 		$this->init();
 	}
+
 /**
  * Initialize the fixture.
  *
@@ -117,6 +127,7 @@ class CakeTestFixture extends Object {
 			$this->primaryKey = 'id';
 		}
 	}
+
 /**
  * Run before all tests execute, should return SQL statement to create table for this fixture could be executed successfully.
  *
@@ -134,6 +145,7 @@ class CakeTestFixture extends Object {
 			$db->execute($db->createSchema($this->Schema), array('log' => false)) !== false
 		);
 	}
+
 /**
  * Run after all tests executed, should return SQL statement to drop table for this fixture.
  *
@@ -147,6 +159,7 @@ class CakeTestFixture extends Object {
 			$db->execute($db->dropSchema($this->Schema), array('log' => false)) !== false
 		);
 	}
+
 /**
  * Run before each tests is executed, should return a set of SQL statements to insert records for the table
  * of this fixture could be executed successfully.
@@ -169,6 +182,7 @@ class CakeTestFixture extends Object {
 			return true;
 		}
 	}
+
 /**
  * Truncates the current fixture. Can be overwritten by classes extending CakeFixture to trigger other events before / after
  * truncate.
@@ -185,4 +199,4 @@ class CakeTestFixture extends Object {
 		return $return;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php
index bfc22bd2a..6c798a3c3 100644
--- a/cake/tests/lib/cake_test_model.php
+++ b/cake/tests/lib/cake_test_model.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 require_once LIBS.'model'.DS.'model.php';
+
 /**
  * Short description for class.
  *
diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php
index b12f2e426..8ea1ea72d 100644
--- a/cake/tests/lib/cake_web_test_case.php
+++ b/cake/tests/lib/cake_web_test_case.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * CakeWebTestCase a simple wrapper around WebTestCase
  *
@@ -22,10 +23,12 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
+
 /**
  * Ignore base class.
  */
 	SimpleTest::ignore('CakeWebTestCase');
+
 /**
  * Simple wrapper for the WebTestCase provided by SimpleTest
  *
diff --git a/cake/tests/lib/cli_reporter.php b/cake/tests/lib/cli_reporter.php
index 97ceea592..e93597afc 100644
--- a/cake/tests/lib/cli_reporter.php
+++ b/cake/tests/lib/cli_reporter.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -34,6 +35,7 @@
 		define('STDERR', fopen('php://stderr', 'w'));
 		register_shutdown_function(create_function('', 'fclose(STDOUT); fclose(STDERR); return true;'));
 	}
+
 /**
  * Minimal command line test displayer. Writes fail details to STDERR. Returns 0
  * to the shell if all tests pass, ST_FAILS_RETURN_CODE if any test fails.
@@ -54,6 +56,7 @@ class CLIReporter extends TextReporter {
 	function setFailDetailSeparator($separator) {
 		$this->faildetail_separator = $separator;
 	}
+
 /**
  * Return a formatted faildetail for printing.
  */
@@ -65,6 +68,7 @@ class CLIReporter extends TextReporter {
 		$buffer .= $this->faildetail_separator . "$message\n";
 		return $buffer;
 	}
+
 /**
  * Paint fail faildetail to STDERR.
  */
@@ -72,6 +76,7 @@ class CLIReporter extends TextReporter {
 		parent::paintFail($message);
 		fwrite(STDERR, 'FAIL' . $this->faildetail_separator . $this->_paintTestFailDetail($message));
 	}
+
 /**
  * Paint exception faildetail to STDERR.
  */
@@ -79,6 +84,7 @@ class CLIReporter extends TextReporter {
 		parent::paintException($message);
 		fwrite(STDERR, 'EXCEPTION' . $this->faildetail_separator . $this->_paintTestFailDetail($message));
 	}
+
 /**
  * Paint a footer with test case name, timestamp, counts of fails and exceptions.
  */
diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index 070fe5b17..46edac72e 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * A class to manage all aspects for Code Coverage Analysis
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 App::import('Core', 'Folder');
+
 /**
  * Short description for class.
  *
@@ -32,18 +34,21 @@ App::import('Core', 'Folder');
  * @subpackage    cake.cake.tests.lib
  */
 class CodeCoverageManager {
+
 /**
  * Is this an app test case?
  *
  * @var string
  */
 	var $appTest = false;
+
 /**
  * Is this an app test case?
  *
  * @var string
  */
 	var $pluginTest = false;
+
 /**
  * Is this a grouptest?
  *
@@ -51,24 +56,28 @@ class CodeCoverageManager {
  * @access public
  */
 	var $groupTest = false;
+
 /**
  * The test case file to analyze
  *
  * @var string
  */
 	var $testCaseFile = '';
+
 /**
  * The currently used CakeTestReporter
  *
  * @var string
  */
 	var $reporter = '';
+
 /**
  * undocumented variable
  *
  * @var string
  */
 	var $numDiffContextLines = 7;
+
 /**
  * Returns a singleton instance
  *
@@ -82,6 +91,7 @@ class CodeCoverageManager {
 		}
 		return $instance[0];
 	}
+
 /**
  * Starts a new Coverage Analyzation for a given test case file
  * @TODO: Works with $_GET now within the function body, which will make it hard when we do code coverage reports for CLI
@@ -114,6 +124,7 @@ class CodeCoverageManager {
 		$manager->testCaseFile = $testCaseFile;
 		xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
 	}
+
 /**
  * Stops the current code coverage analyzation and dumps a nice report depending on the reporter that was passed to start()
  *
@@ -198,6 +209,7 @@ class CodeCoverageManager {
 			echo $result;
 		}
 	}
+
 /**
  * Html reporting
  *
@@ -233,6 +245,7 @@ class CodeCoverageManager {
 		}
 		return $manager->__paintHeader($lineCount, $coveredCount, $report);
 	}
+
 /**
  * Diff reporting
  *
@@ -350,6 +363,7 @@ class CodeCoverageManager {
 		}
 		return $manager->__paintHeader($lineCount, $coveredCount, $report);
 	}
+
 /**
  * CLI reporting
  *
@@ -379,6 +393,7 @@ class CodeCoverageManager {
 		}
 		return $manager->__paintHeaderCli($lineCount, $coveredCount, $report);
 	}
+
 /**
  * Diff reporting
  *
@@ -418,6 +433,7 @@ class CodeCoverageManager {
 		}
 		return $manager->__paintGroupResultHeader($report);
 	}
+
 /**
  * CLI reporting
  *
@@ -453,6 +469,7 @@ class CodeCoverageManager {
 		}
 		return $report;
 	}
+
 /**
  * Returns the name of the test object file based on a given test case file name
  *
@@ -495,6 +512,7 @@ class CodeCoverageManager {
 		}
 		return $path;
 	}
+
 /**
  * Returns an array of names of the test object files based on a given test group file name
  *
@@ -553,6 +571,7 @@ class CodeCoverageManager {
 		}
 		return $result;
 	}
+
 /**
  * Parses a given code string into an array of lines and replaces some non-executable code lines with the needed
  * amount of new lines in order for the code line numbers to stay in sync
@@ -585,6 +604,7 @@ class CodeCoverageManager {
 		unset($result[0]);
 		return $result;
 	}
+
 /**
  * Replaces a given arg with the number of newlines in it
  *
@@ -596,6 +616,7 @@ class CodeCoverageManager {
 		$numLineBreaks = count(explode("\n", $args[0][0]));
 		return str_pad('', $numLineBreaks - 1, "\n");
 	}
+
 /**
  * Paints the headline for code coverage analysis
  *
@@ -610,6 +631,7 @@ class CodeCoverageManager {
 		return $report = '<h2>Code Coverage: ' . $codeCoverage . '%</h2>
 						<div class="code-coverage-results"><pre>' . $report . '</pre></div>';
 	}
+
 /**
  * Displays a notification concerning group test results
  *
@@ -619,6 +641,7 @@ class CodeCoverageManager {
 	function __paintGroupResultHeader($report) {
 		return '<div class="code-coverage-results"><p class="note">Please keep in mind that the coverage can vary a little bit depending on how much the different tests in the group interfere. If for example, TEST A calls a line from TEST OBJECT B, the coverage for TEST OBJECT B will be a little greater than if you were running the corresponding test case for TEST OBJECT B alone.</p><pre>' . $report . '</pre></div>';
 	}
+
 /**
  * Paints the headline for code coverage analysis
  *
@@ -640,6 +663,7 @@ class CodeCoverageManager {
 		}
 		return '<p>Code Coverage for ' . $file . ': <span class="' . $class . '">' . $codeCoverage . '%</span></p>';
 	}
+
 /**
  * Paints the headline for code coverage analysis
  *
@@ -661,6 +685,7 @@ class CodeCoverageManager {
 		}
 		return "\n" . 'Code Coverage for ' . $file . ': ' . $codeCoverage . '% (' . $class . ')' . "\n";
 	}
+
 /**
  * Paints the headline for code coverage analysis in the CLI
  *
@@ -674,6 +699,7 @@ class CodeCoverageManager {
 		$codeCoverage = $manager->__calcCoverage($lineCount, $coveredCount);
 		return $report = 'Code Coverage: ' . $codeCoverage . '%';
 	}
+
 /**
  * Paints a code line for html output
  *
@@ -688,6 +714,7 @@ class CodeCoverageManager {
 		}
 		return '<div class="code-line ' . trim($class) . '"><span class="line-num">' . $num . '</span><span class="content">' . $line . '</span></div>';
 	}
+
 /**
  * Calculates the coverage percentage based on a line count and a covered line count
  *
@@ -704,6 +731,7 @@ class CodeCoverageManager {
 				? round(100 * $coveredCount / $lineCount, 2)
 				: '0.00';
 	}
+
 /**
  * Gets us the base path to look for the test files
  *
@@ -736,6 +764,7 @@ class CodeCoverageManager {
 
 		return $path;
 	}
+
 /**
  * Finds the last element of an array that contains $needle in a strpos computation
  *
diff --git a/cake/tests/lib/content.php b/cake/tests/lib/content.php
index 8c4c9aa07..312d5917b 100644
--- a/cake/tests/lib/content.php
+++ b/cake/tests/lib/content.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -62,4 +63,4 @@ if (!empty($plugins)):
 	</li>
 </ul>
 </div>
-<div  class="test-results">
+<div  class="test-results">
\ No newline at end of file
diff --git a/cake/tests/lib/footer.php b/cake/tests/lib/footer.php
index 8408c75e9..a64330371 100644
--- a/cake/tests/lib/footer.php
+++ b/cake/tests/lib/footer.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/lib/header.php b/cake/tests/lib/header.php
index 1fd6d9989..86aeec3f9 100644
--- a/cake/tests/lib/header.php
+++ b/cake/tests/lib/header.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -29,7 +30,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv='content-Type' content='text/html; <?php echo $characterSet; ?>' />
-		<title>CakePHP Test Suite v 1.2.0.0</title>
+		<title>CakePHP Test Suite 1.3</title>
 		<style type="text/css">
 			h3 {font-size: 170%; padding-top: 1em}
 			a {font-size: 120%}
@@ -38,21 +39,21 @@
 			.test-results {float:left; width: 67%;}
 			ul.tests {margin: 0; font-size:12px;}
 			ul.tests li {
-				list-style: none; 
-				margin: 14px 0; 
+				list-style: none;
+				margin: 14px 0;
 				padding-left: 20px;
 			}
-			ul.tests li span { 
-				font-size:14px; 
-				text-transform: uppercase; 
-				font-weight: bold; 
+			ul.tests li span {
+				font-size:14px;
+				text-transform: uppercase;
+				font-weight: bold;
 			}
 			ul.tests li.pass span, ul.tests li.skipped span { display:inline;}
 			ul.tests li.fail span { color: red; }
 			ul.tests li.pass span { color: green; }
 			ul.tests li.skipped span { color: navy; }
 			ul.tests li.error span { color : #d15d00; }
-			
+
 			ul.tests li.pass,
 			ul.tests li.error,
 			ul.tests li.skipped,
@@ -80,7 +81,7 @@
 			ul.tests li div { margin: 5px 0 8px 0; }
 			ul.tests li div.msg { font-weight: bold; }
 			table caption { color:#fff; }
-			
+
 			div.code-coverage-results div.code-line {
 				padding-left:5px;
 				display:block;
@@ -129,4 +130,4 @@
 				<h1>CakePHP: the rapid development php framework</h1>
 			</div>
 			<div id="content">
-			<h2>CakePHP Test Suite v 1.2.0.0</h2>
+			<h2>CakePHP Test Suite 1.3</h2>
\ No newline at end of file
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index d4fe657f8..a876c8e23 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -28,6 +29,7 @@ define('CORE_TEST_CASES', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'cases');
 define('CORE_TEST_GROUPS', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'groups');
 define('APP_TEST_CASES', TESTS . 'cases');
 define('APP_TEST_GROUPS', TESTS . 'groups');
+
 /**
  * Short description for class.
  *
@@ -39,6 +41,7 @@ class TestManager {
 	var $_groupExtension = '.group.php';
 	var $appTest = false;
 	var $pluginTest = false;
+
 /**
  * Constructor for the TestManager class
  *
@@ -54,6 +57,7 @@ class TestManager {
 			$this->pluginTest = $_GET['plugin'];
 		}
 	}
+
 /**
  * Includes the required simpletest files in order for the testsuite to run
  *
@@ -69,6 +73,7 @@ class TestManager {
 		require_once(CAKE_TESTS_LIB . 'cake_web_test_case.php');
 		require_once(CAKE_TESTS_LIB . 'cake_test_case.php');
 	}
+
 /**
  * Runs all tests in the Application depending on the current appTest setting
  *
@@ -98,6 +103,7 @@ class TestManager {
 
 		return $test->run($reporter);
 	}
+
 /**
  * Runs a specific test case file
  *
@@ -124,6 +130,7 @@ class TestManager {
 		$test->addTestFile($testCaseFileWithPath);
 		return $test->run($reporter);
 	}
+
 /**
  * Runs a specific group test file
  *
@@ -151,6 +158,7 @@ class TestManager {
 		}
 		return $test->run($reporter);
 	}
+
 /**
  * Adds all testcases in a given directory to a given GroupTest object
  *
@@ -166,6 +174,7 @@ class TestManager {
 			$groupTest->addTestFile($testCase);
 		}
 	}
+
 /**
  * Adds a specific test file and thereby all of its test cases and group tests to a given group test file
  *
@@ -184,6 +193,7 @@ class TestManager {
 		}
 		$groupTest->addTestFile($file);
 	}
+
 /**
  * Returns a list of test cases found in the current valid test case path
  *
@@ -194,6 +204,7 @@ class TestManager {
 		$return = $manager->_getTestCaseList($manager->_getTestsPath());
 		return $return;
 	}
+
 /**
  * Builds the list of test cases from a given directory
  *
@@ -207,6 +218,7 @@ class TestManager {
 		}
 		return $testCases;
 	}
+
 /**
  * Returns a list of test files from a given directory
  *
@@ -216,6 +228,7 @@ class TestManager {
 		$return = $this->_getRecursiveFileList($directory, array(&$this, '_isTestCaseFile'));
 		return $return;
 	}
+
 /**
  * Returns a list of group tests found in the current valid test case path
  *
@@ -226,6 +239,7 @@ class TestManager {
 		$return = $manager->_getTestGroupList($manager->_getTestsPath('groups'));
 		return $return;
 	}
+
 /**
  * Returns a list of group test files from a given directory
  *
@@ -235,6 +249,7 @@ class TestManager {
 		$return = $this->_getRecursiveFileList($directory, array(&$this, '_isTestGroupFile'));
 		return $return;
 	}
+
 /**
  * Returns a list of group test files from a given directory
  *
@@ -250,6 +265,7 @@ class TestManager {
 		sort($groupTests);
 		return $groupTests;
 	}
+
 /**
  * Returns a list of class names from a group test file
  *
@@ -264,6 +280,7 @@ class TestManager {
 		}
 		return array();
 	}
+
 /**
  * Gets a recursive list of files from a given directory and matches then against
  * a given fileTestFunction, like isTestCaseFile()
@@ -288,6 +305,7 @@ class TestManager {
 		}
 		return $fileList;
 	}
+
 /**
  * Tests if a file has the correct test case extension
  *
@@ -298,6 +316,7 @@ class TestManager {
 	function _isTestCaseFile($file) {
 		return $this->_hasExpectedExtension($file, $this->_testExtension);
 	}
+
 /**
  * Tests if a file has the correct group test extension
  *
@@ -308,6 +327,7 @@ class TestManager {
 	function _isTestGroupFile($file) {
 		return $this->_hasExpectedExtension($file, $this->_groupExtension);
 	}
+
 /**
  * Check if a file has a specific extension
  *
@@ -319,6 +339,7 @@ class TestManager {
 	function _hasExpectedExtension($file, $extension) {
 		return $extension == strtolower(substr($file, (0 - strlen($extension))));
 	}
+
 /**
  * Returns the given path to the test files depending on a given type of tests (cases, group, ..)
  *
@@ -352,6 +373,7 @@ class TestManager {
 		}
 		return $result;
 	}
+
 /**
  * undocumented function
  *
@@ -367,6 +389,7 @@ class TestManager {
 		return $manager->_groupExtension;
 	}
 }
+
 /**
  * The CliTestManager ensures that the list of available files are printed in the correct cli format
  *
@@ -374,6 +397,7 @@ class TestManager {
  * @subpackage    cake.cake.tests.lib
  */
 class CliTestManager extends TestManager {
+
 /**
  * Prints the list of group tests in a cli friendly format
  *
@@ -389,6 +413,7 @@ class CliTestManager extends TestManager {
 		}
 		return $buffer . "\n";
 	}
+
 /**
  * Prints the list of test cases in a cli friendly format
  *
@@ -405,6 +430,7 @@ class CliTestManager extends TestManager {
 		return $buffer . "\n";
 	}
 }
+
 /**
  * The TextTestManager ensures that the list of available tests is printed as a list of urls in a text-friendly format
  *
@@ -413,6 +439,7 @@ class CliTestManager extends TestManager {
  */
 class TextTestManager extends TestManager {
 	var $_url;
+
 /**
  * Constructor
  *
@@ -423,6 +450,7 @@ class TextTestManager extends TestManager {
 		parent::TestManager();
 		$this->_url = $_SERVER['PHP_SELF'];
 	}
+
 /**
  * Returns the base url
  *
@@ -432,6 +460,7 @@ class TextTestManager extends TestManager {
 	function getBaseURL() {
 		return $this->_url;
 	}
+
 /**
  * Returns a list of available group tests in a text-friendly format
  *
@@ -459,6 +488,7 @@ class TextTestManager extends TestManager {
 
 		return $buffer;
 	}
+
 /**
  * Returns a list of available test cases in a text-friendly format
  *
@@ -491,6 +521,7 @@ class TextTestManager extends TestManager {
 		return $buffer;
 	}
 }
+
 /**
  * The HtmlTestManager provides the foundation for the web-based CakePHP testsuite.
  * It prints the different lists of tests and provides the interface for CodeCoverage, etc.
@@ -500,6 +531,7 @@ class TextTestManager extends TestManager {
  */
 class HtmlTestManager extends TestManager {
 	var $_url;
+
 /**
  * Constructor
  *
@@ -510,6 +542,7 @@ class HtmlTestManager extends TestManager {
 		parent::TestManager();
 		$this->_url = $_SERVER['PHP_SELF'];
 	}
+
 /**
  * Returns the current base url
  *
@@ -519,6 +552,7 @@ class HtmlTestManager extends TestManager {
 	function getBaseURL() {
 		return $this->_url;
 	}
+
 /**
  * Prints the links to the available group tests
  *
@@ -547,6 +581,7 @@ class HtmlTestManager extends TestManager {
 		$buffer .= "</ul>\n";
 		return $buffer;
 	}
+
 /**
  * Prints the links to the available test cases
  *
@@ -588,6 +623,7 @@ if (function_exists('caketestsgetreporter')) {
 	echo "Try this one: " . CONSOLE_LIBS . "templates" . DS . "skel" . DS . "webroot" . DS . "test.php";
 	exit();
 } else {
+
 /**
  * Returns an object of the currently needed reporter
  *
@@ -608,6 +644,7 @@ if (function_exists('caketestsgetreporter')) {
 		}
 		return $Reporter;
 	}
+
 /**
  * Provides the "Run More" links in the testsuite interface
  *
@@ -653,6 +690,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Provides the links to analyzing code coverage
  *
@@ -684,6 +722,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Prints a list of test cases
  *
@@ -702,6 +741,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Prints a list of group tests
  *
@@ -719,6 +759,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Includes the Testsuite Header
  *
@@ -746,6 +787,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Provides the left hand navigation for the testsuite
  *
@@ -763,6 +805,7 @@ if (function_exists('caketestsgetreporter')) {
 				break;
 		}
 	}
+
 /**
  * Provides the testsuite footer text
  *
diff --git a/cake/tests/lib/xdebug.php b/cake/tests/lib/xdebug.php
index b285e700d..376c6163b 100644
--- a/cake/tests/lib/xdebug.php
+++ b/cake/tests/lib/xdebug.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index 351f02c99..96ab738e4 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -62,4 +62,4 @@ deny = stats, ads
 
 [anonymous]
 allow =
-deny = posts, comments, images, files, stats, ads
\ No newline at end of file
+deny = posts, comments, images, files, stats, ads
diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php
index 4800490f5..0bba6acb3 100644
--- a/cake/tests/test_app/controllers/tests_apps_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
index e9b0d0464..9f6e919f9 100644
--- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -33,7 +34,8 @@ class TestsAppsPostsController extends AppController {
 		$data = array(
 			'Post' => array(
 				'title' => 'Test article',
-				'body' => 'Body of article.'
+				'body' => 'Body of article.',
+				'author_id' => 1
 			)
 		);
 		$this->Post->save($data);
@@ -41,6 +43,7 @@ class TestsAppsPostsController extends AppController {
 		$this->set('posts', $this->Post->find('all'));
 		$this->render('index');
 	}
+
 /**
  * check url params
  *
@@ -49,6 +52,7 @@ class TestsAppsPostsController extends AppController {
 		$this->set('params', $this->params);
 		$this->render('index');
 	}
+
 /**
  * post var testing
  *
@@ -57,6 +61,7 @@ class TestsAppsPostsController extends AppController {
 		$this->set('data', $this->data);
 		$this->render('index');
 	}
+
 /**
  * Fixturized action for testAction()
  *
diff --git a/cake/tests/test_app/locale/po/LC_MONETARY/default.po b/cake/tests/test_app/locale/po/LC_MONETARY/default.po
new file mode 100644
index 000000000..e2a3c3a05
--- /dev/null
+++ b/cake/tests/test_app/locale/po/LC_MONETARY/default.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+msgid ""
+msgstr "header"
+
+msgid "Plural Rule 1"
+msgstr "Monetary Po (translated)"
\ No newline at end of file
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
index 63f5998a6..3ef2e3284 100644
--- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Behavior for binding management.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
@@ -32,7 +34,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class PersisterOneBehaviorBehavior extends ModelBehavior {
-	
-	
+
+
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
index c032fc3e2..017180453 100644
--- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Behavior for binding management.
  *
@@ -24,6 +25,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 /**
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
@@ -32,7 +34,7 @@
  * @subpackage    cake.cake.console.libs
  */
 class PersisterTwoBehaviorBehavior extends ModelBehavior {
-	
-	
+
+
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php
index 75c1450a5..d1ac8431b 100644
--- a/cake/tests/test_app/models/comment.php
+++ b/cake/tests/test_app/models/comment.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test App Comment Model
  *
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index 76222829f..9fe361125 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test App Comment Model
  *
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 4596f9479..afc92ac5e 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test App Comment Model
  *
diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php
index f2ea630d6..cdc314b5e 100644
--- a/cake/tests/test_app/models/post.php
+++ b/cake/tests/test_app/models/post.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test App Comment Model
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
index ab3cb7b22..4d84d2713 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
index 6a80527d9..fca3642c3 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
index 23a462bf9..3d03b86f6 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
index 560e0702f..4e432f2c9 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
index 565a4cd9a..9028dc87c 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po b/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
new file mode 100644
index 000000000..d1079d311
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Monetary Plural Rule 1 (from plugin)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "Monetary %d = 1 (from plugin)"
+msgstr[1] "Monetary %d = 0 or > 1 (from plugin)"
+
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index 52c8a35e3..6dfe81de9 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test Plugin Post Model
  *
@@ -25,12 +26,14 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 class TestPluginPost extends TestPluginAppModel {
+
 /**
  * Name property
  *
  * @var string
  */
 	var $name = 'Post';
+
 /**
  * useTable property
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
index 56ad96b9c..c22aca869 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test Suite TestPlugin AppController
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
index b6510715b..f272acf24 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Test Suite TestPlugin AppModel
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
index d4152137e..f804037cd 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
index d363e9217..3d81f6dcf 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class ExampleShell extends Shell {
+
 /**
  * main method
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
index b5122b327..cbf8a72cc 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
index 9ec662708..5a558f761 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
index 084eee80e..a745a1abe 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
index 9e4b23fd3..ba408e930 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class ExampleShell extends Shell {
+
 /**
  * main method
  *
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
index 57f09f3ee..f55e76aea 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class WelcomeShell extends Shell {
+
 /**
  * say_hello method
  *
diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php
index 2705dffc2..7190c5a76 100644
--- a/cake/tests/test_app/vendors/Test/MyTest.php
+++ b/cake/tests/test_app/vendors/Test/MyTest.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php
index d96fa7047..713390c68 100644
--- a/cake/tests/test_app/vendors/Test/hello.php
+++ b/cake/tests/test_app/vendors/Test/hello.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
index 252c860d7..c815ad619 100644
--- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
+++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/vendors/shells/sample.php
index 738c57911..89cdccc74 100644
--- a/cake/tests/test_app/vendors/shells/sample.php
+++ b/cake/tests/test_app/vendors/shells/sample.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
@@ -25,6 +26,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 class SampleShell extends Shell {
+
 /**
  * main method
  *
diff --git a/cake/tests/test_app/vendors/shells/templates/empty b/cake/tests/test_app/vendors/shells/templates/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp b/cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp
new file mode 100644
index 000000000..c524b8231
--- /dev/null
+++ b/cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp
@@ -0,0 +1,2 @@
+I got rendered
+<?php echo $test; ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php
index 442fabcd0..3c15defa0 100644
--- a/cake/tests/test_app/vendors/somename/some.name.php
+++ b/cake/tests/test_app/vendors/somename/some.name.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php
index edb18261b..32039255b 100644
--- a/cake/tests/test_app/vendors/welcome.php
+++ b/cake/tests/test_app/vendors/welcome.php
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * Short description for file.
  *
diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp
index 35146fe4a..9281bb8c6 100644
--- a/cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp
index cbb261c64..bd5f1aca6 100644
--- a/cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp
index f2ee2792d..04dd5475c 100644
--- a/cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp
index ca3459af8..4da27c73a 100644
--- a/cake/tests/test_app/views/layouts/ajax.ctp
+++ b/cake/tests/test_app/views/layouts/ajax.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp
index 060d614a6..514a71ab0 100644
--- a/cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: ajax2.ctp 7062 2008-05-30 11:29:53Z nate $ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/layouts/cache_empty_sections.ctp b/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
index c11f2f5b9..98e37d0f8 100644
--- a/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
+++ b/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
@@ -11,4 +11,4 @@
 	<?php echo $content_for_layout;	?>
 	<cake:nocache><?php echo 'cached count is: ' . $x; ?></cake:nocache>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp
index dee02a716..46784c1df 100644
--- a/cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -36,4 +37,3 @@
 </cake:nocache>
 <p>Additional regular text.</p>
 
-
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index bf0d3f30c..2246bff0e 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp
index 1853a7b3a..b596254f2 100644
--- a/cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -34,4 +35,4 @@
 
 	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp
index 2cd9e4020..0b4677735 100644
--- a/cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -34,4 +35,4 @@
 
 	<p>This email was sent using the CakePHP Framework</p>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp
index 77fda3bd6..bfc1ef552 100644
--- a/cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -26,4 +27,3 @@
 <?php echo $content_for_layout;?>
 
 This email was sent using the CakePHP Framework, http://cakephp.org.
-
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp
index 95fc61fb8..11b23e8c1 100644
--- a/cake/tests/test_app/views/layouts/flash.ctp
+++ b/cake/tests/test_app/views/layouts/flash.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp
index 7c07d9be5..3eba18d4e 100644
--- a/cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -42,4 +43,4 @@
 <cake:nocache>
 	<p>G. Layout After Content And After Element With No Cache Tags</p>
 	<?php $this->log('7. layout after content and after element with no cache tags') ?>
-</cake:nocache>
+</cake:nocache>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/pages/home.ctp b/cake/tests/test_app/views/pages/home.ctp
index 3812f0f93..aad3ce4ca 100644
--- a/cake/tests/test_app/views/pages/home.ctp
+++ b/cake/tests/test_app/views/pages/home.ctp
@@ -77,4 +77,4 @@ if (!empty($filePresent)):
 		You can also add some CSS styles for your pages at: %s', true),
 		APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');
 ?>
-</p>
+</p>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
index 247be625f..5ab7e0874 100644
--- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5
@@ -26,4 +27,4 @@
 <cake:nocache>
 	<p>D. In View File</p>
 	<?php $this->log('4. in view file') ?>
-</cake:nocache>
+</cake:nocache>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
index db0e7397c..433131435 100644
--- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  *
  * PHP versions 4 and 5