diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 204c556ed..f0ebff280 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -283,7 +283,7 @@
 		        
 				<CheckBoxPreference 
 				    android:key="@string/pref_debug_key"
-					android:title="@string/pref_debug" 
+					android:title="@string/pref_debug"
 					android:defaultValue="@bool/pref_debug_default"/>
 			
 			</PreferenceCategory>
diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java
index 680d5c135..e18a31946 100644
--- a/src/org/linphone/ContactFragment.java
+++ b/src/org/linphone/ContactFragment.java
@@ -178,10 +178,8 @@ public class ContactFragment extends Fragment implements OnClickListener {
 	public void onClick(View v) {
 		int id = v.getId();
 			
-		switch (id) {
-		case R.id.editContact:
+		if (id == R.id.editContact) {
 			LinphoneActivity.instance().editContact(contact);
-			break;
 		}
 	}
 }
diff --git a/tests/.classpath b/tests/.classpath
index 93cfbc5bf..01e79d6cf 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -2,12 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/linphone-android-newUI"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="lib" path="libs/robotium-solo-3.4.1.jar">
+	<classpathentry combineaccessrules="false" kind="src" path="/Linphone-Android-NewUI"/>
+	<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/linphone-android-test/libs/robotium-solo-3.4.1-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/Linphone-Android-NewUI-Tests/libs/robotium-solo-3.6-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin/classes"/>
diff --git a/tests/libs/robotium-solo-3.4.1-javadoc.jar b/tests/libs/robotium-solo-3.4.1-javadoc.jar
deleted file mode 100644
index 9a79d8c83..000000000
Binary files a/tests/libs/robotium-solo-3.4.1-javadoc.jar and /dev/null differ
diff --git a/tests/libs/robotium-solo-3.4.1.jar b/tests/libs/robotium-solo-3.4.1.jar
deleted file mode 100644
index 88906845a..000000000
Binary files a/tests/libs/robotium-solo-3.4.1.jar and /dev/null differ
diff --git a/tests/libs/robotium-solo-3.6-javadoc.jar b/tests/libs/robotium-solo-3.6-javadoc.jar
new file mode 100644
index 000000000..db4e75b2c
Binary files /dev/null and b/tests/libs/robotium-solo-3.6-javadoc.jar differ
diff --git a/tests/libs/robotium-solo-3.6.jar b/tests/libs/robotium-solo-3.6.jar
new file mode 100644
index 000000000..4280906d1
Binary files /dev/null and b/tests/libs/robotium-solo-3.6.jar differ
diff --git a/tests/src/org/linphone/test/AccountsTest.java b/tests/src/org/linphone/test/AccountsTest.java
index 58929d984..c3fc473e1 100644
--- a/tests/src/org/linphone/test/AccountsTest.java
+++ b/tests/src/org/linphone/test/AccountsTest.java
@@ -4,6 +4,7 @@ import junit.framework.Assert;
 
 import org.linphone.LinphoneActivity;
 import org.linphone.R;
+import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import org.linphone.setup.SetupActivity;
 
 import android.content.Context;
@@ -30,7 +31,6 @@ public class AccountsTest extends
 	private void selectItemInListOnUIThread(final int item) {
 		solo.sleep(500);
 		getActivity().runOnUiThread(new Runnable() {
-			@Override
 			public void run() {
 				ListView list = (ListView) solo.getView(android.R.id.list);
 				list.setSelection(item);
@@ -60,7 +60,10 @@ public class AccountsTest extends
 		solo.enterText((EditText) solo.getView(R.id.setup_password), "wizard15");
 		solo.clickOnText(context.getString(R.string.setup_apply));
 		
-		solo.waitForActivity("LinphoneActivity", 2000);
+		if (!Hacks.hasBuiltInEchoCanceller())
+			solo.waitForActivity("LinphoneActivity", 8000);
+		else
+			solo.waitForActivity("LinphoneActivity", 2000);
 		Assert.assertTrue(solo.searchText("wizard15@sip.linphone.org"));
 		
 		int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
@@ -71,8 +74,8 @@ public class AccountsTest extends
 		Assert.assertEquals(stunServer, context.getString(R.string.default_stun));
 		Log.testSuccess("Default stun server is configured");
 		
-		boolean tls = prefs.getBoolean(context.getString(R.string.pref_transport_tls_key), false);
-		Assert.assertEquals(tls, true);
+		String transport = prefs.getString(context.getString(R.string.pref_transport_key), context.getString(R.string.pref_transport_udp_key));
+		Assert.assertEquals(transport, context.getString(R.string.pref_transport_tls_key));
 		Log.testSuccess("TLS is set by default");
 		
 		String proxy = prefs.getString(context.getString(R.string.pref_proxy_key), "");
@@ -122,6 +125,7 @@ public class AccountsTest extends
 		solo.clickOnText("junit@test.linphone.org");
 		selectItemInListOnUIThread(6);
 		solo.clickOnText(context.getString(R.string.pref_default_account));
+		solo.goBack();
 		int defaultAccount = prefs.getInt(context.getString(R.string.pref_default_account_key), 0);
 		solo.sleep(1000);
 		Assert.assertEquals(1, defaultAccount);
diff --git a/tests/src/org/linphone/test/AccountzFreephonieTest.java b/tests/src/org/linphone/test/AccountzFreephonieTest.java
index f02410a79..8e66f95d8 100644
--- a/tests/src/org/linphone/test/AccountzFreephonieTest.java
+++ b/tests/src/org/linphone/test/AccountzFreephonieTest.java
@@ -1,8 +1,12 @@
 package org.linphone.test;
 
+import junit.framework.Assert;
+
 import org.linphone.InCallActivity;
 import org.linphone.LinphoneActivity;
+import org.linphone.LinphoneManager;
 import org.linphone.R;
+import org.linphone.core.LinphoneCall;
 import org.linphone.setup.SetupActivity;
 
 import android.content.Context;
@@ -24,7 +28,6 @@ public class AccountzFreephonieTest extends ActivityInstrumentationTestCase2<Lin
 	private void selectItemInListOnUIThread(final int item) {
 		solo.sleep(500);
 		getActivity().runOnUiThread(new Runnable() {
-			@Override
 			public void run() {
 				ListView list = (ListView) solo.getView(android.R.id.list);
 				list.setSelection(item);
@@ -39,8 +42,9 @@ public class AccountzFreephonieTest extends ActivityInstrumentationTestCase2<Lin
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(R.id.settings));
 		
-		selectItemInListOnUIThread(19);
+		selectItemInListOnUIThread(6);
 		solo.clickOnText(context.getString(R.string.pref_network_title));
+		solo.clickOnText(context.getString(R.string.pref_transport));
 		solo.clickOnText(context.getString(R.string.pref_transport_udp));
 		solo.goBack();
 		selectItemInListOnUIThread(0);
@@ -88,8 +92,9 @@ public class AccountzFreephonieTest extends ActivityInstrumentationTestCase2<Lin
 		selectItemInListOnUIThread(7);
 		solo.clickOnText(context.getString(R.string.pref_delete_account));
 		
-		selectItemInListOnUIThread(19);
+		selectItemInListOnUIThread(6);
 		solo.clickOnText(context.getString(R.string.pref_network_title));
+		solo.clickOnText(context.getString(R.string.pref_transport));
 		solo.clickOnText(context.getString(R.string.pref_transport_tls));
 		solo.goBack();
 		
@@ -104,8 +109,13 @@ public class AccountzFreephonieTest extends ActivityInstrumentationTestCase2<Lin
 		
 		solo.waitForActivity("InCallActivity", 2000);
 		solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
-		solo.waitForText("01", 1, 15000);
-		solo.clickOnView(solo.getView(R.id.hangUp));
+		solo.sleep(2000);
+		try {
+			Assert.assertEquals(LinphoneManager.getLcIfManagerNotDestroyedOrNull().getCalls()[0].getState(), LinphoneCall.State.OutgoingEarlyMedia);
+		} catch (AssertionError ae) {
+		} finally {
+			solo.clickOnView(solo.getView(R.id.hangUp));
+		}
 		
 		solo.waitForActivity("LinphoneActivity", 2000);
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
diff --git a/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java b/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
index 4ca196f4f..fbfd7a712 100644
--- a/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
+++ b/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
@@ -10,6 +10,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.test.ActivityInstrumentationTestCase2;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.ListView;
 
@@ -27,7 +28,6 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 	private void selectItemInListOnUIThread(final int item) {
 		solo.sleep(500);
 		getActivity().runOnUiThread(new Runnable() {
-			@Override
 			public void run() {
 				ListView list = (ListView) solo.getView(android.R.id.list);
 				list.setSelection(item);
@@ -41,6 +41,10 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo = new Solo(getInstrumentation(), getActivity());
 	}
 	
+	private boolean getBoolean(int key) {
+		return getActivity().getResources().getBoolean(key);
+	}
+	
 	private void goToAudioCodecsSettings() {
 		Context context = getActivity();
 		
@@ -48,8 +52,8 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(R.id.settings));
 
-		selectItemInListOnUIThread(11);
-		solo.clickOnText(context.getString(R.string.pref_codecs));
+		selectItemInListOnUIThread(4);
+		solo.clickOnText(context.getString(R.string.pref_audio));
 		solo.sleep(500);
 	}
 	
@@ -60,8 +64,11 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(R.id.settings));
 
-		selectItemInListOnUIThread(14);
-		solo.clickOnText(context.getString(R.string.pref_video_codecs_title), 2); //Hack: since pref_codecs = pref_video_codecs_title, we have to select the 2nd button
+		selectItemInListOnUIThread(6);
+		if (solo.searchText(context.getString(R.string.pref_video), 2)) // Needed in case pref_video_enable_title contains pref_video
+			solo.clickOnText(context.getString(R.string.pref_video), 2);
+		else
+			solo.clickOnText(context.getString(R.string.pref_video));
 		solo.sleep(500);
 	}
 	
@@ -71,52 +78,62 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		goToAudioCodecsSettings();
 		
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_speex16_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_speex16_key), getBoolean(R.bool.pref_codec_speex16_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_speex16));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_speex8_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_speex8_key), getBoolean(R.bool.pref_codec_speex8_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_speex8));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_ilbc_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_ilbc_key), getBoolean(R.bool.pref_codec_ilbc_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_ilbc));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_amr_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_amr_key), getBoolean(R.bool.pref_codec_amr_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_amr));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_gsm_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_amrwb_key), getBoolean(R.bool.pref_codec_amrwb_default))) {
+			solo.clickOnText(context.getString(R.string.pref_codec_amrwb));
+			solo.sleep(500);
+		}
+		
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_g729_key), getBoolean(R.bool.pref_codec_g729_default))) {
+			solo.clickOnText(context.getString(R.string.pref_codec_g729));
+			solo.sleep(500);
+		}
+		
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_gsm_key), getBoolean(R.bool.pref_codec_gsm_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_gsm));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_g722_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_g722_key), getBoolean(R.bool.pref_codec_g722_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_g722));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_silk24_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_silk24_key), getBoolean(R.bool.pref_codec_silk24_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_silk24));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_silk16_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_silk16_key), getBoolean(R.bool.pref_codec_silk16_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_silk16));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_pcmu_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_pcmu_key), getBoolean(R.bool.pref_codec_pcmu_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_pcmu));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_codec_pcma_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_codec_pcma_key), getBoolean(R.bool.pref_codec_pcma_default))) {
 			solo.clickOnText(context.getString(R.string.pref_codec_pcma));
 			solo.sleep(500);
 		}
@@ -128,34 +145,49 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		goToVideoCodecsSettings();
 		
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_vp8_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_vp8_key), getBoolean(R.bool.pref_video_codec_vp8_default))) {
 			solo.clickOnText(context.getString(R.string.pref_video_codec_vp8_title));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_h264_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_h264_key), getBoolean(R.bool.pref_video_codec_h264_default))) {
 			solo.clickOnText(context.getString(R.string.pref_video_codec_h264_title));
 			solo.sleep(500);
 		}
 		
-		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_mpeg4_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_mpeg4_key), getBoolean(R.bool.pref_video_codec_mpeg4_default))) {
 			solo.clickOnText(context.getString(R.string.pref_video_codec_mpeg4_title));
 			solo.sleep(500);
 		}
 	}
 	
 	private void goToDialerAndOutgoingCall(String codecTextToAssert) {
+		Context context = getActivity();
+		
 		solo.clickOnView(solo.getView(R.id.dialer));
 		solo.clickOnView(solo.getView(R.id.Adress));
 		solo.enterText((EditText) solo.getView(R.id.Adress), sipAdressToCall);
 		solo.clickOnView(solo.getView(R.id.Call));
 		
-		solo.waitForActivity("InCallActivity", 2000);
-		solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
-		solo.clickOnView(solo.getView(R.id.status));
-		solo.waitForText(codecTextToAssert, 1, 6000);
-		Assert.assertTrue(solo.searchText(codecTextToAssert, 1));
-		solo.clickOnView(solo.getView(R.id.hangUp));
+		boolean incompatibleMediaParams = solo.waitForText(context.getString(R.string.error_incompatible_media), 1, 1000);
+		if (!incompatibleMediaParams) { // There is a possiblity the callee doesn't support the codec, in which case we don't have to wait for the incall view
+			solo.waitForActivity("InCallActivity", 1000);
+			solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
+			solo.clickOnView(solo.getView(R.id.status));
+			solo.waitForText(codecTextToAssert, 1, 6000);
+			Assert.assertTrue(solo.searchText(codecTextToAssert, 1));
+			
+			View hangUp = solo.getView(R.id.hangUp);
+			if (hangUp.getVisibility() == View.VISIBLE)
+				solo.clickOnView(hangUp);
+			else { // While on video, menu can hide. Click the first time to display it back, then click again to really hang up
+				solo.clickOnView(hangUp);
+				solo.sleep(500);
+				solo.clickOnView(hangUp);
+			}
+		} else {
+			Log.testFailure("Incompatible media parameters for codec " + codecTextToAssert);
+		}
 		
 		solo.waitForActivity("LinphoneActivity", 2000);
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
@@ -170,7 +202,7 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 
 		selectItemInListOnUIThread(4);
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		if (prefs.getBoolean(context.getString(R.string.pref_video_enable_key), false)) {
+		if (prefs.getBoolean(context.getString(R.string.pref_video_enable_key), getBoolean(R.bool.pref_video_enable_default))) {
 			solo.clickOnText(context.getString(R.string.pref_video_enable_title));
 			solo.sleep(500);
 		}
@@ -183,6 +215,7 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("PCMA");
+		solo.sleep(1000);
 	}
 	
 	public void testCOutgoingAudioCallPCMU() {
@@ -192,6 +225,7 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("PCMU");
+		solo.sleep(1000);
 	}
 	
 	public void testDOutgoingAudioCallSilk16() {
@@ -201,15 +235,18 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("SILK");
+		solo.sleep(1000);
 	}
 	
 	public void testEOutgoingAudioCallSilk24() {
-		Context context = getActivity();
-		disableAllEnabledAudioCodecs();
-		solo.clickOnText(context.getString(R.string.pref_codec_silk24));
-		solo.goBack();
-		
-		goToDialerAndOutgoingCall("SILK");
+//		Silk24 no longer available
+//		Context context = getActivity();
+//		disableAllEnabledAudioCodecs();
+//		solo.clickOnText(context.getString(R.string.pref_codec_silk24));
+//		solo.goBack();
+//		
+//		goToDialerAndOutgoingCall("SILK");
+//		solo.sleep(1000);
 	}
 	
 	public void testFOutgoingAudioCallG722() {
@@ -219,6 +256,7 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("G722");
+		solo.sleep(1000);
 	}
 	
 	public void testGOutgoingAudioCallGSM() {
@@ -228,6 +266,7 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("GSM");
+		solo.sleep(1000);
 	}
 	
 	public void testHOutgoingAudioCallAMR() {
@@ -237,36 +276,60 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("AMR");
+		solo.sleep(1000);
 	}
 	
-	public void testIOutgoingAudioCallILBC() {
+	public void testIOutgoingAudioCallAMRWB() {
+		Context context = getActivity();
+		disableAllEnabledAudioCodecs();
+		solo.clickOnText(context.getString(R.string.pref_codec_amrwb));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("AMRWB");
+		solo.sleep(1000);
+	}
+	
+	public void testJOutgoingAudioCallG729() {
+		Context context = getActivity();
+		disableAllEnabledAudioCodecs();
+		solo.clickOnText(context.getString(R.string.pref_codec_g729));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("G729");
+		solo.sleep(1000);
+	}
+	
+	public void testKOutgoingAudioCallILBC() {
 		Context context = getActivity();
 		disableAllEnabledAudioCodecs();
 		solo.clickOnText(context.getString(R.string.pref_codec_ilbc));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("iLBC");
+		solo.sleep(1000);
 	}
 	
-	public void testJOutgoingAudioCallSpeex8() {
+	public void testLOutgoingAudioCallSpeex8() {
 		Context context = getActivity();
 		disableAllEnabledAudioCodecs();
 		solo.clickOnText(context.getString(R.string.pref_codec_speex8));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("speex");
+		solo.sleep(1000);
 	}
 	
-	public void testKOutgoingAudioCallSpeex16() {
+	public void testMOutgoingAudioCallSpeex16() {
 		Context context = getActivity();
 		disableAllEnabledAudioCodecs();
 		solo.clickOnText(context.getString(R.string.pref_codec_speex16));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("speex");
+		solo.sleep(1000);
 	}
 	
-	public void testLEnableVideo() {
+	public void testNEnableVideo() {
 		Context context = getActivity();
 		
 		solo.waitForActivity("LinphoneActivity", 2000);
@@ -276,37 +339,40 @@ public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<Li
 		solo.sleep(500);
 		selectItemInListOnUIThread(4);
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		if (!prefs.getBoolean(context.getString(R.string.pref_video_enable_key), true)) {
+		if (!prefs.getBoolean(context.getString(R.string.pref_video_enable_key), getBoolean(R.bool.pref_video_enable_default))) {
 			solo.clickOnText(context.getString(R.string.pref_video_enable_title));
 			solo.sleep(500);
 		}
 	}
 	
-	public void testMOutgoingVideoCallVP8() {
+	public void testOOutgoingVideoCallVP8() {
 		Context context = getActivity();
 		disableAllEnabledVideoCodecs();
 		solo.clickOnText(context.getString(R.string.pref_video_codec_vp8_title));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("VP8");
+		solo.sleep(1000);
 	}
 	
-	public void testNOutgoingVideoCallH264() {
+	public void testPOutgoingVideoCallH264() {
 		Context context = getActivity();
 		disableAllEnabledVideoCodecs();
 		solo.clickOnText(context.getString(R.string.pref_video_codec_h264_title));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("H264");
+		solo.sleep(1000);
 	}
 	
-	public void testOOutgoingVideoCallMPG4() {
+	public void testQOutgoingVideoCallMPG4() {
 		Context context = getActivity();
 		disableAllEnabledVideoCodecs();
 		solo.clickOnText(context.getString(R.string.pref_video_codec_mpeg4_title));
 		solo.goBack();
 		
 		goToDialerAndOutgoingCall("MP4V-ES");
+		solo.sleep(1000);
 	}
 	
 	@Override
diff --git a/tests/src/org/linphone/test/HistoryTest.java b/tests/src/org/linphone/test/HistoryTest.java
index c937176f4..ac102d9b8 100644
--- a/tests/src/org/linphone/test/HistoryTest.java
+++ b/tests/src/org/linphone/test/HistoryTest.java
@@ -26,7 +26,6 @@ public class HistoryTest extends ActivityInstrumentationTestCase2<LinphoneActivi
 	private void selectItemInListOnUIThread(final int item) {
 		solo.sleep(500);
 		getActivity().runOnUiThread(new Runnable() {
-			@Override
 			public void run() {
 				ListView list = (ListView) solo.getView(android.R.id.list);
 				list.setSelection(item);
@@ -94,10 +93,14 @@ public class HistoryTest extends ActivityInstrumentationTestCase2<LinphoneActivi
 	}	
 
 	public void testDCallBackFromHistoryEntry() {
+		Context context = getActivity();
+		
 		solo.waitForActivity("LinphoneActivity", 2000);
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(R.id.history));
 		
+		solo.clickOnText(context.getString(R.string.button_all_call));
+		solo.sleep(500);
 		solo.clickOnText("cotcot");
 		solo.waitForActivity("InCallActivity", 2000);
 		solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
diff --git a/tests/src/org/linphone/test/SignalingTest.java b/tests/src/org/linphone/test/SignalingTest.java
index 79225f4e3..83e962ab1 100644
--- a/tests/src/org/linphone/test/SignalingTest.java
+++ b/tests/src/org/linphone/test/SignalingTest.java
@@ -25,7 +25,6 @@ public class SignalingTest extends ActivityInstrumentationTestCase2<LinphoneActi
 	private void selectItemInListOnUIThread(final int item) {
 		solo.sleep(500);
 		getActivity().runOnUiThread(new Runnable() {
-			@Override
 			public void run() {
 				ListView list = (ListView) solo.getView(android.R.id.list);
 				list.setSelection(item);
@@ -40,7 +39,7 @@ public class SignalingTest extends ActivityInstrumentationTestCase2<LinphoneActi
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 		solo.clickOnView(solo.getView(R.id.settings));
 
-		selectItemInListOnUIThread(19);
+		selectItemInListOnUIThread(6);
 		solo.clickOnText(context.getString(R.string.pref_network_title));
 		solo.sleep(500);
 	}
@@ -70,6 +69,7 @@ public class SignalingTest extends ActivityInstrumentationTestCase2<LinphoneActi
 		Context context = getActivity();
 		goToNetworkSettings();
 		
+		solo.clickOnText(context.getString(R.string.pref_transport));
 		solo.clickOnText(context.getString(R.string.pref_transport_udp));
 		solo.goBack();
 		solo.goBack();
@@ -84,7 +84,8 @@ public class SignalingTest extends ActivityInstrumentationTestCase2<LinphoneActi
 	public void testCRegistrationTCP() {
 		Context context = getActivity();
 		goToNetworkSettings();
-		
+
+		solo.clickOnText(context.getString(R.string.pref_transport));
 		solo.clickOnText(context.getString(R.string.pref_transport_tcp));
 		solo.goBack();
 		solo.goBack();
@@ -99,7 +100,8 @@ public class SignalingTest extends ActivityInstrumentationTestCase2<LinphoneActi
 	public void testERegistrationTLS() {
 		Context context = getActivity();
 		goToNetworkSettings();
-		
+
+		solo.clickOnText(context.getString(R.string.pref_transport));
 		solo.clickOnText(context.getString(R.string.pref_transport_tls));
 		solo.goBack();
 		solo.goBack();