diff --git a/tests/main/inc/lib/course.lib.test.php b/tests/main/inc/lib/course.lib.test.php
index 5d58956b3e..b350582b7c 100644
--- a/tests/main/inc/lib/course.lib.test.php
+++ b/tests/main/inc/lib/course.lib.test.php
@@ -1,11 +1,17 @@
 <?php
 /*
- * Created on 17/06/2009
+ * To can run this test you need comment this line or "die(mysql_error())" in 1374 course.lib.php
  *
  */
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
+require_once(api_get_path(LIBRARY_PATH).'course.lib.php'); 
+require_once(api_get_path(LIBRARY_PATH).'mail.lib.inc.php'); 
+require_once(api_get_path(LIBRARY_PATH).'database.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 
+Mock::generate('Database');
+Mock::generate('CourseManager');
+Mock::generate('Display');
+
 class TestCourse extends UnitTestCase{
 	
 	public $tcourse;
@@ -75,7 +81,7 @@ class TestCourse extends UnitTestCase{
 	 *todo public function testCreateCourseExtrField()
 	 *todo public function testUpdateCourseExtraFieldValue()
 	 */
-	 
+	
 	 public function testGetCourseInformation(){
 	  	$res = $this->tcourse->get_course_information(1211);
 	 	$this->assertFalse($res);
@@ -86,10 +92,8 @@ class TestCourse extends UnitTestCase{
 	 
 	 public function testGetCoursesList(){
 	 	$res = $this->tcourse->get_courses_list();
-	 	$this->assertTrue($res);
-	  	$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	 	
+	 	$this->assertTrue(is_array($res));
+	 	//var_dump($res);	
 	 }
 	 
 	 public function testGetAccessSettings(){
@@ -97,7 +101,6 @@ class TestCourse extends UnitTestCase{
 	 	$this->assertFalse($res);
 	 	$this->assertTrue($this->tcourse->get_access_settings(0001)===is_array($res));
 	 	$this->assertFalse(is_null($res));
-
 	 }
 	 
 	 public function testGetUserInCourseStatus(){
@@ -105,23 +108,20 @@ class TestCourse extends UnitTestCase{
 		$this->assertFalse($res);
 		$this->assertTrue($this->tcourse->get_user_in_course_status(01,0001)===null);
 		$this->assertTrue(is_null($res));
-
 	 }
 	 
 	 public function testUnsubscribeUser(){
 	 	$res = $this->tcourse->unsubscribe_user();
 	 	$this->assertTrue($this->tcourse->unsubscribe_user()===null);
 	 	$this->assertNull($res);
-	 	$this->assertFalse(is_string($res));
-	 	
+	 	$this->assertFalse(is_string($res));	
 	 }
 	 
 	 public function testSubscribeUser(){
 	 	$res = $this->tcourse->subscribe_user();
 	 	$this->assertFalse($res);
 	 	$this->assertTrue(is_bool($res));
-	 	$this->assertTrue($this->tcourse->subscribe_user()===false);
-	 	
+	 	$this->assertTrue($this->tcourse->subscribe_user()===false);	
 	 }
 	 
 	public function testAddUserToCourse(){
@@ -130,9 +130,9 @@ class TestCourse extends UnitTestCase{
 		$this->assertTrue($this->tcourse->add_user_to_course()=== false);
 		$this->assertTrue(is_bool($res));
 	}
-	/*  function deprecated
-	public function testGetRealCourseCodeSelectHtml(){}*/
 	
+	//function deprecated public function testGetRealCourseCodeSelectHtml(){}
+		
 	public function testCheckParameter(){
 		$res = $this->tcourse->check_parameter();
 		$this->assertFalse($res);
@@ -146,8 +146,7 @@ class TestCourse extends UnitTestCase{
 		$this->assertTrue(is_null($res));
 		$this->assertFalse($res);
 		$this->assertTrue($res=== null);
-		$this->assertEqual($res,null);
-		
+		$this->assertEqual($res,null);		
 	}
 	
 	public function testIsExistingCourseCode() {
@@ -156,27 +155,45 @@ class TestCourse extends UnitTestCase{
 		$this->assertTrue(is_bool($res));
 	}
 	
+	/** Return a array() but now its empty, with this test is cheking is get the list course
+	 * @author Arthur Portugal <arthur.portugal@dokeos.com>
+	 */
+	
 	public function testGetRealCourseList(){
-		$res = $this->tcourse->get_real_course_list();
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-		
+		$realgrouplist = new MockDatabase();
+		$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
+		$sql_query = "SELECT * FROM $course_table WHERE target_course_code IS NULL";
+		$sql_result = api_sql_query($sql_query, __FILE__, __LINE__);
+		$result = Database::fetch_array($sql_result);
+		$real_course_list[] = $result;
+		$this->courseManager = new CourseManager();
+		$res=$this->courseManager->get_real_course_list();
+		$realgrouplist->expectOnce($real_course_list);
+		$this->assertTrue(is_array($real_course_list));
+		//var_dump($real_course_list);	
 	}
-	
+
 	public function testGetVirtualCourseList(){
-		$res = $this->tcourse->get_virtual_course_list();
-		$this->assertFalse($res);
-		$this->assertTrue(is_null($res));
-		$this->assertNull($res);
-	//	$this->assertTrue(is_array($res));
+		$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
+		$sql_query = "SELECT * FROM $course_table WHERE target_course_code IS NOT NULL";
+		$sql_result = api_sql_query($sql_query, __FILE__, __LINE__);
+		$result = Database::fetch_array($sql_result);
+		$virtual_course_list[] = $result;
+		$res=$this->tcourse->get_virtual_course_list();
+		
+		if (!empty($res)) {
+			$this->assertTrue(is_array($res));
+		} else {
+			$this->assertTrue(is_null($res));
+		}
+		
 	}
 	
 	public function testGetRealCourseListOfUserAsCourseAdmin(){
 		$res = $this->tcourse->get_real_course_list_of_user_as_course_admin();
 		$this->assertFalse($res);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($this->tcourse->get_real_course_list_of_user_as_course_admin()===array());
-				
+		$this->assertTrue($this->tcourse->get_real_course_list_of_user_as_course_admin()===array());			
 	}
 	
 	public function testGetCourseListOfUserAsCourseAdmin(){
@@ -189,8 +206,7 @@ class TestCourse extends UnitTestCase{
 		$res = $this->tcourse->determine_course_title_from_course_info();
 		$this->assertFalse($res);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($this->tcourse->determine_course_title_from_course_info()=== array());
-		
+		$this->assertTrue($this->tcourse->determine_course_title_from_course_info()=== array());	
 	}
 	
 	public function testCreateCombinedName(){
@@ -199,6 +215,7 @@ class TestCourse extends UnitTestCase{
 		$this->assertTrue(is_string($res));
 		//var_dump($res);
 	}
+	
 	public function testCreateCombinedCode(){
 		$res = $this->tcourse->create_combined_code();
 		$this->assertFalse($res);
@@ -228,7 +245,6 @@ class TestCourse extends UnitTestCase{
 		$this->assertFalse($this->tcourse->is_virtual_course_from_visual_code()===null);
 	}
 		
-
 	public function testHasVirtualCourseFromCode(){
 		$res = $this->tcourse->has_virtual_courses_from_code();
 		$this->assertFalse($res);
@@ -310,63 +326,85 @@ class TestCourse extends UnitTestCase{
 		$this->assertFalse($res);
 		$this->assertTrue(is_array($res));
 	}
-	
+		
 	public function testGetGroupListOfCourse(){
-		$course_code='0001';
-		$session_id=0;
-		ob_start();
-		$res = $this->tcourse->get_group_list_of_course($course_code,null);
-		ob_end_clean();
-		$this->assertFalse($res);
+		$grouplist = new MockDatabase();
+		$course_code = 'TEST';
+		$course_info = Database :: get_course_info($course_code);
+		$database_name = $course_info['db_name'];
+		$session_id=1;
+		$group_user_table = Database :: get_course_table(TABLE_GROUP_USER, $database_name);
+		$this->courseManager = new CourseManager();
+		$res=$this->courseManager->get_group_list_of_course($course_code);
+		$grouplist->expectOnce($group_list = array());
+		$this->assertTrue(is_object($this->courseManager));
+		//var_dump($res);
 	}
 	
+	
 	public function testAttemptCreateVirtualCourse(){
-		$real_course_code = '0001';
-		$course_title = 'training course';
-		$wanted_course_code='0001';
-		$course_language= 'english';
-		$course_category= 'lang';
-		ob_start();
-		$res = $this->tcourse->attempt_create_virtual_course($real_course_code,$course_title,$wanted_course_code,$course_language,$course_category);// ob_get_contents();
-		ob_end_clean();
-		$this->assertFalse($res);
-		$this->assertTrue(is_bool($res));
-		
+	     $createvirtual = new MockDisplay();
+	     $real_course_code = 'TEST';
+ 		 $course_title = 'test';
+ 		 $wanted_course_code = '01';
+  	     $course_language= 'english';
+		 $course_category= 'lang';
+		 $this->courseManager = new CourseManager();
+		 $res = $this->courseManager->attempt_create_virtual_course($real_course_code,$course_title,$wanted_course_code,$course_language,$course_category);
+		 $createvirtual->expectOnce('Display::display_normal_message',array( $course_title . " - " . get_lang('CourseCreationSucceeded') ));
+		 $createvirtual->expectOnce('CourseManager :: create_virtual_course',array($real_course_code, $course_title, $wanted_course_code, $course_language, $course_category));
+		 $this->assertTrue(is_object($this->courseManager));
+		 $this->assertTrue(is_bool($res));
+		 //var_dump($res);
 	}
 	
 	public function testCreateVirtualCourse(){
+		$createvirtualcourse = new MockDisplay();
 		global $firsExpirationDelay;
-		$real_course_code = '0002';
-		$course_title = 'training course';
-		$wanted_course_code='0002';
+		$user_id = api_get_user_id();
+		$real_course_code = 'TEST';
+		$course_title = 'test';
+		$wanted_course_code = '01';
 		$course_language= 'english';
 		$course_category= 'lang';
-		$res = $this->tcourse->create_virtual_course($real_course_code, $course_title, $wanted_course_code, $course_language, $course_category);
-		$this->assertTrue($res);
-		$this->assertTrue($this->tcourse->create_virtual_course()===true);
-		
+		$course_sys_code = '';
+		$course_screen_code = '';
+		$real_course_info = '';
+		$course_repository = '';
+		$course_db_name = '';
+		$responsible_teacher = '';
+		$faculty_shortname = '';
+		$teacher_id = '';
+		//ob_start();
+		$this->courseManager = new CourseManager();
+		$res=$this->courseManager->create_virtual_course($real_course_code, $course_title, $wanted_course_code, $course_language, $course_category);
+		//ob_get_contents();
+		$createvirtualcourse->expectOnce('Display :: display_error_message',array($wanted_course_code." - ".get_lang("CourseCodeAlreadyExists")));
+		//$createvirtualcourse->expectOnce(register_course($course_sys_code, $course_screen_code, $course_repository, $course_db_name, $responsible_teacher, $faculty_shortname, $course_title, $course_language, $teacher_id));
+		$this->assertTrue(is_object($this->courseManager));
+		$this->assertTrue(is_bool($res));
+		$this->assertTrue(is_object($createvirtualcourse));
+		//ob_end_clean();
+		//print_r($createvirtualcourse);
+		//var_dump($createvirtualcourse);
 	}
 	
 	public function testDeleteCourse(){
 		global $_configuration;
-		$code = '0002';
+		$code = '01';
 		$res = $this->tcourse->delete_course($code);
-		$this->assertFalse();
 		$this->assertTrue($this->tcourse->delete_course()===null);
 		$this->assertTrue(is_null($res));
-	
 	}
 	
 	public function testCreateDatabaseDump(){
 		global $_configuration;
-		$course_code='0001';
+		$course_code='COD12';
 		$res = $this->tcourse->create_database_dump($course_code);
 		$this->assertFalse($res);
 		$this->assertTrue(is_null($res));
 		$this->assertTrue($this->tcourse->create_database_dump()=== null);
-
 	}
-			
 
 	public function testUserCourseSort(){
 		$user_id ='01';
@@ -375,7 +413,6 @@ class TestCourse extends UnitTestCase{
 		$this->assertTrue($res);
 		$this->assertTrue(is_numeric($res));
 		$this->assertFalse($this->tcourse->UserCourseSort()=== null);
-		
 	}
 	
 	public function testSelectAndSortCategories(){
@@ -384,37 +421,29 @@ class TestCourse extends UnitTestCase{
         $categories_select = $form->addElement('select', 'category_code', get_lang('Fac'), $categories);
 		$res = $this->tcourse->select_and_sort_categories($categories_select);
 		$this->assertFalse($res);
-		$this->assertTrue(is_null($res));
-				
+		$this->assertTrue(is_null($res));			
 	}
 	
 	public function testCourseExists(){
-		$course_code='0001';
+		$course_code='COD12';
 		$res=$this->tcourse->course_exists($course_code);
-		$this->assertTrue($res);
 		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($this->tcourse->course_exists()===0);
-		
+		$this->assertTrue($this->tcourse->course_exists()===0);	
 	}
 	
-	public function testEmailToTutor(){
-		/*$user_id=1;
-		$course_code='0001';
-		$send_to_tutor_also=false;*/
-		$res = $this->tcourse->email_to_tutor(/*$user_id,$course_code,$send_to_tutor_also*/);
-		$this->assertFalse($res);
-		$this->assertFalse(is_null($res));
-				
+	public function testEmailToTutor() {
+		$user_id= '';
+		$course_code= 'test';
+		$res=CourseManager::email_to_tutor($course_code,$user_id);
+		$this->assertTrue(is_string($course_code));
+		//var_dump($res);
 	}
 	
 	public function testGetCoursesListByUserId(){
-		$user_id = '01';
+		$user_id = '';
 		$res = $this->tcourse->get_courses_list_by_user_id($user_id);
-		$this->assertTrue($res);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($res,array());
-		$this->assertFalse(is_null($res));
-	
+		//var_dump($res);
 	}
 	
 	public function testGetCourseIdFromPath(){
@@ -427,24 +456,26 @@ class TestCourse extends UnitTestCase{
 	
 	public function testGetCoursesInfoFromVisualCode(){
 		$code = '0001';
-		$res = $this->tcourse->get_courses_info_from_visual_code($code);
+		$res=$this->tcourse->get_courses_info_from_visual_code($code);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($res);
+		//var_dump($res);
 	}
 	
 	public function testGetEmailsOfTutorsToCourse(){
-		$code = '0001';
-		$res = $this->tcourse->get_emails_of_tutors_to_course($code);
+		$code = '';
+		$res= $this->tcourse->get_emails_of_tutors_to_course($code);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($res,array());
-		$this->assertTrue($res);
+		//var_dump($res);
 	}
 	
 	public function testGetEmailOfTutorToSession(){
-		$session = '1';
-		$res = $this->tcourse->get_email_of_tutor_to_session($session);
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
+		$session = '';
+		ob_start();
+		$this->tcourse->get_email_of_tutor_to_session($session);
+		$res = ob_get_contents();
+		$this->assertTrue(is_string($res));
+		ob_end_clean();
+		//var_dump($res);
 	}
 	
 	public function testCreateCourseExtraField(){