diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
index 7dde3504d..252cd8c62 100644
--- a/res/layout/dialog.xml
+++ b/res/layout/dialog.xml
@@ -31,7 +31,7 @@
 			android:padding="10dp"/>
 
 		<Button
-			android:id="@+id/delete"
+			android:id="@+id/delete_button"
 			android:text="@string/delete"
 			android:background="@drawable/resizable_confirm_delete_button"
 			style="@style/font15"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 6467a94da..f3bf54afd 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -664,7 +664,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		}
 		if (id == R.id.delete) {
 			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button delete = (Button) dialog.findViewById(R.id.delete_button);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
 			delete.setOnClickListener(new OnClickListener() {
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index 9048bccf6..0ea6b9f1e 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -267,7 +267,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 
 		if (id == R.id.delete) {
 			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button delete = (Button) dialog.findViewById(R.id.delete_button);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
 			delete.setOnClickListener(new OnClickListener() {
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 37c81503c..7cc52a3cd 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -239,7 +239,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 		}
 		if (id == R.id.deleteContact) {
 			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button delete = (Button) dialog.findViewById(R.id.delete_button);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
 			delete.setOnClickListener(new OnClickListener() {
diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java
index a96f01f93..bdb71ed9e 100644
--- a/src/org/linphone/ContactsListFragment.java
+++ b/src/org/linphone/ContactsListFragment.java
@@ -213,7 +213,7 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 
 		if (id == R.id.delete) {
 			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button delete = (Button) dialog.findViewById(R.id.delete_button);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
 			delete.setOnClickListener(new OnClickListener() {
diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java
index d1a8975dd..46a8ce54b 100644
--- a/src/org/linphone/HistoryListFragment.java
+++ b/src/org/linphone/HistoryListFragment.java
@@ -236,7 +236,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 			}
 
 			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button delete = (Button) dialog.findViewById(R.id.delete_button);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
 			delete.setOnClickListener(new OnClickListener() {
diff --git a/tests/src/org/linphone/test/AccountAssistant.java b/tests/src/org/linphone/test/AccountAssistant.java
index 13a93cd66..60c5e9d3e 100644
--- a/tests/src/org/linphone/test/AccountAssistant.java
+++ b/tests/src/org/linphone/test/AccountAssistant.java
@@ -66,7 +66,7 @@ public class AccountAssistant extends SampleTest {
 		Assert.assertEquals(aContext.getString(org.linphone.R.string.pref_transport_tls_key), transport);
 				
 		String proxy = prefs.getAccountProxy(0);
-		Assert.assertEquals("<sip:" + aContext.getString(org.linphone.R.string.default_domain) + ":5223;transport=tls>", proxy);
+		Assert.assertEquals("<sip:" + aContext.getString(org.linphone.R.string.default_domain) + ";transport=tls>", proxy);
 
 		String display_name = prefs.getAccountDisplayName(0);
 		Assert.assertEquals(iContext.getString(R.string.account_linphone_display_name), display_name);
@@ -174,6 +174,6 @@ public class AccountAssistant extends SampleTest {
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 
 		solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
-		solo.clickOnText("Assistant");
+		solo.clickOnText(aContext.getString(org.linphone.R.string.menu_assistant));
 	}
 }
diff --git a/tests/src/org/linphone/test/CallsAudio.java b/tests/src/org/linphone/test/CallsAudio.java
index 9ed333e34..fdb56f73a 100644
--- a/tests/src/org/linphone/test/CallsAudio.java
+++ b/tests/src/org/linphone/test/CallsAudio.java
@@ -383,7 +383,7 @@ public class CallsAudio extends SampleTest {
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		
 		solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
-		solo.clickOnText("Settings");
+		solo.clickOnText(aContext.getString(org.linphone.R.string.menu_settings));
 	}
 	
 	private void goToAudioCodecsSettings() {
diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java
index 59b84441d..18884df91 100644
--- a/tests/src/org/linphone/test/CallsVideo.java
+++ b/tests/src/org/linphone/test/CallsVideo.java
@@ -348,7 +348,7 @@ public class CallsVideo extends SampleTest {
 		solo.waitForActivity("LinphoneActivity", 2000);
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
-		solo.clickOnText("Settings");
+		solo.clickOnText(aContext.getString(org.linphone.R.string.menu_settings));
 	}
 	
 	private void goToAudioCodecsSettings() {
@@ -360,8 +360,8 @@ public class CallsVideo extends SampleTest {
 	}
 		
 	private void goToVideoCodecsSettings() {
-		goToSettings();
-		
+		//goToSettings();
+
 		selectItemInListOnUIThread(6);
 		if (solo.searchText(aContext.getString(org.linphone.R.string.pref_video_title), 2)) // Needed in case pref_video_enable_title contains pref_video
 			solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_title), 2);
diff --git a/tests/src/org/linphone/test/Chat.java b/tests/src/org/linphone/test/Chat.java
index ff4e94ed4..f6754e166 100644
--- a/tests/src/org/linphone/test/Chat.java
+++ b/tests/src/org/linphone/test/Chat.java
@@ -51,7 +51,7 @@ public class Chat extends SampleTest {
 		goToChat();
 
 		solo.clickOnView(solo.getView(org.linphone.R.id.new_discussion));
-		solo.enterText((AutoCompleteTextView)solo.getView(org.linphone.R.id.search_contact_field), "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain));
+		solo.enterText((EditText)solo.getView(org.linphone.R.id.search_contact_field), "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain));
 
 		solo.enterText((EditText)solo.getView(org.linphone.R.id.message), iContext.getString(R.string.chat_test_text_sent));
 		solo.clickOnView(solo.getView(org.linphone.R.id.send_message));
diff --git a/tests/src/org/linphone/test/ConferenceAndMultiCall.java b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
index d087331a4..5bbf88c4f 100644
--- a/tests/src/org/linphone/test/ConferenceAndMultiCall.java
+++ b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
@@ -278,7 +278,7 @@ public class ConferenceAndMultiCall extends SampleTest {
 	}
 	
 	private void assertCallIsCorrectlyRunning(int lcId) {
-		solo.waitForActivity("InCallActivity", 5000);
+		solo.waitForActivity("CallActivity", 5000);
 		solo.assertCurrentActivity("Expected InCall Activity", CallActivity.class);
 
 		solo.sleep(2000);
diff --git a/tests/src/org/linphone/test/History.java b/tests/src/org/linphone/test/History.java
index 45712cbd0..5bc291a51 100644
--- a/tests/src/org/linphone/test/History.java
+++ b/tests/src/org/linphone/test/History.java
@@ -59,7 +59,8 @@ public class History extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.edit));
 		solo.sleep(500);
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
-		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
+		solo.sleep(500);
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete_button));
 	}
 
 	@SmallTest
@@ -71,7 +72,8 @@ public class History extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.edit));
 		solo.clickOnView(solo.getView(org.linphone.R.id.select_all));
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
-		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
+		solo.sleep(500);
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete_button));
 
 		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_call_history)));
 	}