diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
index 4c30cee6b..23dd0fbe6 100644
--- a/lib/Cake/Model/ConnectionManager.php
+++ b/lib/Cake/Model/ConnectionManager.php
@@ -128,18 +128,16 @@ class ConnectionManager {
 /**
  * Gets a DataSource name from an object reference.
  *
- * **Warning** this method may cause fatal errors in PHP4.
- *
  * @param object $source DataSource object
  * @return string Datasource name, or null if source is not present
  *    in the ConnectionManager.
  */
-	public static function getSourceName(&$source) {
+	public static function getSourceName($source) {
 		if (empty(self::$_init)) {
 			self::init();
 		}
 		foreach (self::$_dataSources as $name => $ds) {
-			if ($ds == $source) {
+			if ($ds === $source) {
 				return $name;
 			}
 		}
@@ -171,7 +169,7 @@ class ConnectionManager {
 
 		$plugin = $package = null;
 		if (!empty($conn['plugin'])) {
-			$plugin .= '.';
+			$plugin = $conn['plugin'] . '.';
 		}
 		if (!empty($conn['package'])) {
 			$package = '/' . $conn['package'];
@@ -195,7 +193,7 @@ class ConnectionManager {
 		if (empty(self::$_init)) {
 			self::init();
 		}
-		return self::$_connectionsEnum;
+		return (array) self::$config;
 	}
 
 /**
diff --git a/lib/Cake/tests/cases/libs/model/connection_manager.test.php b/lib/Cake/tests/cases/libs/model/connection_manager.test.php
index 8e9156063..8b7aebdca 100644
--- a/lib/Cake/tests/cases/libs/model/connection_manager.test.php
+++ b/lib/Cake/tests/cases/libs/model/connection_manager.test.php
@@ -25,36 +25,6 @@ App::uses('ConnectionManager', 'Model');
  */
 class ConnectionManagerTest extends CakeTestCase {
 
-/**
- * setUp method
- *
- * @access public
- * @return void
- */
-	function setUp() {
-		$this->ConnectionManager = ConnectionManager::getInstance();
-	}
-
-/**
- * tearDown method
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		unset($this->ConnectionManager);
-	}
-
-/**
- * testInstantiation method
- *
- * @access public
- * @return void
- */
-	function testInstantiation() {
-		$this->assertTrue(is_a($this->ConnectionManager, 'ConnectionManager'));
-	}
-
 /**
  * testEnumConnectionObjects method
  *
@@ -123,7 +93,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		));
 
 		$name = 'test_plugin_source_and_driver';
-		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'TestPlugin.TestDriver');
+		$config = array('datasource' => 'TestPlugin.Database/TestDriver');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -147,7 +117,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		));
 
 		$name = 'test_local_source_and_plugin_driver';
-		$config = array('datasource' => 'dbo', 'driver' => 'TestPlugin.DboDummy');
+		$config = array('datasource' => 'TestPlugin.Database/DboDummy');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -167,11 +137,11 @@ class ConnectionManagerTest extends CakeTestCase {
 	function testGetPluginDataSourceAndLocalDriver() {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'datasources' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+			'Model/Datasource' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
 		));
 
 		$name = 'test_plugin_source_and_local_driver';
-		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'local_driver');
+		$config = array('datasource' => 'Database/TestLocalDriver');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -283,17 +253,14 @@ class ConnectionManagerTest extends CakeTestCase {
 	function testConnectionData() {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'datasources' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+			'Model/Datasource' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
 		));
 
 		$expected = array(
-		    'filename' => 'test2_source',
-		    'classname' => 'Test2Source',
-		    'parent' => '',
-		    'plugin' => ''
+		    'datasource' => 'Test2Source'
 		);
 
-		ConnectionManager::create('connection1', array('datasource' => 'Test2'));
+		ConnectionManager::create('connection1', array('datasource' => 'Test2Source'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection1']);
 
@@ -301,33 +268,29 @@ class ConnectionManagerTest extends CakeTestCase {
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection2']);
 
-		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.Test'));
+		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test_source';
-		$expected['classname'] = 'TestSource';
-		$expected['plugin'] = 'TestPlugin';
+		$expected['datasource'] = 'TestPlugin.TestSource';
 		$this->assertEqual($expected, $connections['connection3']);
 
 		ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection4']);
 
-		ConnectionManager::create('connection5', array('datasource' => 'Test2Other'));
+		ConnectionManager::create('connection5', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test2_other_source';
-		$expected['classname'] = 'Test2OtherSource';
-		$expected['plugin'] = '';
+		$expected['datasource'] = 'Test2OtherSource';
+
 		$this->assertEqual($expected, $connections['connection5']);
 
 		ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection6']);
 
-		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOther'));
+		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test_other_source';
-		$expected['classname'] = 'TestOtherSource';
-		$expected['plugin'] = 'TestPlugin';
+		$expected['datasource'] = 'TestPlugin.TestOtherSource';
+
 		$this->assertEqual($expected, $connections['connection7']);
 
 		ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource'));