diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
index ccbd0678a..e4de6acc5 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
@@ -25,7 +25,7 @@ import android.test.AndroidTestCase;
 
 /**
  * Tests for the {@link DynamicSpeedTrackPathDescriptor}.
- * 
+ *
  * @author Youtao Liu
  */
 public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
@@ -63,8 +63,9 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#OnSharedPreferenceChanged()}
-   * when the key is null.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is null.
    */
   public void testOnSharedPreferenceChanged_nullKey() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(
@@ -81,8 +82,9 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#OnSharedPreferenceChanged()}
-   * when the key is not null, and not trackColorModeDynamicVariation.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is not null, and not trackColorModeDynamicVariation.
    */
   public void testOnSharedPreferenceChanged_otherKey() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(
@@ -99,8 +101,9 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#OnSharedPreferenceChanged()}
-   * when the key is trackColorModeDynamicVariation.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is trackColorModeDynamicVariation.
    */
   public void testOnSharedPreferenceChanged_trackColorModeDynamicVariationKey() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(
@@ -118,8 +121,9 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#OnSharedPreferenceChanged()}
-   * when the values of speedMargin is "".
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the values of speedMargin is "".
    */
   public void testOnSharedPreferenceChanged_emptyValue() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(
@@ -136,7 +140,7 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#NeedsRedraw()} by wrong track
+   * Tests {@link DynamicSpeedTrackPathDescriptor#needsRedraw()} by wrong track
    * id.
    */
   public void testNeedsRedraw_WrongTrackId() {
@@ -149,7 +153,7 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#NeedsRedraw()} by different
+   * Tests {@link DynamicSpeedTrackPathDescriptor#needsRedraw()} by different
    * averageMovingSpeed.
    */
   public void testIsDiffereceSignificant() {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptorTest.java
index 7efc542fd..347ab9bb4 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptorTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptorTest.java
@@ -25,7 +25,7 @@ import android.test.AndroidTestCase;
 
 /**
  * Tests for the {@link DynamicSpeedTrackPathDescriptor}.
- * 
+ *
  * @author Youtao Liu
  */
 public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
@@ -47,9 +47,8 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests the initialization of slowSpeed and normalSpeed in
-   * {@link DynamicSpeedTrackPathDescriptor#DynamicSpeedTrackPathDescriptor(Context)}
-   * .
+   * Tests the initialization of slowSpeed and normalSpeed in {@link
+   * DynamicSpeedTrackPathDescriptor#DynamicSpeedTrackPathDescriptor(Context)}.
    */
   public void testConstructor() {
     String[] slowSpeedsInShPre = { "0", "1", "99", "" };
@@ -71,8 +70,9 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged()}
-   * when the key is null.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is null.
    */
   public void testOnSharedPreferenceChanged_null_key() {
     FixedSpeedTrackPathDescriptor fixedSpeedTrackPathDescriptor = new FixedSpeedTrackPathDescriptor(
@@ -94,8 +94,9 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged()}
-   * when the key is not null, and not slowSpeed and not normalSpeed.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is not null, and not slowSpeed and not normalSpeed.
    */
   public void testOnSharedPreferenceChanged_other_key() {
     FixedSpeedTrackPathDescriptor fixedSpeedTrackPathDescriptor = new FixedSpeedTrackPathDescriptor(
@@ -116,8 +117,9 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged()}
-   * when the key is slowSpeed.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is slowSpeed.
    */
   public void testOnSharedPreferenceChanged_slowSpeedKey() {
     FixedSpeedTrackPathDescriptor fixedSpeedTrackPathDescriptor = new FixedSpeedTrackPathDescriptor(
@@ -139,8 +141,9 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged()}
-   * when the key is normalSpeed.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the key is normalSpeed.
    */
   public void testOnSharedPreferenceChanged_normalSpeedKey() {
     FixedSpeedTrackPathDescriptor fixedSpeedTrackPathDescriptor = new FixedSpeedTrackPathDescriptor(
@@ -162,9 +165,10 @@ public class FixedSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged()}
-   * when the values of slowSpeed and normalSpeed in SharedPreference is "". In
-   * such situation, the default value should get returned.
+   * Tests {@link
+   * DynamicSpeedTrackPathDescriptor#onSharedPreferenceChanged(SharedPreferences,
+   * String)} when the values of slowSpeed and normalSpeed in SharedPreference
+   * is "". In such situation, the default value should get returned.
    */
   public void testOnSharedPreferenceChanged_emptyValue() {
     FixedSpeedTrackPathDescriptor fixedSpeedTrackPathDescriptor = new FixedSpeedTrackPathDescriptor(
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java
index 2585602be..59affe2b9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 public class SensorEventCounterTest extends AndroidTestCase {
 
   @SmallTest
-  public void testGetEventsPerMinute() throws InterruptedException {
+  public void testGetEventsPerMinute() {
     SensorEventCounter sec = new SensorEventCounter();
     assertEquals(0, sec.getEventsPerMinute(0, 0, 0));
     assertEquals(0, sec.getEventsPerMinute(1, 1024, 1000));