diff --git a/tests/main/inc/lib/session_handler.class.test.php b/tests/main/inc/lib/session_handler.class.test.php
index 5c14c77e58..0677ccd6c0 100755
--- a/tests/main/inc/lib/session_handler.class.test.php
+++ b/tests/main/inc/lib/session_handler.class.test.php
@@ -1,5 +1,4 @@
 <?php
-// To can run this test you need comment the line 94 "exit"
 require_once(api_get_path(LIBRARY_PATH).'session_handler.class.php');
 
 class TestSessionHandler extends UnitTestCase {
diff --git a/tests/main/inc/lib/sessionmanager.lib.test.php b/tests/main/inc/lib/sessionmanager.lib.test.php
index 74d55d068c..a0728e8db1 100755
--- a/tests/main/inc/lib/sessionmanager.lib.test.php
+++ b/tests/main/inc/lib/sessionmanager.lib.test.php
@@ -2,17 +2,13 @@
 
 require_once(api_get_path(LIBRARY_PATH).'sessionmanager.lib.php');
 
-Mock::generate('Database');
-Mock::generate('api_failure');
-
-
 class TestSessionManager extends UnitTestCase {
 
 	function testadd_courses_to_session() {
 		$id_session='';
 		$course_list='';
 		ob_start();
-		$res=SessionManager::add_courses_to_session();
+		$res=SessionManager::add_courses_to_session($id_session,$course_list);
 		if(!empty($res)) {
 			$this->assertTrue(is_null($res));
 		} else {
@@ -23,7 +19,6 @@ class TestSessionManager extends UnitTestCase {
 	}
 
 	function testcreate_session() {
-		$idsesion = new MockDatabase();
 		global $_user;
 		$sname='';
 		$syear_start='';
@@ -36,15 +31,15 @@ class TestSessionManager extends UnitTestCase {
 		$snb_days_acess_after='';
 		$nolimit='';
 		$coach_username='';
+		$id_session_category='';
+		$id_visibility='';
 		$id_session=Database::insert_id();
 		ob_start();
-		$res=SessionManager::create_session($sname,$syear_start,$smonth_start,$sday_start,$syear_end,$smonth_end,$sday_end,$snb_days_acess_before,$snb_days_acess_after,$nolimit,$coach_username);
-		$idsesion->expectOnce(Database::insert_id());
-		$this->assertTrue(is_object($idsesion));
+		$res=SessionManager::create_session($sname,$syear_start,$smonth_start,$sday_start,$syear_end,$smonth_end,$sday_end,$snb_days_acess_before,$snb_days_acess_after,$nolimit,$coach_username,$id_session_category,$id_visibility);
 		$this->assertTrue(is_numeric($id_session));
 		$this->assertTrue(is_string($res));
 		ob_end_clean();
-		//var_dump($idsesion);
+		//var_dump($id_session);
 	}
 
 	function testcreate_session_extra_field() {
@@ -74,7 +69,6 @@ class TestSessionManager extends UnitTestCase {
 	*/
 
 	function testedit_session() {
-		$idsesion = new MockDatabase();
 		global $_user;
 		$id=1;
 		$name='';
@@ -88,9 +82,9 @@ class TestSessionManager extends UnitTestCase {
 		$nb_days_acess_after='';
 		$nolimit='';
 		$id_coach='';
-		$res=SessionManager::edit_session($id,$name,$year_start,$month_start,$day_start,$year_end,$month_end,$day_end,$nb_days_acess_before,$nb_days_acess_after,$nolimit,$id_coach);
-		$idsesion->expectOnce(Database::escape_string($name));
-		$this->assertTrue(is_object($idsesion));
+		$id_session_category='';
+		$id_visibility='';
+		$res=SessionManager::edit_session($id,$name,$year_start,$month_start,$day_start,$year_end,$month_end,$day_end,$nb_days_acess_before,$nb_days_acess_after,$nolimit,$id_coach, $id_session_category, $id_visibility);
 		$this->assertTrue(is_numeric($id));
 		$this->assertTrue(is_string($res));
 		//var_dump($id);
@@ -104,7 +98,7 @@ class TestSessionManager extends UnitTestCase {
 	}
 
 	function testrelation_session_course_exist() {
-		$session_id='';
+		$session_id=1;
 		$course_id='';
 		$res=SessionManager::relation_session_course_exist($session_id, $course_id);
 		if(!is_numeric($res)) $this->assertTrue(is_bool($res));
diff --git a/tests/main/inc/lib/social.lib.test.php b/tests/main/inc/lib/social.lib.test.php
index 971865437b..d625a4414e 100755
--- a/tests/main/inc/lib/social.lib.test.php
+++ b/tests/main/inc/lib/social.lib.test.php
@@ -39,32 +39,28 @@ class TestSocial extends UnitTestCase{
 
 	}
 	*/
-
+/*
+//Remove or deprecate
+ 
 	public function testRemovedFriend(){
-		$instans= new MockDatabase();
-		$instans1= new MockDatabase();
+		//$instans= new MockDatabase();
+		//$instans1= new MockDatabase();
 		$friend_id=4;
 		$res = SocialManager::removed_friend ($friend_id);
 		$instans->expectCallCount(Database,8,'' );
 		$instans1->expectMaximumCallCount(Database,10,'');
-		$this->assertTrue(is_object($instans));
-		$this->assertTrue(is_object($instans1));
+		//$this->assertTrue(is_object($instans));
+		//$this->assertTrue(is_object($instans1));
 		$this->assertTrue(is_null($res));
 		//var_dump($res);
 		//var_dump($instans);
 		//var_dump($instans1);
 	}
-
+*/
 	public function testShowListTypeFriends(){
-		$instans= new MockDatabase();
-		$instans1= new MockDatabase();
 		$res =SocialManager::show_list_type_friends();
-		$instans->expectOnce(Database);
-		$instans1->expectMaximumCallCount(Database,10,'');
-		$this->assertTrue(is_object($instans) || is_object($instans1));
 		$this->assertTrue($res);
 		$this->assertTrue(is_array($res));
-		$this->assertTrue($instans);
 		//var_dump($res);
 		//var_dump($instans1);
 	}
@@ -80,22 +76,13 @@ class TestSocial extends UnitTestCase{
 	}
 
 	public function testGetRelationBetweenContacts (){
-		$instans= new MockDatabase();
-		$instans1= new MockDatabase();
-		$instans2= new MockDatabase();
 		$user_id=1;
 		$user_friend=3;
 		$res =SocialManager::get_relation_between_contacts ($user_id,$user_friend);
-		$instans->expectOnce(Database);
-		$instans1->expectMinimumCallCount(Database);
-		$instans2->expectMaximumCallCount(Database);
 		if(!is_numeric($res)):
 		$this->assertTrue(is_string($res));
 		$this->assertTrue($res);
 		endif;
-		$this->assertTrue(is_object($instans));
-		$this->assertTrue(is_object($instans1));
-		$this->assertTrue(is_object($instans2));
 		//var_dump($res);
 		//var_dump($instans);
 		//var_dump($instans1);
@@ -116,14 +103,11 @@ class TestSocial extends UnitTestCase{
 	}
 */
 	public function testGetListPathWebByUserId(){
-		$instans = new MockUserManager();
 		$user_id=1;
 		$id_group=null;
 		$search_name=null;
 		$res = SocialManager::get_list_path_web_by_user_id ($user_id,$id_group,$search_name);
-		$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['friend_user_id'],'web',false,true));
 		if(!($res===true)):
-		$this->assertTrue(is_object($instans));
 		$this->assertTrue(is_array($res));
 		endif;
 		//var_dump($res);
@@ -131,84 +115,62 @@ class TestSocial extends UnitTestCase{
 	}
 
 	public function testGetListWebPathUserInvitationByUserId(){
-		$instans = new MockUserManager();
 		$user_id=1;
 		$res = SocialManager::get_list_web_path_user_invitation_by_user_id($user_id);
-		$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['user_sender_id'],'web',false,true));
 		if(is_array($res))
 		$this->assertTrue(is_array($res));
 		else
 		$this->assertTrue(is_null($res));
-		$this->assertTrue(is_object($instans));
 		//var_dump($res);
 		//var_dump($instans);
 	}
 
 	public function testSendInvitationFriend(){
-		$instans = new MockDatabase();
 		$user_id=1;
 		$friend_id=3;
 		$message_title='hello';
 		$message_content='hola';
 		$res = SocialManager ::send_invitation_friend ($user_id,$friend_id,$message_title,$message_content);
-		$instans->expectMaximumCallCount(Database);
 		if(!is_null($res)):
 		$this->assertTrue(is_bool($res));
 		$this->assertTrue(is_bool($res===true || $res === false));
 		endif;
-		$this->assertTrue(is_object($instans));
 		//var_dump($res);
 		//var_dump($instans);
 	}
 
 	public function testGetMessageNumberInvitationByUserId(){
-		$instans = new MockDatabase();
 		$user_receiver_id=3;
 		$res = SocialManager::get_message_number_invitation_by_user_id ($user_receiver_id);
-		$instans->expectMaximumCallCount(Database);
 		if(is_string($res)):
 		$this->assertTrue(is_numeric($res));
 		endif;
-		$this->assertTrue(is_object($instans));
-
 		//var_dump($res);
 		//var_dump($instans);
 	}
 
 	public function testGetListInvitationOfFriendsByUserId(){
-		$instans = new MockDatabase();
 		$user_id=1;
 		$res = SocialManager::get_list_invitation_of_friends_by_user_id ($user_id);
-		$instans->expectCallCount(Database,3,'');
 		$this->assertTrue(is_array($res));
-		$this->assertTrue(is_object($instans));
 		//var_dump($res);
 		//var_dump($instans);
 	}
 
 	public function testInvitationAccepted(){
-		$instans = new MockDatabase();
-		$instans1= new MockDatabase();
 		$user_send_id=1;
 		$user_receiver_id=3;
 		$res = SocialManager::invitation_accepted ($user_send_id,$user_receiver_id);
-		$instans->expectOnce(Database::get_main_table(TABLE_MAIN_MESSAGE));
-		$instans1->expectOnce(Database::query($sql,__FILE__,__LINE__));
 		$this->assertTrue(is_null($res));
-		$this->assertTrue(is_object($instans));
-		$this->assertTrue(is_object($instans1));
 		//var_dump($res);
 		//var_dump($instans);
 		//var_dump($instans1);
 	}
 
 	public function testInvitationDenied(){
-		$instans = new MockDatabase();
 		$user_send_id=1;
 		$user_receiver_id=3;
 		$res = SocialManager::invitation_denied($user_send_id,$user_receiver_id);
-		$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
-		$this->assertTrue(is_object($instans));
 		$this->assertTrue(is_null($res));
 		//var_dump($res);
 		//var_dump($instans);
@@ -217,13 +179,10 @@ class TestSocial extends UnitTestCase{
 
 
 	public function testQualifyFriend(){
-		$instans = new MockDatabase();
 		$id_friend_qualify=2;
 		$type_qualify=1;
 		$res = SocialManager::qualify_friend($id_friend_qualify,$type_qualify);
-		$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
 		$this->assertTrue(is_null($res));
-		$this->assertTrue(is_object($instans));
 		//var_dump($res);
 	}
 	/*
diff --git a/tests/main/inc/lib/specific_fields_manager.lib.test.php b/tests/main/inc/lib/specific_fields_manager.lib.test.php
index ad56c19bf5..f739894f39 100755
--- a/tests/main/inc/lib/specific_fields_manager.lib.test.php
+++ b/tests/main/inc/lib/specific_fields_manager.lib.test.php
@@ -36,7 +36,8 @@ class TestSpecificFieldsManager extends UnitTestCase {
 		$course_id='';
 		$tool_id='';
 		$ref_id='';
-		$res=delete_all_specific_field_value($course_id, $tool_id, $ref_id);
+		$id_specific_field='';
+		$res=delete_all_specific_field_value($course_id, $id_specific_field, $tool_id, $ref_id);
 		$this->assertTrue(is_null($res));
 		//var_dump($res);
 	}
@@ -79,7 +80,7 @@ class TestSpecificFieldsManager extends UnitTestCase {
 		$prefix='';
 		$course_code='';
 		$tool_id='';
-		$ref_id='';
+		$ref_id=1;
 		$table_sf = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
   		$table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
 		$sql = sprintf($sql, $table_sf, $table_sfv, $prefix, $course_code, $tool_id, $ref_id);
diff --git a/tests/main/inc/lib/tablesort.lib.test.php b/tests/main/inc/lib/tablesort.lib.test.php
index d5419e6d04..c7be2aba69 100755
--- a/tests/main/inc/lib/tablesort.lib.test.php
+++ b/tests/main/inc/lib/tablesort.lib.test.php
@@ -49,7 +49,7 @@ class TestTablesort extends UnitTestCase{
 	}
 
 	public function testIsDateColumn(){
-		$data='';
+		$data=array();
 		$column='';
 		$res = TableSort::is_date_column($data, $column);
 		if(is_bool($res))
@@ -61,7 +61,7 @@ class TestTablesort extends UnitTestCase{
 	}
 
 	public function testIsImageColumn(){
-		$data='';
+		$data=array();
 		$column='';
 		$res = TableSort::is_image_column($data, $column);
 		if(is_bool($res)){