diff --git a/mediastreamer2 b/mediastreamer2
index e35a1e71b..3389c9cc5 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e35a1e71bdc64bc914b866b1a66815d5e47f8a01
+Subproject commit 3389c9cc5f6b0c78ca237cc1ca84bc4e01e24a47
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 01a9b3258..d13e86889 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1933,179 +1933,6 @@ static void call_with_privacy2(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	MSList *iterator;
-	MSList* lcs;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* pauline_called_by_laure=NULL;
-	LinphoneCallParams *laure_params=linphone_core_create_default_call_parameters(laure->lc);
-	LinphoneCallParams *marie_params=linphone_core_create_default_call_parameters(marie->lc);
-
-	if (enable_caller_privacy)
-		linphone_call_params_set_privacy(marie_params,LinphonePrivacyId);
-
-	lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	CU_ASSERT_TRUE(call_with_caller_params(marie,pauline,marie_params));
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-
-	if (enable_caller_privacy)
-		linphone_call_params_set_privacy(laure_params,LinphonePrivacyId);
-
-	CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(laure->lc,pauline->identity,laure_params));
-
-	CU_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&pauline->stat.number_of_LinphoneCallIncomingReceived
-							,2));
-
-	CU_ASSERT_EQUAL(laure->stat.number_of_LinphoneCallOutgoingProgress,1);
-
-
-	CU_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&laure->stat.number_of_LinphoneCallOutgoingRinging
-							,1));
-
-	for (iterator=(MSList *)linphone_core_get_calls(pauline->lc);iterator!=NULL;iterator=iterator->next) {
-		LinphoneCall *call=(LinphoneCall *)iterator->data;
-		if (call != pauline_called_by_marie) {
-			/*fine, this is the call waiting*/
-			pauline_called_by_laure=call;
-			linphone_core_accept_call(pauline->lc,pauline_called_by_laure);
-		}
-	}
-
-	CU_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&laure->stat.number_of_LinphoneCallConnected
-							,1));
-
-	CU_ASSERT_TRUE(wait_for(pauline->lc
-								,marie->lc
-								,&marie->stat.number_of_LinphoneCallPausedByRemote
-								,1));
-
-	if (pauline_called_by_laure && enable_caller_privacy )
-		CU_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(pauline_called_by_laure)),LinphonePrivacyId);
-	/*wait a bit for ACK to be sent*/
-	wait_for_list(lcs,NULL,0,1000);
-	linphone_core_terminate_all_calls(pauline->lc);
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-static void call_waiting_indication(void) {
-	call_waiting_indication_with_param(FALSE);
-}
-
-static void call_waiting_indication_with_privacy(void) {
-	call_waiting_indication_with_param(TRUE);
-}
-
-static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManager* pauline, LinphoneCoreManager* laure) {
-
-	stats initial_marie_stat;
-	stats initial_pauline_stat;
-	stats initial_laure_stat;
-
-	LinphoneCall* marie_call_pauline;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* marie_call_laure;
-
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	CU_ASSERT_TRUE(call(marie,pauline));
-	marie_call_pauline=linphone_core_get_current_call(marie->lc);
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-	CU_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
-
-	CU_ASSERT_TRUE(call(marie,laure));
-	initial_marie_stat=marie->stat;
-	initial_pauline_stat=pauline->stat;
-	initial_laure_stat=laure->stat;
-
-	marie_call_laure=linphone_core_get_current_call(marie->lc);
-
-	CU_ASSERT_PTR_NOT_NULL_FATAL(marie_call_laure);
-	linphone_core_add_to_conference(marie->lc,marie_call_laure);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1,5000));
-
-	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallResuming,initial_marie_stat.number_of_LinphoneCallResuming+1,2000));
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,5000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+2,3000));
-
-	CU_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
-	CU_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3);
-
-	/*
-	 * FIXME: check_ice cannot work as it is today because there is no current call for the party that hosts the conference
-	if (linphone_core_get_firewall_policy(marie->lc) == LinphonePolicyUseIce) {
-		if (linphone_core_get_firewall_policy(pauline->lc) == LinphonePolicyUseIce) {
-			check_ice(marie,pauline,LinphoneIceStateHostConnection);
-		}
-		if (linphone_core_get_firewall_policy(laure->lc) == LinphonePolicyUseIce) {
-			check_ice(marie,laure,LinphoneIceStateHostConnection);
-		}
-	}
-	*/
-
-	linphone_core_terminate_conference(marie->lc);
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-
-	ms_list_free(lcs);
-}
-static void simple_conference(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	simple_conference_base(marie,pauline,laure);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-}
-
-static void simple_conference_with_ice(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-
-	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
-	linphone_core_set_stun_server(marie->lc,"stun.linphone.org");
-	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
-	linphone_core_set_stun_server(pauline->lc,"stun.linphone.org");
-	linphone_core_set_firewall_policy(laure->lc,LinphonePolicyUseIce);
-	linphone_core_set_stun_server(laure->lc,"stun.linphone.org");
-
-	simple_conference_base(marie,pauline,laure);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-}
-
 static void srtp_call() {
 	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
@@ -2233,8 +2060,11 @@ static void call_with_mkv_file_player(void) {
 	char hellomkv[256];
 	char hellowav[256];
 	char *recordpath;
+#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
 	double similar;
 	const double threshold = 0.9;
+#define DO_AUDIO_CMP
+#endif
 
 	if (!is_format_supported(marie->lc,"mkv")){
 		ms_warning("Test skipped, no mkv support.");
@@ -2275,7 +2105,7 @@ static void call_with_mkv_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
+#ifdef DO_AUDIO_CMP	
 	CU_ASSERT_TRUE(ms_audio_diff(hellowav,recordpath,&similar,NULL,NULL)==0);
 	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
@@ -2575,227 +2405,6 @@ static void early_media_call_with_codec_update(void){
 	early_media_call_with_update_base(TRUE);
 }
 
-static void simple_call_transfer(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall *marie_calling_pauline;
-	LinphoneCall *marie_calling_laure;
-
-	char* laure_identity=linphone_address_as_string(laure->identity);
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-
-	CU_ASSERT_TRUE(call(marie,pauline));
-	marie_calling_pauline=linphone_core_get_current_call(marie->lc);
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-	reset_counters(&laure->stat);
-
-
-	linphone_core_transfer_call(pauline->lc,pauline_called_by_marie,laure_identity);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallRefered,1,2000));
-	/*marie pausing pauline*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPausing,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausedByRemote,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPaused,1,2000));
-	/*marie calling laure*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-
-	CU_ASSERT_PTR_NOT_NULL(linphone_call_get_transfer_target_call(marie_calling_pauline));
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
-	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-
-	marie_calling_laure=linphone_core_get_current_call(marie->lc);
-	CU_ASSERT_PTR_NOT_NULL_FATAL(marie_calling_laure);
-	CU_ASSERT_TRUE(linphone_call_get_transferer_call(marie_calling_laure)==marie_calling_pauline);
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallConnected,1,2000));
-
-	/*terminate marie to pauline call*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,2000));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-
-static void unattended_call_transfer(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* pauline_called_by_marie;
-
-	char* laure_identity=linphone_address_as_string(laure->identity);
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-
-	CU_ASSERT_TRUE(call(marie,pauline));
-	pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
-
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-	reset_counters(&laure->stat);
-
-	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,laure_identity);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-	/*marie ends the call  */
-	linphone_core_terminate_call(marie->lc,pauline_called_by_marie);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-
-	/*Pauline starts the transfer*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-
-static void unattended_call_transfer_with_error(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCall* pauline_called_by_marie;
-	bool_t call_ok=TRUE;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	
-	lcs=ms_list_append(lcs,pauline->lc);
-
-	CU_ASSERT_TRUE((call_ok=call(marie,pauline)));
-	if (call_ok){
-		pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-		/*Pauline starts the transfer*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
-		/* and immediately get an error*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
-
-		/*the error must be reported back to marie*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
-
-		/*and pauline should resume the call automatically*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
-
-		/*and call should be resumed*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	}
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
-}
-
-
-static void call_transfer_existing_call_outgoing_call(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* marie_call_pauline;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* marie_call_laure;
-	LinphoneCall* laure_called_by_marie;
-	LinphoneCall* lcall;
-	bool_t call_ok=TRUE;
-	const MSList* calls;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	/*marie call pauline*/
-	CU_ASSERT_TRUE((call_ok=call(marie,pauline)));
-	if (call_ok){
-		marie_call_pauline=linphone_core_get_current_call(marie->lc);
-		pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-		/*marie pause pauline*/
-		CU_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
-
-		/*marie call laure*/
-		CU_ASSERT_TRUE(call(marie,laure));
-		marie_call_laure=linphone_core_get_current_call(marie->lc);
-		laure_called_by_marie=linphone_core_get_current_call(laure->lc);
-		/*marie pause laure*/
-		CU_ASSERT_TRUE(pause_call_1(marie,marie_call_laure,laure,laure_called_by_marie));
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-		reset_counters(&laure->stat);
-
-
-		linphone_core_transfer_call_to_another(marie->lc,marie_call_pauline,marie_call_laure);
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-		/*pauline pausing marie*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
-		/*pauline calling laure*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
-
-		/*laure accept call*/
-		for(calls=linphone_core_get_calls(laure->lc);calls!=NULL;calls=calls->next) {
-			lcall = (LinphoneCall*)calls->data;
-			if (linphone_call_get_state(lcall) == LinphoneCallIncomingReceived) {
-				CU_ASSERT_EQUAL(linphone_call_get_replaced_call(lcall),laure_called_by_marie);
-				linphone_core_accept_call(laure->lc,lcall);
-				break;
-			}
-		}
-		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,1,2000));
-
-		/*terminate marie to pauline/laure call*/
-		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,2000));
-		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
-	}
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
 
 static void check_call_state(LinphoneCoreManager* mgr,LinphoneCallState state) {
 	CU_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(mgr->lc));
diff --git a/tester/tester.c b/tester/tester.c
index f7c703e41..4c7ba3922 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -515,17 +515,19 @@ static void test_complete_message_handler(const CU_pTest pTest,
 
 
 static void test_all_tests_complete_message_handler(const CU_pFailureRecord pFailure) {
+#ifdef HAVE_CU_GET_SUITE
   	char * results = CU_get_run_results_string();
   	if (liblinphone_tester_use_log_file) {
   		ms_warning("\n\n %s", results);
   	}
 	liblinphone_tester_fprintf(stdout,"\n\n %s",results);
 	ms_free(results);
+#endif
 }
 
 static void test_suite_init_failure_message_handler(const CU_pSuite pSuite) {
 	if (liblinphone_tester_use_log_file) ms_warning("Suite initialization failed for [%s].", pSuite->pName);
-    liblinphone_tester_fprintf(stdout,"Suite initialization failed for [%s].", pSuite->pName);
+	liblinphone_tester_fprintf(stdout,"Suite initialization failed for [%s].", pSuite->pName);
 }
 
 static void test_suite_cleanup_failure_message_handler(const CU_pSuite pSuite) {
@@ -533,14 +535,17 @@ static void test_suite_cleanup_failure_message_handler(const CU_pSuite pSuite) {
 	liblinphone_tester_fprintf(stdout,"Suite cleanup failed for [%s].", pSuite->pName);
 }
 
+#ifdef HAVE_CU_GET_SUITE
 static void test_start_message_handler(const CU_pTest pTest, const CU_pSuite pSuite) {
 	if (liblinphone_tester_use_log_file) ms_warning("Suite [%s] Test [%s]", pSuite->pName,pTest->pName);
 	liblinphone_tester_fprintf(stdout,"\nSuite [%s] Test [%s]\n", pSuite->pName,pTest->pName);
 }
+
 static void test_suite_start_message_handler(const CU_pSuite pSuite) {
 	if (liblinphone_tester_use_log_file) ms_warning("Suite [%s]", pSuite->pName);
 	liblinphone_tester_fprintf(stdout,"\nSuite [%s]", pSuite->pName);
 }
+#endif
 
 int liblinphone_tester_run_tests(const char *suite_name, const char *test_name) {
 	int i;
@@ -552,15 +557,16 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 	for (i = 0; i < liblinphone_tester_nb_test_suites(); i++) {
 		run_test_suite(test_suite[i]);
 	}
-
+#ifdef HAVE_CU_GET_SUITE
 	CU_set_test_start_handler(test_start_message_handler);
+#endif	
 	CU_set_test_complete_handler(test_complete_message_handler);
 	CU_set_all_test_complete_handler(test_all_tests_complete_message_handler);
 	CU_set_suite_init_failure_handler(test_suite_init_failure_message_handler);
 	CU_set_suite_cleanup_failure_handler(test_suite_cleanup_failure_message_handler);
+#ifdef HAVE_CU_GET_SUITE
 	CU_set_suite_start_handler(test_suite_start_message_handler);
-
-
+#endif
 	if( liblinphone_tester_xml_file != NULL ){
 		CU_set_output_filename(liblinphone_tester_xml_file);
 	}