diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
index 43fae5f35..d974f72d4 100644
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -355,14 +355,14 @@ class DbConfigTask extends Shell {
 		App::uses('ConnectionManager', 'Model');
 		$configs = ConnectionManager::enumConnectionObjects();
 
-		$useDbConfig = 'default';
+		$useDbConfig = current($configs);
 		if (!is_array($configs) || empty($configs)) {
 			return $this->execute();
 		}
 		$connections = array_keys($configs);
 
 		if (count($connections) > 1) {
-			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, 'default');
+			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, $useDbConfig);
 		}
 		return $useDbConfig;
 	}
diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
index 3b0d48628..e4d9de1de 100644
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ b/lib/Cake/Console/Command/Task/TestTask.php
@@ -190,15 +190,10 @@ class TestTask extends BakeTask {
  * @return string Class name the user chose.
  */
 	public function getClassName($objectType) {
-		$type = strtolower($objectType);
+		$type = ucfirst(strtolower($objectType));
+		$typeLength = strlen($type);
+		$type = $this->classTypes[$type];
 		if ($this->plugin) {
-			if ($type === 'helper') {
-				$type = 'View/Helper';
-			} elseif ($type === 'component') {
-				$type = 'Controller/Component';
-			} elseif ($type === 'behavior') {
-				$type = 'Model/Behavior';
-			}
 			$plugin = $this->plugin . '.';
 			$options = App::objects($plugin . $type);
 		} else {
@@ -212,7 +207,10 @@ class TestTask extends BakeTask {
 		}
 		$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
 		if (isset($options[$selection - 1])) {
-			return $options[$selection - 1];
+			$selection = $options[$selection - 1];
+		}
+		if ($type !== 'Model') {
+			$selection = substr($selection, 0, $typeLength * - 1);
 		}
 		return $selection;
 	}
diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
index 5f5f567f7..2a952c6f8 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -543,7 +543,7 @@ class TestTaskTest extends CakeTestCase {
 		CakePlugin::load('TestPlugin');
 
 		$this->Task->plugin = 'TestPlugin';
-		$path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
+		$path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperTest.php';
 		$this->Task->expects($this->any())
 			->method('in')
 			->will($this->onConsecutiveCalls(