diff --git a/application/controllers/test.php b/application/controllers/test.php
index 26dbcee..f6b7e29 100644
--- a/application/controllers/test.php
+++ b/application/controllers/test.php
@@ -8,19 +8,20 @@
  * @copyright Copyright (C) 2010 Istvan Pusztai (twitter.com/istvanp)
  **/
  
-class Test extends Controller {
+class Test extends CI_Controller {
 
-	var $timings = array();
-	var $tests = array();
+	private $timings = array();
+	private $tests = array();
 	
 	/**
 	 * Constructor function
 	 *
 	 * @return void
 	 **/
-	function Test()
+	public function __construct()
+
 	{
-		parent::Controller();
+		parent::__construct();
 		
 		// Set time marker for the start of the test suite
 		$this->benchmark->mark('first');
@@ -38,7 +39,7 @@ function Test()
 		
 		// Disable database debugging so we can test all units without stopping
 		// at the first SQL error
-		$this->db->db_debug = FALSE;
+		// $this->db->db_debug = FALSE;
 		
 		// Create list of tests
 		$this->_map_tests();
@@ -130,7 +131,7 @@ function user_model()
 	 * @author Istvan Pusztai
 	 * @return void
 	 **/
-	function _remap()
+	public function _remap()
 	{	
 		$view_data = array();
 		$action = $this->uri->rsegment(2);
@@ -220,7 +221,7 @@ function _remap()
 	 * @author Istvan Pusztai
 	 * @return void
 	 **/
-	function _map_tests()
+	public function _map_tests()
 	{
 		$methods = get_class_methods($this);
 		natsort($methods);
diff --git a/system/language/english/unit_test_lang.php b/application/language/chinese/unit_test_lang.php
similarity index 100%
rename from system/language/english/unit_test_lang.php
rename to application/language/chinese/unit_test_lang.php
diff --git a/application/language/dutch/unit_test_lang.php b/application/language/dutch/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/dutch/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/english/unit_test_lang.php b/application/language/english/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/english/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/french/unit_test_lang.php b/application/language/french/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/french/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/german/unit_test_lang.php b/application/language/german/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/german/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/italian/unit_test_lang.php b/application/language/italian/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/italian/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/japanese/unit_test_lang.php b/application/language/japanese/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/japanese/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/portuguese/unit_test_lang.php b/application/language/portuguese/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/portuguese/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/romanian/unit_test_lang.php b/application/language/romanian/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/romanian/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/russian/unit_test_lang.php b/application/language/russian/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/russian/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/language/spanish/unit_test_lang.php b/application/language/spanish/unit_test_lang.php
new file mode 100644
index 0000000..39a4636
--- /dev/null
+++ b/application/language/spanish/unit_test_lang.php
@@ -0,0 +1,27 @@
+<?php
+
+$lang['ut_test_name']		= 'Test Name';
+$lang['ut_test_datatype']	= 'Test Datatype';
+$lang['ut_test_value']		= 'Test Value';
+$lang['ut_res_datatype']	= 'Expected Datatype';
+$lang['ut_res_value']		= 'Expected Value';
+$lang['ut_result']			= 'Result';
+$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_file']			= 'File Name';
+$lang['ut_line']			= 'Line Number';
+$lang['ut_passed']			= 'Passed';
+$lang['ut_failed']			= 'Failed';
+$lang['ut_boolean']			= 'Boolean';
+$lang['ut_integer']			= 'Integer';
+$lang['ut_float']			= 'Float';
+$lang['ut_double']			= 'Float'; // can be the same as float
+$lang['ut_string']			= 'String';
+$lang['ut_array']			= 'Array';
+$lang['ut_object']			= 'Object';
+$lang['ut_resource']		= 'Resource';
+$lang['ut_null']			= 'Null';
+$lang['ut_res_sql_error']	= 'SQL Error';
+$lang['ut_res_sql_query']	= 'SQL Query';
+
+/* End of file unit_test_lang.php */
+/* Location: ./system/language/english/unit_test_lang.php */
\ No newline at end of file
diff --git a/application/libraries/MY_Unit_test.php b/application/libraries/MY_Unit_test.php
index e1d34df..9deed10 100644
--- a/application/libraries/MY_Unit_test.php
+++ b/application/libraries/MY_Unit_test.php
@@ -12,9 +12,9 @@ class MY_Unit_test extends CI_Unit_Test
 {
 	var $CI;
 
-	function MY_Unit_test()
+	function __construct()
 	{
-		parent::CI_Unit_Test();
+		parent::__construct();
 		
 		$this->CI =& get_instance();
 	}
diff --git a/application/views/unit_test.php b/application/views/unit_test.php
index 7d45634..a035137 100644
--- a/application/views/unit_test.php
+++ b/application/views/unit_test.php
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
+<?php $this->load->helper('url');?>
 <title>Unit Testing &rsaquo; <?=ucfirst($type)?></title>
-<link rel="stylesheet" type="text/css" href="<?=site_url("assets/css/unit_test.css")?>" charset="utf-8">
+<link rel="stylesheet" type="text/css" href="<?=site_url("assets/css/unit_test.css")?>">
 </head>
 <body>
 <div id="header">
@@ -18,36 +19,40 @@
 	<input type="button" value="Libraries" onclick="window.location='<?=site_url($this->uri->rsegment(1)."/libraries")?>'" />
 	<select id="jump">
 		<optgroup label="Test groups">
-			<option value="<?=site_url($this->uri->rsegment(1)."/all")?>"<? if ($type == 'all') echo ' selected="selected"'?>>All</option>
-		<? foreach($tests as $test_type => $testgroup): ?>
-			<option value="<?=site_url($this->uri->rsegment(1)."/$test_type")?>"<? if ($type == $test_type) echo ' selected="selected"'?>><?=ucfirst($test_type)?></option>
-		<? endforeach; ?>
+			<option value="<?=site_url($this->uri->rsegment(1)."/all")?>"<?php if ($type == 'all') echo ' selected="selected"'?>>All</option>
+		<?php foreach($tests as $test_type => $testgroup) { ?>
+			<option value="<?=site_url($this->uri->rsegment(1)."/$test_type")?>"<?php if ($type == $test_type) echo ' selected="selected"'?>><?=ucfirst($test_type)?></option>
+		<?php } ?>
+
 		</optgroup>
-		<? foreach($tests as $test_type => $testgroup): ?>
+		<?php foreach($tests as $test_type => $testgroup) { ?>
 		<optgroup label="<?=ucfirst($test_type)?>">
-			<? foreach($testgroup as $test): ?>
-			<option value="<?=site_url($this->uri->rsegment(1)."/$test")?>"<? if ($type == $test) echo ' selected="selected"'?>><?=$test?></option>
-			<? endforeach; ?>
+			<?php foreach($testgroup as $test) { ?>
+			<option value="<?=site_url($this->uri->rsegment(1)."/$test")?>"<?php if ($type == $test) echo ' selected="selected"'?>><?=$test?></option>
+			<?php } ?>
+
 		</optgroup>
-		<? endforeach; ?>
+		<?php } ?>
+
 	</select>
 	<input type="button" value="Run" onclick="window.location=document.getElementById('jump').value" />
 </div>
-<? if (isset($msg) && strlen($msg) > 0): ?>
+<?php if (isset($msg) && strlen($msg) > 0) { ?>
 <div id="message">
 	<?=$msg?>
 </div>
-<? endif; ?>
-<? if ($totals['all'] > 0): ?>
+<?php } ?>
+<?php if ($totals['all'] > 0) { ?>
 <div id="report">
 	<div class="summary <?=($totals['failed'] > 0) ? 'fail' : 'pass' ?>">
 		<?=$totals['passed']?> / <?=$totals['all']?> tests passed in <?=$total_time?> seconds
 	</div>
-	<? foreach($report as $key => $test):
-	if (array_key_exists($key, $headings['types']))
-		echo "<h1>{$headings['types'][$key]}</h1>\n";
-	if (array_key_exists($key, $headings['tests']))
-		echo "<h2>{$headings['tests'][$key]}</h2>\n";
+	
+	<?php foreach($report as $key => $test) {
+		if (array_key_exists($key, $headings['types']))
+			echo "<h1>{$headings['types'][$key]}</h1>\n";
+		if (array_key_exists($key, $headings['tests']))
+			echo "<h2>{$headings['tests'][$key]}</h2>\n";
 	?>
 	<div class="test <?=($test['Result'] == 'Passed') ? 'pass' : 'fail' ?>">
 		<div class="result"><?=strtoupper($test['Result'])?></div>
@@ -57,22 +62,22 @@
 			Expected
 				<strong><?=var_export($test['Expected Value'])?></strong> (<?=strtolower($test['Expected Datatype'])?>),
 			returned
-				<? if (is_string($test['Test Value'])): ?>
+				<?php if (is_string($test['Test Value'])): ?>
 				<?=highlight_code($test['Test Value'])?>
-				<? else: ?>
+				<?php else: ?>
 				<strong><?=var_export($test['Test Value'])?></strong> (<?=strtolower($test['Test Datatype'])?>)<br />
-				<? endif; ?>
-				<? if ( ! empty($test['SQL Error'])): ?>
+				<?php endif; ?>
+				<?php if ( ! empty($test['SQL Error'])): ?>
 				<code><?=$test['SQL Error']?></code>
-				<? endif; ?>
-				<? if ( ! empty($test['SQL Query'])): ?>
+				<?php endif; ?>
+				<?php if ( ! empty($test['SQL Query'])): ?>
 				<?=highlight_code($test['SQL Query'])?>
-				<? endif; ?>
+				<?php endif; ?>
 			<em><?=substr($test['File Name'], strlen(FCPATH))?></em> on line <?=$test['Line Number']?>
 		</div>
 	</div>
-	<? endforeach; ?>
+	<?php } ?>
 </div>
-<? endif; ?>
+<?php } ?>
 </body>
 </html>
\ No newline at end of file