diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index d8c10190a..be27dd6ce 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -35,7 +35,6 @@ import java.util.ArrayList;
 public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<TrackListActivity> {
 
   private static final String WAYPOINT_NAME = "testWaypoint";
-  private static final String RELATIVE_STARTTIME_POSTFIX = "mins ago";
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
@@ -116,8 +115,8 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     
     // If no account is binded with this device.
     if (EndToEndTestUtils.SOLO.waitForText(activityMyTracks
-        .getString(R.string.send_google_no_account_title), 1, 500)) {
-      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+        .getString(R.string.send_google_no_account_title), 1, 10000)) {
+      EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     } else {
       assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
           .getString(R.string.generic_progress_title)));
@@ -129,7 +128,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
       // For we not sure the send will be successful, just check whether the result dialog is display. 
       assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
           .getString(R.string.share_track_share_url)));
-      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+      EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     }
     
   }
@@ -148,6 +147,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
 
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.rotateAllActivities();
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.generic_save));
     sendKeys(KeyEvent.KEYCODE_DEL);
     ArrayList<EditText> editTexts = EndToEndTestUtils.SOLO.getCurrentEditTexts();
     
@@ -212,7 +212,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
   public void testTrackStartTime() {
     // Delete all track first.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true);
-    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     
     // Reset all settings.
     EndToEndTestUtils.resetAllSettings(activityMyTracks, false);
@@ -225,13 +225,13 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.SOLO.goBack();
     instrumentation.waitForIdleSync();
-    assertFalse(EndToEndTestUtils.SOLO.waitForText(RELATIVE_STARTTIME_POSTFIX, 1, 500));
+    assertFalse(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.RELATIVE_STARTTIME_POSTFIX, 1, 500));
 
     // Test should show relative time for createSimpleTrack would save a track
     // name that is different with the start time.
     EndToEndTestUtils.createSimpleTrack(2);
     EndToEndTestUtils.SOLO.goBack();
-    assertTrue(EndToEndTestUtils.SOLO.waitForText(RELATIVE_STARTTIME_POSTFIX, 1, 5000));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.RELATIVE_STARTTIME_POSTFIX, 1, 5000));
   }
 
   /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index c35f6bb42..42488072a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -62,7 +62,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true);
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.rotateAllActivities();
-    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
     // There is no track now.
     trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
@@ -74,7 +74,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
             EndToEndTestUtils.GPX.toUpperCase()));
     assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
         .getString(R.string.sd_card_save_error_no_track)));
-    EndToEndTestUtils.SOLO.clickLongOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
   }
 
   /**
@@ -89,7 +89,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
 
     EndToEndTestUtils.SOLO.clickOnView(trackListView.get(0).getChildAt(0));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
-    EndToEndTestUtils.SOLO.clickLongOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils
+    .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
     trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
     int trackNumberNew = trackListView.get(0).getCount();
@@ -102,15 +103,15 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
   public void testDeleteOneTrackUnderRecording() {
     EndToEndTestUtils.startRecording();
     instrumentation.waitForIdleSync();
-    assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_stop_recording),
-        false));
+    assertTrue(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_recording), false));
     instrumentation.waitForIdleSync();
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete),
-        true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
+    EndToEndTestUtils
+        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
-    assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_record_track),
-        false));
+    assertTrue(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_record_track), false));
     instrumentation.waitForIdleSync();
     assertTrue(EndToEndTestUtils.findMenuItem(
         activityMyTracks.getString(R.string.menu_record_track), false));
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index 955fc8d2d..2d3c86185 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -67,6 +67,14 @@ public class EndToEndTestUtils {
   static final String BACKUPS = "backups";
   static final String MENU_MORE = "More";
   static String trackName;
+  
+  // Following is some check strings in English and Chinese
+  private static final String RELATIVE_STARTTIME_POSTFIX_ENGLISH = "mins ago";
+  private static final String RELATIVE_STARTTIME_POSTFIX_CHINESE = "分钟前";
+  public static String RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_ENGLISH;
+  private static final String VIEW_MODE_ENGLISH = "mode";
+  private static final String VIEW_MODE_CHINESE = "模式";
+  public static String VIEW_MODE = VIEW_MODE_ENGLISH;
 
   static Solo SOLO;
   static Instrumentation INSTRUMENTATION;
@@ -142,7 +150,7 @@ public class EndToEndTestUtils {
     // welcome view with accept buttons. And makes sure only check once.
     if (!EndToEndTestUtils.isCheckedFirstLaunch) {
       if ((EndToEndTestUtils.getButtonOnScreen(EndToEndTestUtils.ACTIVITYMYTRACKS
-          .getString(R.string.eula_accept)) != null)) {
+          .getString(R.string.eula_accept), false, false) != null)) {
         EndToEndTestUtils.verifyFirstLaunch();
       } else if (EndToEndTestUtils.SOLO.waitForText(
       // After reset setting, welcome page will show again.
@@ -152,6 +160,12 @@ public class EndToEndTestUtils {
 
       EndToEndTestUtils.isCheckedFirstLaunch = true;
       EndToEndTestUtils.setHasActionBar();
+      
+      String loc = INSTRUMENTATION.getContext().getResources().getConfiguration().locale.getLanguage();
+      if (loc.equalsIgnoreCase("zh")) {
+        RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_CHINESE;
+        VIEW_MODE = VIEW_MODE_CHINESE;
+      }
     } else if (EndToEndTestUtils.SOLO.waitForText(
         // After reset setting, welcome page will show again.
         ACTIVITYMYTRACKS.getString(R.string.welcome_title), 0, 500)) {
@@ -169,9 +183,9 @@ public class EndToEndTestUtils {
    * Checks if need reset preferred units.
    */
   private static void resetPreferredUnits() {
-    EndToEndTestUtils.SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.generic_ok));
+    getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
     SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.settings_stats_units_title));
-    EndToEndTestUtils.SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.generic_ok));
+    getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
     INSTRUMENTATION.waitForIdleSync();
   }
 
@@ -192,11 +206,13 @@ public class EndToEndTestUtils {
    */
   static void verifyFirstLaunch() {
     SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.eula_accept));
-    // Click for welcome.
-    SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.generic_ok));
-    // Click for choose units.
-    SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.generic_ok));
-    INSTRUMENTATION.waitForIdleSync();
+    if (SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.generic_ok))) {
+      // Click for welcome.
+      getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
+      // Click for choose units.
+      getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
+      INSTRUMENTATION.waitForIdleSync();
+    }
   }
 
   /**
@@ -228,6 +244,7 @@ public class EndToEndTestUtils {
     View oneTrack = SOLO.getCurrentListViews().get(0).getChildAt(0);
     trackName = (String) ((TextView) oneTrack.findViewById(R.id.list_item_name)).getText();
     if (isClick) {
+      SOLO.scrollUp();
       SOLO.clickOnView(oneTrack);
     }
     return false;
@@ -255,11 +272,11 @@ public class EndToEndTestUtils {
    */
   static void startRecording() {
     if (hasActionBar) {
-      Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track));
+      Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
       // In case a track is recording.
       if (startButton == null) {
         stopRecording(true);
-        startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track));
+        startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
       }
       SOLO.clickOnView(startButton);
     } else {
@@ -287,7 +304,7 @@ public class EndToEndTestUtils {
   static boolean isUnderRecording() {
     if (hasActionBar) { 
       return getButtonOnScreen(ACTIVITYMYTRACKS
-        .getString(R.string.menu_record_track)) == null; 
+        .getString(R.string.menu_record_track), false, false) == null; 
     }
     showMoreMenuItem();
     if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))
@@ -302,18 +319,18 @@ public class EndToEndTestUtils {
   /**
    * Stops recoding track.
    * 
-   * @param isSave ture means should save this track
+   * @param isSave true means should save this track
    */
   static void stopRecording(boolean isSave) {
     if (hasActionBar) {
-      SOLO.clickOnView(getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording)));
+      getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording), false, true);
     } else {
       showMoreMenuItem();
       INSTRUMENTATION.waitForIdleSync();
       SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording));
     }
     if (isSave) {
-      INSTRUMENTATION.waitForIdleSync();
+      EndToEndTestUtils.SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.generic_save));
       // Make every track name is unique to make sure every check can be
       // trusted.
       EndToEndTestUtils.trackName = EndToEndTestUtils.TRACK_NAME_PREFIX
@@ -378,13 +395,21 @@ public class EndToEndTestUtils {
    * Checks if a button is existed in the screen.
    * 
    * @param buttonName the name string of the button
+   * @param isWait whether wait the text
+   * @param isClick whether click the button if find it
    * @return the button to search, and null means can not find the button
    */
-  static Button getButtonOnScreen(String buttonName) {
+  static Button getButtonOnScreen(String buttonName, boolean isWait,boolean isClick) {
+    if (isWait) {
+      SOLO.waitForText(buttonName);
+    }
     ArrayList<Button> currentButtons = SOLO.getCurrentButtons();
     for (Button button : currentButtons) {
       String title = (String) button.getText();
       if (title.equalsIgnoreCase(buttonName)) { 
+        if(isClick) {
+          SOLO.clickOnView(button);
+        }
         return button; 
       }
     }
@@ -400,8 +425,8 @@ public class EndToEndTestUtils {
     INSTRUMENTATION.waitForIdleSync();
     // If can find record button without pressing Menu, it should be an action
     // bar.
-    Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track));
-    Button stopButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording));
+    Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
+    Button stopButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording), false, false);
     if (startButton != null || stopButton != null) {
       hasActionBar = true;
     } else {
@@ -448,7 +473,7 @@ public class EndToEndTestUtils {
     boolean findResult = false;
 
     // Firstly find in action bar.
-    Button button = getButtonOnScreen(menuName);
+    Button button = getButtonOnScreen(menuName, false, false);
     if (button != null) {
       findResult = true;
       if (click) {
@@ -546,8 +571,8 @@ public class EndToEndTestUtils {
    */
   public static void resetAllSettings(Activity activityMyTracks, boolean keepInSettingList) {
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
-    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
+    getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
     INSTRUMENTATION.waitForIdleSync();
     if (!keepInSettingList) {
       EndToEndTestUtils.SOLO.goBack();
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index 69edd2640..f822fb8c8 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -84,7 +84,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_import), true);
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.sd_card_import_error_no_file,
         FileUtils.buildExternalDirectoryPath(EndToEndTestUtils.GPX)));
-    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
 
     // Click to export tracks(At least one track) to Gpx files.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
@@ -93,7 +93,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
             EndToEndTestUtils.GPX.toUpperCase()));
     EndToEndTestUtils.rotateAllActivities();
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.sd_card_save_success));
-    EndToEndTestUtils.SOLO.clickLongOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     // Check export file.
     assertEquals(gpxFilesNumber + trackNumber,
         EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.GPX).length);
@@ -111,7 +111,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
         "%")[0]);
     // Check import tracks should be equal with the sum of trackNumber and
     // gpxFilesNumber;
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
     assertEquals(trackNumber + gpxFilesNumber, EndToEndTestUtils.SOLO.getCurrentListViews().get(0)
         .getCount());
@@ -124,7 +124,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
         .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
             EndToEndTestUtils.KML.toUpperCase()));
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.sd_card_save_success));
-    EndToEndTestUtils.SOLO.clickLongOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     // Check export files.
     assertEquals(gpxFilesNumber, EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.GPX).length);
     assertEquals(trackNumber, EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.KML).length);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
index 9fb0d2cf0..a4f8421b7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -74,8 +74,8 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_help), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.help_about));
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
   }
   
   /**
@@ -84,8 +84,8 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
   public void testSearch() {
     EndToEndTestUtils.createSimpleTrack(1);
     EndToEndTestUtils.SOLO.goBack();
-    EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.getButtonOnScreen(activityMyTracks
-        .getString(R.string.menu_search)));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks
+        .getString(R.string.menu_search), true, true);
     ArrayList<EditText> editTexts = EndToEndTestUtils.SOLO.getCurrentEditTexts();
     EndToEndTestUtils.SOLO.enterText(editTexts.get(0), EndToEndTestUtils.trackName);
     sendKeys(KeyEvent.KEYCODE_ENTER);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 3abf04555..cd46e3321 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -90,7 +90,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
 
     // Reset all settings.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
-    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
 
     // Check settings.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
@@ -251,7 +251,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
 
     // Read from SD card.
@@ -259,7 +259,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup));
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
         .getString(R.string.settings_backup_restore));
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.sd_card_import_success), 0, 10000));
     // Check restore track.
@@ -286,7 +286,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
       // Close soft keyboard.
       EndToEndTestUtils.SOLO.goBack();
     }
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.SOLO.goBack();
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
index b1f9711c3..4cae672ed 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -88,10 +88,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
     EndToEndTestUtils.showMoreMenuItem();
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.menu_settings), 1, 3000));
-    assertTrue(EndToEndTestUtils.SOLO.waitForText(
-        activityMyTracks.getString(R.string.menu_satellite_mode), 1, 0)
-        || EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.menu_map_mode),
-            1, 0));
+    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.VIEW_MODE, 1, true, false));
   }
 
   /**