diff --git a/LinphoneTester Tests/LinphoneTester_Tests.m b/LinphoneTester Tests/LinphoneTester_Tests.m
index 23ebc399b..89e1920e1 100644
--- a/LinphoneTester Tests/LinphoneTester_Tests.m	
+++ b/LinphoneTester Tests/LinphoneTester_Tests.m	
@@ -61,8 +61,9 @@ void LSLog(NSString* fmt, ...){
 
     liblinphone_tester_set_fileprefix(bundle);
     liblinphone_tester_set_writable_dir_prefix(documents);
+	liblinphone_tester_keep_accounts(TRUE);
 
-    int count = liblinphone_tester_nb_test_suites();
+	int count = liblinphone_tester_nb_test_suites();
 
     for (int i=0; i<count; i++) {
         const char* suite = liblinphone_tester_test_suite_name(i);
@@ -74,16 +75,16 @@ void LSLog(NSString* fmt, ...){
 			NSString* sTest  = [NSString stringWithUTF8String:test];
 
 			if( [[LinphoneTester_Tests skippedSuites] containsObject:sSuite] ) continue;
-            // prepend test_ so that it gets found by introspection
+            // prepend "test_" so that it gets found by introspection
             NSString* safesTest    = [self safeifyTestString:sTest];
             NSString* safesSuite   = [self safeifyTestString:sSuite];
             NSString *selectorName = [NSString stringWithFormat:@"test_%@__%@", safesSuite, safesTest];
+
 			[LinphoneTester_Tests addInstanceMethodWithSelectorName:selectorName block:^(LinphoneTester_Tests* myself) {
 				[myself testForSuite:sSuite andTest:sTest];
 			}];
 		}
     }
-
 }
 
 - (void)setUp
@@ -102,4 +103,8 @@ void LSLog(NSString* fmt, ...){
 	XCTAssertFalse(liblinphone_tester_run_tests([suite UTF8String], [test UTF8String]), @"Suite '%@' / Test '%@' failed", suite, test);
 }
 
+- (void)dealloc {
+	liblinphone_tester_clear_accounts();
+}
+
 @end
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 1ca88aa5b..269d42d32 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -678,6 +678,8 @@
 		D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83F8D15822ABD00336684 /* PhoneMainView.m */; };
 		D3F9A9DB15AEEB940045320F /* history_notification.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9DA15AEEB940045320F /* history_notification.png */; };
 		D3F9A9EE15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; };
+		F0022B091A370915009B51FD /* messages.db in Resources */ = {isa = PBXBuildFile; fileRef = F0022B081A370915009B51FD /* messages.db */; };
+		F0022B0A1A370915009B51FD /* messages.db in Resources */ = {isa = PBXBuildFile; fileRef = F0022B081A370915009B51FD /* messages.db */; };
 		F01A77EB18ED989B00E287CA /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = F01A77EA18ED989B00E287CA /* shortring.caf */; };
 		F03CA84318C72F1A0008889D /* UITextViewNoDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = F03CA84218C72F1A0008889D /* UITextViewNoDefine.m */; };
 		F04892FF180C3296002FED35 /* ImageOptim.sh in Resources */ = {isa = PBXBuildFile; fileRef = F04892FE180C3296002FED35 /* ImageOptim.sh */; };
@@ -692,6 +694,7 @@
 		F0818E7E17FC51D8005A3330 /* linphone_icon_76.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */; };
 		F0818E8017FC51D8005A3330 /* linphone_icon_152.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7D17FC51D8005A3330 /* linphone_icon_152.png */; };
 		F088488A19FF8C41007FFCF3 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F088488D19FF8C41007FFCF3 /* UIContactCell.xib */; };
+		F08BDC3D1A35E60F006210C9 /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C0F193623F200974404 /* liblinphonetester.a */; };
 		F08F118519C09C6B007D70C2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A9B3318C0CF7000C4D7FE /* XCTest.framework */; };
 		F08F118619C09C6B007D70C2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		F08F118719C09C6B007D70C2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
@@ -1592,6 +1595,7 @@
 		D3F9A9DA15AEEB940045320F /* history_notification.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_notification.png; path = Resources/history_notification.png; sourceTree = "<group>"; };
 		D3F9A9EC15AF277D0045320F /* UACellBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UACellBackgroundView.h; path = Utils/UACellBackgroundView/UACellBackgroundView.h; sourceTree = "<group>"; };
 		D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UACellBackgroundView.m; path = Utils/UACellBackgroundView/UACellBackgroundView.m; sourceTree = "<group>"; };
+		F0022B081A370915009B51FD /* messages.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = messages.db; path = submodules/linphone/tester/messages.db; sourceTree = SOURCE_ROOT; };
 		F0181B6B18BF7B1200A9A357 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
 		F01A77EA18ED989B00E287CA /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = shortring.caf; path = Resources/shortring.caf; sourceTree = "<group>"; };
 		F03A9B3318C0CF7000C4D7FE /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -1852,6 +1856,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F08BDC3D1A35E60F006210C9 /* liblinphonetester.a in Frameworks */,
 				F08F118519C09C6B007D70C2 /* XCTest.framework in Frameworks */,
 				F08F118719C09C6B007D70C2 /* UIKit.framework in Frameworks */,
 				F08F118619C09C6B007D70C2 /* Foundation.framework in Frameworks */,
@@ -2952,6 +2957,7 @@
 			children = (
 				F08F119819C09D88007D70C2 /* flexisip */,
 				F0BB8C40193630CA00974404 /* local_tester_hosts */,
+				F0022B081A370915009B51FD /* messages.db */,
 				F0BB8C41193630CA00974404 /* marie_xml */,
 				F0BB8C42193630CA00974404 /* tester_hosts */,
 				F0BB8C3919362C2200974404 /* certificates */,
@@ -3682,6 +3688,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F08F119A19C09D88007D70C2 /* flexisip in Resources */,
+				F0022B0A1A370915009B51FD /* messages.db in Resources */,
 				F0C1F91D1A2CA345009402C9 /* local_tester_hosts in Resources */,
 				F0C1F9211A2CA35A009402C9 /* sounds in Resources */,
 				F08F118D19C09C6B007D70C2 /* InfoPlist.strings in Resources */,
@@ -3704,6 +3711,7 @@
 				F0BB8BEA1936208200974404 /* Main_iPad.storyboard in Resources */,
 				F0BB8C3E19362C2200974404 /* sounds in Resources */,
 				F84015BF1939FE37006ABAB5 /* test_failed.png in Resources */,
+				F0022B091A370915009B51FD /* messages.db in Resources */,
 				F0BB8BF21936208200974404 /* Images.xcassets in Resources */,
 				F0BB8BE71936208200974404 /* Main_iPhone.storyboard in Resources */,
 				F0BB8C47193630CA00974404 /* tester_hosts in Resources */,
diff --git a/submodules/linphone b/submodules/linphone
index 15c6f3b89..582c38ffe 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 15c6f3b8987fbe1958dc2b5cc9a194f7b0892f70
+Subproject commit 582c38ffe1024d3222e4b9abca2bebe94ef7a236