diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java
index 49520978b..0c9f3e955 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java
@@ -153,6 +153,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
 
     EndToEndTestUtils.waitTextToDisappear(activityMyTracks
         .getString(R.string.generic_progress_title));
+    EndToEndTestUtils.waitTextToDisappear(activityMyTracks
+        .getString(R.string.track_delete_progress_message));
     int trackNumberNew = trackNumberOld;
     long startTime = System.currentTimeMillis();
     // Wait a few seconds for the delete.
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
index fca1307ce..2d31e4de6 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
@@ -25,6 +25,7 @@ import com.google.android.maps.mytracks.R;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
 import android.widget.CheckBox;
 import android.widget.ListView;
 
@@ -98,10 +99,11 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
 
     // Reset all settings.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup_reset));
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset_summary));
     EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true,
         true);
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.settings_reset_done));
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.settings_reset_done), 1,
+        EndToEndTestUtils.SHORT_WAIT_TIME);
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.SOLO.goBack();
 
@@ -115,6 +117,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
         activityMyTracks.getString(R.string.settings_stats_units_title), 1,
         EndToEndTestUtils.LONG_WAIT_TIME));
     displayCheckBoxs = EndToEndTestUtils.SOLO.getCurrentViews(CheckBox.class);
+    Log.i(EndToEndTestUtils.LOG_TAG, "useMetric:" + useMetric);
     assertEquals(useMetric, displayCheckBoxs.get(0).isChecked());
 
     EndToEndTestUtils.SOLO.goBack();
@@ -172,7 +175,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    * Stats tab.
    */
   public void testChangeStatsSettings_showExtraInfos() {
-    EndToEndTestUtils.resetAllSettings(activityMyTracks, true);
+    EndToEndTestUtils.resetAllSettings(activityMyTracks, false);
     ChangeStatsSettings(false, false, true, true);
     EndToEndTestUtils.startRecording();
     instrumentation.waitForIdleSync();
@@ -189,9 +192,8 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
         activityMyTracks.getString(R.string.stats_elevation), 1,
         EndToEndTestUtils.NORMAL_WAIT_TIME, true));
     assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.stats_grade)));
-    assertFalse(EndToEndTestUtils.SOLO.waitForText(
-        activityMyTracks.getString(R.string.stats_latitude), 1,
-        EndToEndTestUtils.VERY_SHORT_WAIT_TIME));
+    assertFalse(EndToEndTestUtils.SOLO.searchText(activityMyTracks
+        .getString(R.string.stats_latitude)));
   }
 
   /**
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java
index 1bb4e5a6d..8986bb9c0 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java
@@ -58,6 +58,13 @@ public class ShareTest extends ActivityInstrumentationTestCase2<TrackListActivit
 
     // Click share again and confirm the share.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
+    // Whether can found any account.
+    if (EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.send_google_no_account_title), 1,
+        EndToEndTestUtils.VERY_SHORT_WAIT_TIME)) {
+      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+      return;
+    }
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
 
     boolean isAccount2Bound = false;