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 153eb5b68..6c9f4468e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -335,10 +335,9 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     } else {
       assertFalse(EndToEndTestUtils.SOLO.searchText(WAYPOINT_NAME));
     }
-
     EndToEndTestUtils.SOLO.goBack();
   }
-
+  
   @Override
   protected void tearDown() throws Exception {
     EndToEndTestUtils.SOLO.finishOpenedActivities();
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 68da315ea..33fc39eb7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -105,10 +105,10 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
    * Deletes a track which is under recording.
    */
   public void testDeleteOneTrackUnderRecording() {
+    assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
     EndToEndTestUtils.startRecording();
     instrumentation.waitForIdleSync();
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
     EndToEndTestUtils
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 6320dc92b..c994758b9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -397,28 +397,6 @@ public class EndToEndTestUtils {
     View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(startButton != null && startButton.isShown()) {
       SOLO.clickOnView(startButton);
-    } else if (hasActionBar) {
-      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), false, false);
-      }
-      SOLO.clickOnView(startButton);
-    } else {
-      showMenuItem();
-      if (!SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))) {
-        // Check if in TrackDetailActivity.
-        if (SOLO.searchText(activityMytracks.getString(R.string.menu_play))) {
-          SOLO.goBack();
-        } else {
-          // In case a track is recording.
-          stopRecording(true);
-          showMenuItem();
-        }
-      }
-      instrumentation.waitForIdleSync();
-      SOLO.clickOnText(activityMytracks.getString(R.string.menu_record_track));
     }
     instrumentation.waitForIdleSync();
   }
@@ -430,14 +408,7 @@ public class EndToEndTestUtils {
     View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(pauseButton != null && pauseButton.isShown()) {
       SOLO.clickOnView(pauseButton);
-    } else if (hasActionBar) {
-      pauseButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_pause_track), false, false);
-      SOLO.clickOnView(pauseButton);
-    } else {
-      showMenuItem();
-      instrumentation.waitForIdleSync();
-      SOLO.clickOnText(activityMytracks.getString(R.string.menu_pause_track));
-    }
+    } 
     instrumentation.waitForIdleSync();
   }
   
@@ -448,13 +419,6 @@ public class EndToEndTestUtils {
     View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(startButton != null && startButton.isShown()) {
       SOLO.clickOnView(startButton);
-    } else if (hasActionBar) {
-      startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
-      SOLO.clickOnView(startButton);
-    } else {
-      showMenuItem();
-      instrumentation.waitForIdleSync();
-      SOLO.clickOnText(activityMytracks.getString(R.string.menu_record_track));
     }
     instrumentation.waitForIdleSync();
   }
@@ -493,25 +457,19 @@ public class EndToEndTestUtils {
     View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop);
     if(stopButton != null && stopButton.isShown() ) {
       SOLO.clickOnView(stopButton);
-    } else if (hasActionBar) {
-      getButtonOnScreen(activityMytracks.getString(R.string.menu_stop_recording), false, true);
-    } else {
-      showMenuItem();
-      instrumentation.waitForIdleSync();
-      SOLO.clickOnText(activityMytracks.getString(R.string.menu_stop_recording));
-    }
-    if (isSave) {
-      SOLO.waitForText(activityMytracks.getString(R.string.generic_save), 1, 5000);
-      // Make every track name is unique to make sure every check can be
-      // trusted.
-      trackName = TRACK_NAME_PREFIX
-          + System.currentTimeMillis();
-      SOLO.sendKey(KeyEvent.KEYCODE_DEL);
-      enterTextAvoidSoftKeyBoard(0, trackName);
-      enterTextAvoidSoftKeyBoard(1, DEFAULTACTIVITY);
-      SOLO.clickOnText(activityMytracks.getString(R.string.generic_save));
-      instrumentation.waitForIdleSync();
-    }
+      if (isSave) {
+        SOLO.waitForText(activityMytracks.getString(R.string.generic_save), 1, 5000);
+        // Make every track name is unique to make sure every check can be
+        // trusted.
+        trackName = TRACK_NAME_PREFIX
+            + System.currentTimeMillis();
+        SOLO.sendKey(KeyEvent.KEYCODE_DEL);
+        enterTextAvoidSoftKeyBoard(0, trackName);
+        enterTextAvoidSoftKeyBoard(1, DEFAULTACTIVITY);
+        SOLO.clickOnText(activityMytracks.getString(R.string.generic_save));
+        instrumentation.waitForIdleSync();
+      }
+    } 
   }
 
   /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
index 57d2e2eeb..a0671f3d1 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
@@ -57,18 +57,14 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
 
     // Start recording
     EndToEndTestUtils.startRecording();
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
     EndToEndTestUtils.sendGps(gpsSignalNumber);
 
+
     // Pause
     EndToEndTestUtils.pauseRecording();
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_record_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
+
     EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
 
     // Stop
@@ -84,18 +80,14 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
 
     // Start recording
     EndToEndTestUtils.startRecording();
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
     EndToEndTestUtils.sendGps(gpsSignalNumber);
 
+
     // Pause
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_pause_track), true);
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_record_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
+
 
     // Send Gps signal after pause.
     // Add 10 to make these signals are apparently different.
@@ -103,10 +95,7 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
 
     // Resume
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_record_track), true);
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    assertTrue(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
     EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
 
     // Stop
@@ -142,7 +131,6 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
         } else if (latitude == TrackRecordingService.RESUME_LATITUDE) {
           numberOfResumePoint++;
         } else {
-          System.out.println(latitude + ":" + longitude);
           assertEquals(
               numberOfPoints,
               (int) ((latitude - EndToEndTestUtils.START_LATITUDE) / EndToEndTestUtils.DELTA_LADITUDE + 0.5));
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 58f34fe49..aa9457bc4 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -114,10 +114,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
       }
     }
     instrumentation.waitForIdleSync();
-
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_help), false);
-    instrumentation.waitForIdleSync();
-    EndToEndTestUtils.rotateAllActivities();
+    assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_help), false));
 
     // Switch back.
     EndToEndTestUtils.showMenuItem();