diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/WriteProgressControllerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/WriteProgressControllerTest.java
index baab083d0..2f4349b32 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/WriteProgressControllerTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/WriteProgressControllerTest.java
@@ -25,6 +25,8 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
+ * Tests {@link WriteProgressController}.
+ *
  * @author Matthew Simmons
  */
 public class WriteProgressControllerTest extends ActivityInstrumentationTestCase2<MyTracks> {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
index 8de892d93..c5fbb18a3 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
@@ -41,22 +41,22 @@ public class MockTrackWriter implements TrackWriter {
 
   @Override
   public void setDirectory(File directory) {
-    throw new RuntimeException("not implemented");
+    throw new UnsupportedOperationException("not implemented");
   }
 
   @Override
   public String getAbsolutePath() {
-    throw new RuntimeException("not implemented");
+    throw new UnsupportedOperationException("not implemented");
   }
 
   @Override
   public void writeTrackAsync() {
-    throw new RuntimeException("not implemented");
+    throw new UnsupportedOperationException("not implemented");
   }
 
   @Override
   public void writeTrack() {
-    throw new RuntimeException("not implemented");
+    throw new UnsupportedOperationException("not implemented");
   }
 
   @Override