diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index f228a90afb861428f3b31554229927231ea4a255..a9eabde8e761cff529cdabcbe99a6882229c28ca 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -188,6 +188,11 @@ const char *linphone_call_log_get_call_id(const LinphoneCallLog *cl){
 	return cl->call_id;
 }
 
+void linphone_call_log_set_call_id(LinphoneCallLog *cl, const char *call_id) {
+	if (cl->call_id) bctbx_free(cl->call_id);
+	cl->call_id = call_id ? bctbx_strdup(call_id) : NULL;
+}
+
 LinphoneCallDir linphone_call_log_get_dir(const LinphoneCallLog *cl){
 	return cl->dir;
 }
diff --git a/coreapi/private_functions.h b/coreapi/private_functions.h
index 8b94b8ff0c31332babc294afce3b27f0c4b818f4..4040e61c08019445b5da1d1bc74772623090d77c 100644
--- a/coreapi/private_functions.h
+++ b/coreapi/private_functions.h
@@ -55,6 +55,7 @@ void linphone_call_notify_next_video_frame_decoded(LinphoneCall *call);
 LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to, const LinphoneCallParams *params, LinphoneProxyConfig *cfg);
 LinphoneCall * linphone_call_new_incoming(struct _LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to, LinphonePrivate::SalCallOp *op);
 LINPHONE_PUBLIC LinphoneCallLog *linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *from, LinphoneAddress * to);
+void linphone_call_log_set_call_id(LinphoneCallLog *cl, const char *call_id);
 LinphonePlayer *linphone_call_build_player(LinphoneCall*call);
 
 LinphonePrivate::SalCallOp *linphone_call_get_op(const LinphoneCall *call);
diff --git a/src/conference/session/call-session.cpp b/src/conference/session/call-session.cpp
index 0ab0d82d08ee01e3ecc53058a12bf547734138cf..30af1cd3bc75b737882c8c0a0431aef308f413ae 100644
--- a/src/conference/session/call-session.cpp
+++ b/src/conference/session/call-session.cpp
@@ -959,7 +959,7 @@ void CallSession::configure (LinphoneCallDir direction, LinphoneProxyConfig *cfg
 				linphone_core_get_config(getCore()->getCCore()), "sip", "cnx_ip_to_0000_if_sendonly_enabled", 0
 			)
 		);
-		d->log->call_id = ms_strdup(op->getCallId().c_str()); /* Must be known at that time */
+		linphone_call_log_set_call_id(d->log, op->getCallId().c_str()); /* Must be known at that time */
 	}
 
 	if (direction == LinphoneCallOutgoing) {
@@ -1127,7 +1127,7 @@ int CallSession::startInvite (const Address *destination, const string &subject,
 			d->setState(CallSession::State::Error, "Call failed");
 		}
 	} else {
-		d->log->call_id = ms_strdup(d->op->getCallId().c_str()); /* Must be known at that time */
+		linphone_call_log_set_call_id(d->log, d->op->getCallId().c_str()); /* Must be known at that time */
 		d->setState(CallSession::State::OutgoingProgress, "Outgoing call in progress");
 	}
 	return result;
diff --git a/src/core/platform-helpers/android-platform-helpers.cpp b/src/core/platform-helpers/android-platform-helpers.cpp
index c67e0e40c0d2a8d56f171eb3797f7257015de343..66d203a91dcc7898188673a675b7d3c85b38d3f9 100644
--- a/src/core/platform-helpers/android-platform-helpers.cpp
+++ b/src/core/platform-helpers/android-platform-helpers.cpp
@@ -72,29 +72,29 @@ private:
 	static jmethodID getMethodId (JNIEnv *env, jclass klass, const char *method, const char *signature);
 	string getNativeLibraryDir();
 
-	jobject mJavaHelper;
-	jmethodID mWifiLockAcquireId;
-	jmethodID mWifiLockReleaseId;
-	jmethodID mMcastLockAcquireId;
-	jmethodID mMcastLockReleaseId;
-	jmethodID mCpuLockAcquireId;
-	jmethodID mCpuLockReleaseId;
-	jmethodID mGetDnsServersId;
-	jmethodID mGetPowerManagerId;
-	jmethodID mGetDataPathId;
-	jmethodID mGetConfigPathId;
-	jmethodID mGetDownloadPathId;
-	jmethodID mGetNativeLibraryDirId;
-	jmethodID mSetNativeVideoWindowId;
-	jmethodID mSetNativePreviewVideoWindowId;
-	jmethodID mUpdateNetworkReachabilityId;
-	jmethodID mOnLinphoneCoreStartId;
-	jmethodID mOnLinphoneCoreStopId;
-	jmethodID mOnWifiOnlyEnabledId;
-	jobject mPreviewVideoWindow;
-	jobject mVideoWindow;
-
-	bool mNetworkReachable;
+	jobject mJavaHelper = nullptr;
+	jmethodID mWifiLockAcquireId = nullptr;
+	jmethodID mWifiLockReleaseId = nullptr;
+	jmethodID mMcastLockAcquireId = nullptr;
+	jmethodID mMcastLockReleaseId = nullptr;
+	jmethodID mCpuLockAcquireId = nullptr;
+	jmethodID mCpuLockReleaseId = nullptr;
+	jmethodID mGetDnsServersId = nullptr;
+	jmethodID mGetPowerManagerId = nullptr;
+	jmethodID mGetDataPathId = nullptr;
+	jmethodID mGetConfigPathId = nullptr;
+	jmethodID mGetDownloadPathId = nullptr;
+	jmethodID mGetNativeLibraryDirId = nullptr;
+	jmethodID mSetNativeVideoWindowId = nullptr;
+	jmethodID mSetNativePreviewVideoWindowId = nullptr;
+	jmethodID mUpdateNetworkReachabilityId = nullptr;
+	jmethodID mOnLinphoneCoreStartId = nullptr;
+	jmethodID mOnLinphoneCoreStopId = nullptr;
+	jmethodID mOnWifiOnlyEnabledId = nullptr;
+	jobject mPreviewVideoWindow = nullptr;
+	jobject mVideoWindow = nullptr;
+
+	bool mNetworkReachable = false;
 };
 
 static const char *GetStringUTFChars (JNIEnv *env, jstring string) {
@@ -316,11 +316,11 @@ void AndroidPlatformHelpers::setDnsServers () {
 
 			for (int i = 0; i < count; i++) {
 				jstring jserver = (jstring)env->GetObjectArrayElement(jservers, i);
-				const char *str = env->GetStringUTFChars(jserver, nullptr);
+				const char *str = GetStringUTFChars(env, jserver);
 				if (str) {
 					lInfo() << "AndroidPlatformHelpers found DNS server " << str;
 					l = bctbx_list_append(l, ms_strdup(str));
-					env->ReleaseStringUTFChars(jserver, str);
+					ReleaseStringUTFChars(env, jserver, str);
 				}
 			}
 		} else {
@@ -417,24 +417,25 @@ PlatformHelpers *createAndroidPlatformHelpers (LinphoneCore *lc, void *systemCon
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHelper_setNativePreviewWindowId(JNIEnv *env, jobject thiz, jlong ptr, jobject id) {
-	AndroidPlatformHelpers *androidPlatformHelper = (AndroidPlatformHelpers *)ptr;
+	AndroidPlatformHelpers *androidPlatformHelper = static_cast<AndroidPlatformHelpers *>((void *)ptr);
 	androidPlatformHelper->_setPreviewVideoWindow(id);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHelper_setNativeVideoWindowId(JNIEnv *env, jobject thiz, jlong ptr, jobject id) {
-	AndroidPlatformHelpers *androidPlatformHelper = (AndroidPlatformHelpers *)ptr;
+	AndroidPlatformHelpers *androidPlatformHelper = static_cast<AndroidPlatformHelpers *>((void *)ptr);
 	androidPlatformHelper->_setVideoWindow(id);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHelper_setNetworkReachable(JNIEnv* env, jobject thiz, jlong ptr, jboolean reachable) {
-	AndroidPlatformHelpers *androidPlatformHelper = (AndroidPlatformHelpers *)ptr;
+	AndroidPlatformHelpers *androidPlatformHelper = static_cast<AndroidPlatformHelpers *>((void *)ptr);
 	androidPlatformHelper->setNetworkReachable(reachable);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHelper_setHttpProxy(JNIEnv* env, jobject thiz, jlong ptr, jstring host, jint port) {
-	AndroidPlatformHelpers *androidPlatformHelper = (AndroidPlatformHelpers *)ptr;
+	AndroidPlatformHelpers *androidPlatformHelper = static_cast<AndroidPlatformHelpers *>((void *)ptr);
 	const char *hostC = GetStringUTFChars(env, host);
 	androidPlatformHelper->setHttpProxy(hostC, port);
+	ReleaseStringUTFChars(env, host, hostC);
 }
 
 LINPHONE_END_NAMESPACE
diff --git a/tester/group_chat_tester.c b/tester/group_chat_tester.c
index a45f251d6cfd299fb0b692181715514b8e564304..9353a5c5b89a8ac750af1a158d704f0f6c2c48db 100644
--- a/tester/group_chat_tester.c
+++ b/tester/group_chat_tester.c
@@ -177,7 +177,7 @@ void configure_core_for_conference (LinphoneCore *core, const char* username, co
 	LinphoneProxyConfig *proxy = linphone_core_get_default_proxy_config(core);
 	linphone_proxy_config_set_conference_factory_uri(proxy, factoryUri);
 	bctbx_free(factoryUri);
-	linphone_core_set_linphone_specs(core, "groupchat");
+	linphone_core_set_linphone_specs(core, linphone_core_lime_x3dh_available(core) ? "groupchat,lime" : "groupchat");
 }
 
 void _configure_core_for_conference (LinphoneCoreManager *lcm, LinphoneAddress *factoryAddr) {
@@ -1827,10 +1827,13 @@ static void group_chat_room_reinvited_after_removed_with_several_devices (void)
 	BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(newPauline1Cr), 2, int, "%d");
 	BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(newPauline1Cr), initialSubject);
 
-	// Clean db from chat room
+	// Clean chat room from db
+	linphone_core_set_network_reachable(pauline2->lc, TRUE);
 	linphone_core_manager_delete_chat_room(marie1, marie1Cr, coresList);
 	linphone_core_delete_chat_room(marie2->lc, marie2Cr);
+	initialPauline2Stats = pauline2->stat;
 	linphone_core_manager_delete_chat_room(pauline1, newPauline1Cr, coresList);
+	BC_ASSERT_TRUE(wait_for_list(coresList, &pauline2->stat.number_of_LinphoneChatRoomStateTerminated, initialPauline2Stats.number_of_LinphoneChatRoomStateTerminated + 1, 3000));
 	linphone_core_delete_chat_room(pauline2->lc, pauline2Cr);
 	linphone_core_manager_delete_chat_room(laure, laureCr, coresList);
 
@@ -1911,8 +1914,8 @@ static void group_chat_room_notify_after_disconnection (void) {
 	newSubject = "Let's go drink a mineral water !";
 	linphone_chat_room_set_subject(marieCr, newSubject);
 	BC_ASSERT_TRUE(wait_for_list(coresList, &marie->stat.number_of_subject_changed, initialMarieStats.number_of_subject_changed + 3, 3000));
-	BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_subject_changed, initialPaulineStats.number_of_subject_changed + 3, 3000));
 	BC_ASSERT_TRUE(wait_for_list(coresList, &laure->stat.number_of_subject_changed, initialLaureStats.number_of_subject_changed + 3, 3000));
+	BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_subject_changed, initialPaulineStats.number_of_subject_changed + 3, 1000));
 	BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(marieCr), newSubject);
 	BC_ASSERT_STRING_NOT_EQUAL(linphone_chat_room_get_subject(paulineCr), newSubject);
 	BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(laureCr), newSubject);
@@ -2090,8 +2093,8 @@ static void group_chat_room_add_device (void) {
 	configure_core_for_callbacks(marie2, cbs);
 	linphone_core_cbs_unref(cbs);
 	coresList = bctbx_list_append(coresList, marie2->lc);
-	_start_core(marie2);
 	stats initialMarie2Stats = marie2->stat;
+	_start_core(marie2);
 	// Check that the chat room is correctly created on second Marie's device
 	LinphoneChatRoom *marieCr2 = check_creation_chat_room_client_side(coresList, marie2, &initialMarie2Stats, confAddr, initialSubject, 2, TRUE);
 	BC_ASSERT_TRUE(wait_for_list(coresList, &marie1->stat.number_of_participant_devices_added, initialMarie1Stats.number_of_participant_devices_added + 1, 1000));
@@ -2592,7 +2595,7 @@ static void group_chat_room_migrate_from_basic_to_client_fail (void) {
 		BC_ASSERT_EQUAL(linphone_chat_room_get_history_size(marieCr), 2, int, "%d");
 
 		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreationPending, initialPaulineStats.number_of_LinphoneChatRoomStateCreationPending + 1, 3000));
-		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreated, initialPaulineStats.number_of_LinphoneChatRoomStateCreated + 1, 3000));
+		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreated, initialPaulineStats.number_of_LinphoneChatRoomStateCreated + 1, 1000));
 		BC_ASSERT_TRUE(linphone_chat_room_get_capabilities(paulineCr) & LinphoneChatRoomCapabilitiesBasic);
 		BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(paulineCr), 1, int, "%d");
 		BC_ASSERT_TRUE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneMessageReceived, initialPaulineStats.number_of_LinphoneMessageReceived + 1, 1000));
@@ -2708,13 +2711,13 @@ static void group_chat_donot_room_migrate_from_basic_chat_room (void) {
 		linphone_chat_message_send(msg);
 		linphone_chat_message_unref(msg);
 		BC_ASSERT_FALSE(wait_for_list(coresList, &marie->stat.number_of_LinphoneChatRoomStateCreationPending, initialMarieStats.number_of_LinphoneChatRoomStateCreationPending + 1, 3000));
-		BC_ASSERT_FALSE(wait_for_list(coresList, &marie->stat.number_of_LinphoneChatRoomStateCreated, initialMarieStats.number_of_LinphoneChatRoomStateCreated + 1, 3000));
+		BC_ASSERT_FALSE(wait_for_list(coresList, &marie->stat.number_of_LinphoneChatRoomStateCreated, initialMarieStats.number_of_LinphoneChatRoomStateCreated + 1, 1000));
 		BC_ASSERT_TRUE(linphone_chat_room_get_capabilities(marieCr) & LinphoneChatRoomCapabilitiesBasic);
 		BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(marieCr), 1, int, "%d");
 		BC_ASSERT_EQUAL(linphone_chat_room_get_history_size(marieCr), 2, int, "%d");
 
 		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreationPending, initialPaulineStats.number_of_LinphoneChatRoomStateCreationPending + 1, 3000));
-		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreated, initialPaulineStats.number_of_LinphoneChatRoomStateCreated + 1, 3000));
+		BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneChatRoomStateCreated, initialPaulineStats.number_of_LinphoneChatRoomStateCreated + 1, 1000));
 		BC_ASSERT_TRUE(linphone_chat_room_get_capabilities(paulineCr) & LinphoneChatRoomCapabilitiesBasic);
 		BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(paulineCr), 1, int, "%d");
 		BC_ASSERT_TRUE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneMessageReceived, initialPaulineStats.number_of_LinphoneMessageReceived + 1, 1000));
@@ -3766,7 +3769,7 @@ static void group_chat_room_list_subscription (void) {
 	linphone_chat_room_set_subject(marieCr1, newSubject);
 	BC_ASSERT_TRUE(wait_for_list(coresList, &marie->stat.number_of_subject_changed, initialMarieStats.number_of_subject_changed + 1, 10000));
 	BC_ASSERT_TRUE(wait_for_list(coresList, &laure->stat.number_of_subject_changed, initialLaureStats.number_of_subject_changed + 1, 10000));
-	BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_subject_changed, initialPaulineStats.number_of_subject_changed + 1, 10000));
+	BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_subject_changed, initialPaulineStats.number_of_subject_changed + 1, 1000));
 	BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(marieCr1), newSubject);
 	BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(laureCr1), newSubject);
 
@@ -3941,7 +3944,7 @@ static void group_chat_room_complex_participant_removal_scenario (void) {
 	linphone_proxy_config_refresh_register(linphone_core_get_default_proxy_config(laure->lc));
 	BC_ASSERT_TRUE(wait_for_list(coresList, &laure->stat.number_of_LinphoneRegistrationOk, initialLaureStats.number_of_LinphoneRegistrationOk + 1, 1000));
 	BC_ASSERT_FALSE(wait_for_list(coresList, &laure->stat.number_of_LinphoneChatRoomConferenceJoined, initialLaureStats.number_of_LinphoneChatRoomConferenceJoined + 1, 3000));
-	BC_ASSERT_FALSE(wait_for_list(coresList, &laure->stat.number_of_LinphoneChatRoomStateTerminated, initialLaureStats.number_of_LinphoneChatRoomStateTerminated + 1, 3000));
+	BC_ASSERT_FALSE(wait_for_list(coresList, &laure->stat.number_of_LinphoneChatRoomStateTerminated, initialLaureStats.number_of_LinphoneChatRoomStateTerminated + 1, 1000));
 
 	unsigned int nbLaureConferenceCreatedEventsAfterRestart = 0;
 	laureHistory = linphone_chat_room_get_history_events(newLaureCr, 0);
@@ -4731,15 +4734,15 @@ static void group_chat_lime_x3dh_reject_sas_before_message (void) {
 	const char *initialSubject = "Friends";
 	marieCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, initialSubject, TRUE);
 	const LinphoneAddress *confAddr = linphone_chat_room_get_conference_address(marieCr);
-
-	if (BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
-	if (BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
-
+	
+	if (!BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
+	if (!BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
+	
 
 	// Check that the chat room is correctly created on Pauline's side and that the participants are added
 	paulineCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, initialSubject, 1, 0);
-
-	if (BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
+	
+	if (!BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
 
 	// Check LIME X3DH and ZRTP status
 	BC_ASSERT_EQUAL(linphone_chat_room_get_security_level(marieCr), LinphoneChatRoomSecurityLevelUnsafe, int, "%d");
@@ -4851,13 +4854,13 @@ static void group_chat_lime_x3dh_message_before_verify_sas (void) {
 	marieCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, initialSubject, TRUE);
 	const LinphoneAddress *confAddr = linphone_chat_room_get_conference_address(marieCr);
 
-	if (BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
-	if (BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
+	if (!BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
+	if (!BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
 
 	// Check that the chat room is correctly created on Pauline's side and that the participants are added
 	paulineCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, initialSubject, 1, 0);
-	if (BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
-
+	if (!BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
+	
 	// Check LIME X3DH and ZRTP status
 	BC_ASSERT_EQUAL(linphone_chat_room_get_security_level(marieCr), LinphoneChatRoomSecurityLevelEncrypted, int, "%d");
 	BC_ASSERT_EQUAL(linphone_chat_room_get_security_level(paulineCr), LinphoneChatRoomSecurityLevelEncrypted, int, "%d");
@@ -4918,8 +4921,8 @@ end:
 	linphone_core_delete_local_encryption_db(pauline->lc);
 
 	// Clean db from chat room
-	linphone_core_manager_delete_chat_room(marie, marieCr, coresList);
-	linphone_core_manager_delete_chat_room(pauline, paulineCr, coresList);
+	if (marieCr) linphone_core_manager_delete_chat_room(marie, marieCr, coresList);
+	if (paulineCr) linphone_core_manager_delete_chat_room(pauline, paulineCr, coresList);
 
 	bctbx_list_free(coresList);
 	bctbx_list_free(coresManagerList);
@@ -4974,14 +4977,14 @@ static void group_chat_lime_x3dh_message_before_reject_sas (void) {
 	const char *initialSubject = "Friends";
 	LinphoneChatRoom *marieCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, initialSubject, TRUE);
 	const LinphoneAddress *confAddr = linphone_chat_room_get_conference_address(marieCr);
-
-	if (BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
-	if (BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
+	
+	if (!BC_ASSERT_PTR_NOT_NULL(marieCr)) goto end;
+	if (!BC_ASSERT_PTR_NOT_NULL(confAddr)) goto end;
 
 	// Check that the chat room is correctly created on Pauline's side
 	paulineCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, initialSubject, 1, 0);
-	if (BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
-
+	if (!BC_ASSERT_PTR_NOT_NULL(paulineCr)) goto end;
+	
 	// Marie sends a message to the chatroom
 	const char *marieMessage = "Hi Pauline, how are you ?";
 	_send_message(marieCr, marieMessage);
@@ -6904,13 +6907,13 @@ test_t group_chat_tests[] = {
 	TEST_NO_TAG("Leave group chat room", group_chat_room_leave),
     TEST_NO_TAG("Delete group chat room successful if it's already removed by server", group_chat_room_delete_twice),
 	TEST_NO_TAG("Come back on a group chat room after a disconnection", group_chat_room_come_back_after_disconnection),
-	TEST_ONE_TAG("Create chat room with disconnected friends", group_chat_room_create_room_with_disconnected_friends, "LeaksMemory"),
-	TEST_ONE_TAG("Create chat room with disconnected friends and initial message", group_chat_room_create_room_with_disconnected_friends_and_initial_message, "LeaksMemory"),
+	TEST_NO_TAG("Create chat room with disconnected friends", group_chat_room_create_room_with_disconnected_friends),
+	TEST_NO_TAG("Create chat room with disconnected friends and initial message", group_chat_room_create_room_with_disconnected_friends_and_initial_message),
 	TEST_NO_TAG("Reinvited after removed from group chat room", group_chat_room_reinvited_after_removed),
 	TEST_ONE_TAG("Reinvited after removed from group chat room 2", group_chat_room_reinvited_after_removed_2, "LeaksMemory"),
 	TEST_ONE_TAG("Reinvited after removed from group chat room while offline", group_chat_room_reinvited_after_removed_while_offline, "LeaksMemory"),
 	TEST_ONE_TAG("Reinvited after removed from group chat room while offline 2", group_chat_room_reinvited_after_removed_while_offline_2, "LeaksMemory"),
-	TEST_NO_TAG("Reinvited after removed from group chat room with several devices", group_chat_room_reinvited_after_removed_with_several_devices),
+	TEST_ONE_TAG("Reinvited after removed from group chat room with several devices", group_chat_room_reinvited_after_removed_with_several_devices, "LeaksMemory"),
 	TEST_NO_TAG("Notify after disconnection", group_chat_room_notify_after_disconnection),
 	TEST_NO_TAG("Send refer to all participants devices", group_chat_room_send_refer_to_all_devices),
 	TEST_NO_TAG("Admin add device and doesn't lose admin status", group_chat_room_add_device),