diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
index 499e7e415..768de75e5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
@@ -75,15 +75,12 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
   private ArrayList<String> mapIds;
   private ArrayList<MapsMapMetadata> mapData;
 
-	public ChooseMapAsyncTask(ChooseMapActivity activity, Account account) {
-		this(activity, account, activity.getApplicationContext(),
-				GDataClientFactory.getGDataClient(activity
-						.getApplicationContext()), new MapsClient(
-						GDataClientFactory.getGDataClient(activity
-								.getApplicationContext()),
-						new XmlMapsGDataParserFactory(
-								new AndroidXmlParserFactory())));
-	}
+  public ChooseMapAsyncTask(ChooseMapActivity activity, Account account) {
+    this(activity, account, activity.getApplicationContext(), GDataClientFactory
+        .getGDataClient(activity.getApplicationContext()), new MapsClient(
+        GDataClientFactory.getGDataClient(activity.getApplicationContext()),
+        new XmlMapsGDataParserFactory(new AndroidXmlParserFactory())));
+  }
 
 	/**
 	 * Creates this constructor for test.
@@ -242,7 +239,7 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
   
   /**
    * Sets the status of canRetry.
-   * @param completed status of canRetry
+   * @param canRetry status of canRetry
    */
   @VisibleForTesting
   void setCanRetry(boolean canRetry) {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTaskTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTaskTest.java
index a7bcf927a..7d9265fb1 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTaskTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTaskTest.java
@@ -15,12 +15,8 @@
  */
 package com.google.android.apps.mytracks.io.maps;
 
-import com.google.android.apps.mytracks.io.gdata.maps.MapsClient;
-import com.google.android.apps.mytracks.io.gdata.maps.XmlMapsGDataParserFactory;
-import com.google.android.common.gdata.AndroidXmlParserFactory;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
-import com.google.wireless.gdata.client.GDataClient;
 
 import android.accounts.Account;
 import android.test.AndroidTestCase;
@@ -57,24 +53,6 @@ public class ChooseMapAsyncTaskTest extends AndroidTestCase {
     }
   }
 
-  /**
-   * Tests {@link ChooseMapAsyncTask#execute(Void...)} and makes sure
-   * {@link ChooseMapActivity#showProgressDialog()} will be run.
-   */
-  @UsesMocks({ ChooseMapActivity.class, GDataClient.class, MapsClient.class })
-  public void testExecute() {
-    chooseMapActivityMock = AndroidMock.createMock(ChooseMapActivity.class);
-    chooseMapActivityMock.showProgressDialog();
-    GDataClient gDataClient = AndroidMock.createMock(GDataClient.class);
-    MapsClient mapsClient = AndroidMock.createMock(MapsClient.class, gDataClient,
-        new XmlMapsGDataParserFactory(new AndroidXmlParserFactory()));
-    AndroidMock.replay(chooseMapActivityMock, gDataClient, mapsClient);
-    ChooseMapAsyncTask asyncTask = new ChooseMapAsyncTask(chooseMapActivityMock, account,
-        getContext(), gDataClient, mapsClient);
-    asyncTask.execute();
-    AndroidMock.verify(chooseMapActivityMock);
-  }
-
   /**
    * Tests {@link ChooseMapAsyncTask#setActivity(ChooseMapActivity)} when the
    * task is completed. Makes sure it calls
@@ -215,7 +193,7 @@ public class ChooseMapAsyncTaskTest extends AndroidTestCase {
   private void setupChooseMapActivityMock() {
     chooseMapActivityMock = AndroidMock.createMock(ChooseMapActivity.class);
     // This is used in the constructor of ChooseMapAsyncTask.
-    AndroidMock.expect(chooseMapActivityMock.getApplicationContext()).andReturn(getContext());
+    AndroidMock.expect(chooseMapActivityMock.getApplicationContext()).andReturn(getContext()).anyTimes();
   }
 
 }