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 09115b74d..e6c819a0f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -157,7 +157,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     EndToEndTestUtils.startRecording();
     instrumentation.waitForIdleSync();
     // Send Gps before send marker.
-    EndToEndTestUtils.sendGps(2);
+    EndToEndTestUtils.sendGps(2, 0);
     if (EndToEndTestUtils.hasActionBar) {
       // Check the title is Recording.
       assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks
@@ -165,7 +165,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     }
     
     createWaypoint();
-    EndToEndTestUtils.sendGps(2);
+    EndToEndTestUtils.sendGps(2, 2);
     // Back to tracks list.
     EndToEndTestUtils.SOLO.goBack();
     instrumentation.waitForIdleSync();
@@ -232,7 +232,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     // Send Gps to give a distance more than one kilometer or one mile.
-    EndToEndTestUtils.sendGps(20);    
+    EndToEndTestUtils.sendGps(20, 0);    
     assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers),
         true));
     instrumentation.waitForIdleSync();
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 67cecdf5e..bd3ef2e37 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -59,10 +59,10 @@ public class EndToEndTestUtils {
   private static final int ORIENTATION_LANDSCAPE = 0;
   // Pause 200ms between each send.
   static int PAUSE = 200;
-  private static final float START_LONGITUDE = 51;
-  private static final float START_LATITUDE = -1.3f;
-  private static final float DELTA_LONGITUDE = 0.0005f;
-  private static final float DELTA_LADITUDE = 0.0005f;
+  static final double START_LONGITUDE = 51;
+  static final double START_LATITUDE = -1.3f;
+  static final double DELTA_LONGITUDE = 0.0005f;
+  static final double DELTA_LADITUDE = 0.0005f;
   private static final String NO_GPS_MESSAGE_PREFIX = "GPS is not available";
   
   private static final String MOREOPTION_CLASSNAME = "com.android.internal.view.menu.ActionMenuPresenter$OverflowMenuButton";
@@ -163,8 +163,9 @@ public class EndToEndTestUtils {
    * Sends Gps data to emulator.
    * 
    * @param number send times
+   * @param numberBofore is used to compute the start latitude and longitude 
    */
-  public static void sendGps(int number) {
+  public static void sendGps(int number, int numberBofore) {
     if (number < 1) { 
       return; 
     }
@@ -178,13 +179,13 @@ public class EndToEndTestUtils {
     try {
       socket = new Socket(ANDROID_LOCAL_IP, emulatorPort);
       out = new PrintStream(socket.getOutputStream());
-      float longitude = START_LONGITUDE;
-      float latitude = START_LATITUDE;
+      double longitude = START_LONGITUDE + numberBofore * DELTA_LONGITUDE;
+      double latitude = START_LATITUDE + numberBofore * DELTA_LADITUDE;
       for (int i = 0; i < number; i++) {
-        Thread.sleep(PAUSE);
-        out.println("geo fix " + latitude + " " + longitude);
+        out.println("geo fix " + longitude + " " + latitude);
         longitude += DELTA_LONGITUDE;
         latitude += DELTA_LADITUDE;
+        Thread.sleep(PAUSE);
       }
       // Wait the GPS signal can be obtained by MyTracks.  
       Thread.sleep(SHORT_WAIT_TIME);
@@ -302,7 +303,7 @@ public class EndToEndTestUtils {
    */
   static void createSimpleTrack(int numberOfGpsData) {
     startRecording();
-    sendGps(numberOfGpsData);
+    sendGps(numberOfGpsData, 0);
     instrumentation.waitForIdleSync();
     stopRecording(true);
   }
@@ -310,17 +311,18 @@ public class EndToEndTestUtils {
   /**
    * Creates a track which contains pause during recording.
    * 
-   * @param numberOfGpsData number of simulated Gps data
+   * @param numberOfGpsData number of simulated Gps data before pause and after resume
    */
   public static void createTrackWithPause(int numberOfGpsData) {
     EndToEndTestUtils.startRecording();
-    EndToEndTestUtils.sendGps(numberOfGpsData);
+    EndToEndTestUtils.sendGps(numberOfGpsData, 0);
     EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_pause_track), true);
-    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_record_track), false);
-    EndToEndTestUtils.sendGps(numberOfGpsData);
+    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_record_track), true);
+    EndToEndTestUtils.sendGps(numberOfGpsData, numberOfGpsData);
     EndToEndTestUtils.stopRecording(true);
   }
   
+  
   /**
    * Checks if there is no track in track list. For some tests need at least one
    * track, the method can save time to create a new track.
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 b1ec14558..9b2526425 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -73,7 +73,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     // Create a new track with 3 gps data.
     EndToEndTestUtils.createTrackWithPause(3);
     instrumentation.waitForIdleSync();
-    EndToEndTestUtils.SOLO.goBack();    
+    EndToEndTestUtils.SOLO.goBack();   
     
     // Create a empty track.
     EndToEndTestUtils.createTrackWithPause(0);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
index a06719ae3..7d8ef9a24 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
@@ -73,7 +73,7 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
    */
   public static void findAndClickMyLocation(Activity activity) {
     EndToEndTestUtils.createTrackIfEmpty(1, false);
-    EndToEndTestUtils.sendGps(30);
+    EndToEndTestUtils.sendGps(30, 0);
     
     View myLocation = EndToEndTestUtils.SOLO.getCurrentActivity()
         .findViewById(R.id.map_my_location);
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 1d74c80b5..d4f62c650 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
@@ -16,10 +16,14 @@
 package com.google.android.apps.mytracks.endtoendtest;
 
 import com.google.android.apps.mytracks.TrackListActivity;
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
+import com.google.android.apps.mytracks.services.TrackRecordingService;
 import com.google.android.maps.mytracks.R;
 
 import android.annotation.TargetApi;
 import android.app.Instrumentation;
+import android.location.Location;
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
@@ -31,12 +35,12 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
 
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
-  
+
   @TargetApi(15)
   public PauseRecordingTest() {
     super(TrackListActivity.class);
   }
-  
+
   @Override
   protected void setUp() throws Exception {
     super.setUp();
@@ -44,67 +48,128 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
     activityMyTracks = getActivity();
     EndToEndTestUtils.setupForAllTest(instrumentation, activityMyTracks);
   }
-  
+
   /**
-   * Tests the pause recording feature. Stops the recording after pause. 
+   * Tests the pause recording feature. Stops the recording after pause.
    */
   public void testPauseRecording_stopAfterPause() {
+    int gpsSignalNumber = 3;
+
     // 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));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_pause_track), false));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_recording), false));
     EndToEndTestUtils.SOLO.goBack();
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_stop_recording), false));
-    
-    // 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));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_pause_track), false));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    EndToEndTestUtils.sendGps(gpsSignalNumber, 0);
 
-    // Stop 
+    // 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));
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
+
+    // Stop
     EndToEndTestUtils.stopRecording(true);
+    checkPointsInPausedTrack(gpsSignalNumber, 1, 0);
   }
 
   /**
-   * Tests the pause recording feature. Stops the recording after resume. 
+   * Tests the pause recording feature. Stops the recording after resume.
    */
   public void testPauseRecording_stopAfterResume() {
+    int gpsSignalNumber = 3;
+
     // 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));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_pause_track), false));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_recording), false));
     EndToEndTestUtils.SOLO.goBack();
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_stop_recording), false));
-    
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_pause_track), false));
+    assertNotNull(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_recording), false));
+    EndToEndTestUtils.sendGps(gpsSignalNumber, 0);
+
     // 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));
+    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));
+
+    // Send Gps signal after pause.
+    int defaultPause = EndToEndTestUtils.PAUSE;
+    EndToEndTestUtils.PAUSE = 10;
+    // Add 100 to make these signals are apparently different.
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber + 100);
+    EndToEndTestUtils.PAUSE = defaultPause;
+
     // Resume
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_record_track),
-        false);
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(activityMyTracks
-        .getString(R.string.menu_stop_recording), false));
-    // Stop 
+    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));
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
+
+    // Stop
     EndToEndTestUtils.stopRecording(true);
+    checkPointsInPausedTrack(gpsSignalNumber * 2, 1, 1);
   }
-  
+
+  /**
+   * Check the points in the last track.
+   * 
+   * @param expectPointNumber the number of location points
+   * @param expectPauseNumber the number of pause points
+   * @param expectResumeNumber the number of resume points
+   */
+  private void checkPointsInPausedTrack(int expectPointNumber, int expectPauseNumber,
+      int expectResumeNumber) {
+    if (EndToEndTestUtils.isEmulator) {
+      int numberOfPoints = 0;
+      int numberOfPausePoint = 0;
+      int numberOfResumePoint = 0;
+
+      MyTracksProviderUtils providerUtils = MyTracksProviderUtils.Factory.get(activityMyTracks
+          .getApplicationContext());
+      long trackId = providerUtils.getLastTrack().getId();
+      LocationIterator points = providerUtils.getTrackPointLocationIterator(trackId, 0, false,
+          MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
+      while (points.hasNext()) {
+        Location onePoint = points.next();
+        double latitude = onePoint.getLatitude();
+        double longitude = onePoint.getLongitude();
+        if (latitude == TrackRecordingService.PAUSE_LATITUDE) {
+          numberOfPausePoint++;
+        } 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));
+          assertEquals(
+              numberOfPoints,
+              (int) ((longitude - EndToEndTestUtils.START_LONGITUDE) / EndToEndTestUtils.DELTA_LONGITUDE + 0.5));
+          numberOfPoints++;
+        }
+      }
+
+      assertEquals(expectPointNumber, numberOfPoints);
+      assertEquals(expectPauseNumber, numberOfPausePoint);
+      assertEquals(expectResumeNumber, numberOfResumePoint);
+    }
+  }
+
 }
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 dbbca90e9..b6b7559fe 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -125,9 +125,9 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.startRecording();
     // Test just change preferred units when display CHART tab.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_chart_tab));
-    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.sendGps(3, 0);
     ChangeStatsSettings(true, false, false, false, false);
-    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.sendGps(3, 3);
     EndToEndTestUtils.stopRecording(true);
 
   }
@@ -139,9 +139,9 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.startRecording();
     // Test change preferred units and preferred rate when display STATS tab.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
-    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.sendGps(3, 0);
     ChangeStatsSettings(true, true, false, false, false);
-    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.sendGps(3, 3);
     EndToEndTestUtils.stopRecording(true);
 
   }