diff --git a/main/admin/sub_language.php b/main/admin/sub_language.php
index 9613f9c42c..bed2e0c9e1 100755
--- a/main/admin/sub_language.php
+++ b/main/admin/sub_language.php
@@ -11,7 +11,7 @@ require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-$htmlHeadXtra[] ='<script type="text/javascript">
+$htmlHeadXtra[] ='<script>
  $(document).ready(function() {
 	$(".save").click(function() {
 		var button_name=$(this).attr("name");
diff --git a/main/course_home/activity.php b/main/course_home/activity.php
index 324aa6651b..be9203ca5a 100755
--- a/main/course_home/activity.php
+++ b/main/course_home/activity.php
@@ -73,22 +73,22 @@ if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, t
 
     $my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
     $items = CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Authoring'),  $items, 'course-tools-author');
+    $content .= return_block(get_lang('Authoring'), $items, 'course-tools-author');
 
     $my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
     $list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
 
     $my_list = array_merge($my_list,$list2);
     $items =  CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Interaction'),  $items, 'course-tools-interaction');
+    $content .= return_block(get_lang('Interaction'), $items, 'course-tools-interaction');
 
     $my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
     $items = CourseHome::show_tools_category($my_list);
-    $content .= return_block(get_lang('Administration'),  $items , 'course-tools-administration');
+    $content .= return_block(get_lang('Administration'), $items, 'course-tools-administration');
 
 } elseif (api_is_coach()) {
     $content .= $pluginExtra;
-    if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
+    if (api_get_setting('show_session_data') === 'true' && $session_id > 0) {
         $content .= '<div class="row">
             <div class="col-xs-12 col-md-12">
 			<span class="viewcaption">'.get_lang('SessionData').'</span>
@@ -109,7 +109,7 @@ if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, t
         $onlyMaintenanceList = array();
 
         foreach ($myList as $item) {
-            if ($item['name'] == 'course_maintenance') {
+            if ($item['name'] === 'course_maintenance') {
                 $item['link'] = 'course_info/maintenance_coach.php';
 
                 $onlyMaintenanceList[] = $item;
@@ -131,7 +131,7 @@ if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, t
     if ($isDrhOfCourse) {
         $addUserTool = true;
         foreach ($tools as $tool) {
-            if ($tool['name'] == 'user') {
+            if ($tool['name'] === 'user') {
                 $addUserTool = false;
                 break;
             }
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index de3888e3d5..37ec78d7ea 100755
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -654,7 +654,7 @@ class CourseHome
      * @param array $all_tools_list List of tools as returned by get_tools_category()
      * @param bool  $rows
      *
-     * @return void
+     * @return string
      */
     public static function show_tools_category($all_tools_list, $rows = false)
     {
@@ -1242,7 +1242,7 @@ class CourseHome
                 }
             }
             $html .= '</div>';
-            
+
         }
 
         return $html;
diff --git a/tests/test_suite.php b/tests/test_suite.php
index 58c7c9bc3e..53846969cc 100755
--- a/tests/test_suite.php
+++ b/tests/test_suite.php
@@ -68,10 +68,10 @@ require_once 'simpletest/xml.php';
  * Start to load the tests files
  * @package chamilo.tests
  */
-class TestsSuite extends TestSuite {
-
-    function TestsSuite() {
-
+class TestsSuite extends TestSuite
+{
+    public function _construct()
+    {
         // Name of this test suite
         $this->TestSuite('All tests suite');
 
@@ -82,7 +82,6 @@ class TestsSuite extends TestSuite {
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/surveymanager.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/session_handler.class.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/sessionmanager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/classmanager.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/export.lib.inc.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/legal.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/mail.lib.inc.test.php');
@@ -99,7 +98,7 @@ class TestsSuite extends TestSuite {
     	//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/blog.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/urlmanager.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/stats.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php');        
+        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/display.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/document.lib.test.php');
         $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/events.lib.inc.test.php');