diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java
deleted file mode 100644
index 213cc2199..000000000
--- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.data;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import android.content.ContentUris;
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.data.tables.TracksColumns;
-
-/**
- * Tests {@link CustomContentProvider}.
- *
- * @author Youtao Liu
- */
-public class CustomContentProviderTest {
-
-    private CustomContentProvider customContentProvider;
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    @Before
-    public void setUp() {
-        customContentProvider = new CustomContentProvider() {
-        };
-    }
-
-    /**
-     * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
-     */
-    @Test
-    public void testOnCreate() {
-        assertTrue(customContentProvider.onCreate(context));
-    }
-
-    /**
-     * Tests {@link CustomContentProvider#getType(Uri)}.
-     */
-    @Test
-    public void testGetType() {
-        assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
-        assertEquals(TracksColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TracksColumns.CONTENT_URI.buildUpon(), 1).build()));
-
-        assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI_BY_ID));
-        assertEquals(TrackPointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TrackPointsColumns.CONTENT_URI_BY_TRACKID.buildUpon(), 1).build()));
-
-        assertEquals(MarkerColumns.CONTENT_TYPE, customContentProvider.getType(MarkerColumns.CONTENT_URI));
-        assertEquals(MarkerColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(MarkerColumns.CONTENT_URI.buildUpon(), 1).build()));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
index 46e55c96f..fc9c7f017 100644
--- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
@@ -71,8 +71,7 @@ public class ContentProviderUtils {
     private static final String TAG = ContentProviderUtils.class.getSimpleName();
 
     // The authority (the first part of the URI) for the app's content provider.
-    @VisibleForTesting
-    public static final String AUTHORITY_PACKAGE = BuildConfig.APPLICATION_ID + ".content";
+    static final String AUTHORITY_PACKAGE = BuildConfig.APPLICATION_ID + ".content";
 
     // The base URI for the app's content provider.
     public static final String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE;
diff --git a/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
index e0922f538..e63413534 100644
--- a/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
@@ -19,7 +19,6 @@ package de.dennisguse.opentracks.data;
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
-import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.SQLException;
@@ -111,18 +110,7 @@ public class CustomContentProvider extends ContentProvider {
 
     @Override
     public boolean onCreate() {
-        return onCreate(getContext());
-    }
-
-    /**
-     * Helper method to make onCreate is testable.
-     *
-     * @param context context to creates database
-     * @return true means run successfully
-     */
-    @VisibleForTesting
-    boolean onCreate(Context context) {
-        CustomSQLiteOpenHelper databaseHelper = new CustomSQLiteOpenHelper(context);
+        CustomSQLiteOpenHelper databaseHelper = new CustomSQLiteOpenHelper(getContext());
         try {
             db = databaseHelper.getWritableDatabase();
             // Necessary to enable cascade deletion from Track to TrackPoints and Markers