2 files changed, 19 insertions, 9 deletions
diff --git a/tests/codeigniter/database/DB_driver_test.php b/tests/codeigniter/database/DB_driver_test.php
index 26416d3fc..13e9abf84 100644
--- a/tests/codeigniter/database/DB_driver_test.php
+++ b/tests/codeigniter/database/DB_driver_test.php
@@ -7,8 +7,6 @@ class DB_driver_test extends CI_TestCase {
 		$config = Mock_Database_DB::config(DB_DRIVER);
 		sscanf(DB_DRIVER, '%[^/]/', $driver_name);
 		$driver = $this->{$driver_name}($config[DB_DRIVER]);
-
-		$this->assertTrue($driver->initialize());
 	}
 
 	protected function pdo($config)
diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index d66ad895c..029f3f4cd 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -81,12 +81,24 @@ EOH;
 
 	public function test_meta()
 	{
-		$this->assertEquals("<meta name=\"test\" content=\"foo\" />\n", meta('test', 'foo'));
-
-		$expect = "<meta name=\"foo\" content=\"\" />\n";
-
-		$this->assertEquals($expect, meta(array('name' => 'foo')));
-
+		$this->assertEquals(
+			"<meta name=\"test\" content=\"foo\" />\n",
+			meta('test', 'foo')
+		);
+
+		$this->assertEquals(
+			"<meta name=\"foo\" content=\"\" />\n",
+			meta(array('name' => 'foo'))
+		);
+
+		$this->assertEquals(
+			"<meta charset=\"foo\" />\n",
+			meta(array('name' => 'foo', 'type' => 'charset'))
+		);
+
+		$this->assertEquals(
+			"<meta charset=\"foo\" />\n",
+			meta(array('name' => 'foo', 'type' => 'charset'))
+		);
 	}
-
 }
 \ No newline at end of file