Merge pull request #5354 from carusogabriel/refactoring-tests

Refactoring tests

Conflicts resolved:
	tests/codeigniter/core/Utf8_test.php
	tests/codeigniter/database/query_builder/group_test.php
	tests/codeigniter/libraries/Form_validation_test.php
diff --git a/tests/codeigniter/database/query_builder/limit_test.php b/tests/codeigniter/database/query_builder/limit_test.php
index a0954c7..a1976d4 100644
--- a/tests/codeigniter/database/query_builder/limit_test.php
+++ b/tests/codeigniter/database/query_builder/limit_test.php
@@ -26,7 +26,7 @@
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -40,9 +40,9 @@
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 		$this->assertEquals('Accountant', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 	}
 
-}
\ No newline at end of file
+}