diff --git a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
index 1eb0c71b1..6060897c3 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.chart.ChartView;
-import de.dennisguse.opentracks.content.data.Distance;
 
 /**
  * Tests {@link ChartFragment}.
@@ -59,7 +58,6 @@ public class ChartFragmentTest {
         boolean chartByDistance = false;
         chartFragment = ChartFragment.newInstance(chartByDistance);
         chartFragment.setChartView(new ChartView(ApplicationProvider.getApplicationContext(), chartByDistance));
-        chartFragment.setRecordingDistanceInterval(Distance.of(50));
     }
 
     @Test
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
index ae1330814..d300cc38b 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
@@ -13,6 +13,7 @@ import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -64,6 +65,11 @@ public class TrackRecordingServiceTestLocation {
         if (Looper.myLooper() == null) Looper.prepare();
     }
 
+    @AfterClass
+    public static void finalTearDown() {
+        if (Looper.myLooper() != null) Looper.myLooper().quit();
+    }
+
     @Before
     public void setUp() throws TimeoutException {
         // Set up the mock content resolver
diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java
index b94f303d5..e309fa814 100644
--- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java
@@ -76,4 +76,9 @@ public class ChartPoint {
     public Double getPower() {
         return power;
     }
+
+    @Override
+    public String toString() {
+        return "ChartPoint{" + "timeOrDistance=" + timeOrDistance + '}';
+    }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
index 7d45c6e02..fe456d8c9 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
@@ -318,24 +318,4 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     void setChartView(ChartView view) {
         chartView = view;
     }
-
-    @VisibleForTesting
-    void setMetricUnits(boolean value) {
-        chartView.setMetricUnits(value);
-    }
-
-    @VisibleForTesting
-    void setReportSpeed(boolean value) {
-        chartView.setReportSpeed(value);
-    }
-
-    @VisibleForTesting
-    void setChartByDistance(boolean value) {
-        chartByDistance = value;
-    }
-
-    @VisibleForTesting
-    void setRecordingDistanceInterval(Distance value) {
-        recordingDistanceInterval = value;
-    }
 }