diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java
index 94f52badd..5617838b2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java
@@ -41,7 +41,7 @@ public class FontUtils {
    * @return the selected fon
    */
   public static String extractValidFont(String... fontNames) {
-    if (fontNames == null) {
+    if (fontNames.length == 0) {
       return null;
     }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
index 7c4719216..56f75e226 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
@@ -3,19 +3,22 @@ package org.maplibre.android.testapp.offline
 import android.content.Context
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.rule.ActivityTestRule
+import java.io.IOException
+import java.util.concurrent.CountDownLatch
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.FixMethodOrder
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
 import org.maplibre.android.AppCenter
 import org.maplibre.android.offline.OfflineManager
 import org.maplibre.android.offline.OfflineRegion
 import org.maplibre.android.storage.FileSource
 import org.maplibre.android.testapp.activity.FeatureOverviewActivity
 import org.maplibre.android.testapp.utils.FileUtils
-import org.junit.FixMethodOrder
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import java.io.IOException
-import java.util.concurrent.CountDownLatch
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @RunWith(AndroidJUnit4ClassRunner::class)
@@ -23,7 +26,6 @@ class OfflineManagerTest : AppCenter() {
 
     companion object {
         private const val TEST_DB_FILE_NAME = "offline_test.db"
-        private lateinit var mergedRegion: OfflineRegion
     }
 
     @Rule
@@ -32,15 +34,33 @@ class OfflineManagerTest : AppCenter() {
 
     private val context: Context by lazy { rule.activity }
 
+    @Before
+    @After
+    fun resetDatabase() {
+        OfflineManager.getInstance(context).resetDatabase(object : OfflineManager.FileSourceCallback {
+            override fun onSuccess() {
+            }
+
+            override fun onError(message: String) {
+                throw IOException("Unable to reset database before / after tests.")
+            }
+        })
+    }
+
     @Test(timeout = 30_000)
-    fun a_copyFileFromAssets() {
-        val latch = CountDownLatch(1)
+    fun combinedTest() {
+
+        lateinit var mergedRegion: OfflineRegion
+
+        // Copy file from assets
+
+        val latch1 = CountDownLatch(1)
         rule.activity.runOnUiThread {
             FileUtils.CopyFileFromAssetsTask(
                 rule.activity,
                 object : FileUtils.OnFileCopiedFromAssetsListener {
                     override fun onFileCopiedFromAssets() {
-                        latch.countDown()
+                        latch1.countDown()
                     }
 
                     override fun onError() {
@@ -49,19 +69,18 @@ class OfflineManagerTest : AppCenter() {
                 }
             ).execute(TEST_DB_FILE_NAME, FileSource.getResourcesCachePath(rule.activity))
         }
-        latch.await()
-    }
+        latch1.await()
 
-    @Test(timeout = 30_000)
-    fun b_mergeRegion() {
-        val latch = CountDownLatch(1)
+        // Merge a second region
+
+        val latch2 = CountDownLatch(1)
         rule.activity.runOnUiThread {
             OfflineManager.getInstance(context).mergeOfflineRegions(
                 FileSource.getResourcesCachePath(rule.activity) + "/" + TEST_DB_FILE_NAME,
                 object : OfflineManager.MergeOfflineRegionsCallback {
                     override fun onMerge(offlineRegions: Array<OfflineRegion>?) {
-                        assert(offlineRegions?.size == 1)
-                        latch.countDown()
+                        Assert.assertEquals(1, offlineRegions?.size)
+                        latch2.countDown()
                     }
 
                     override fun onError(error: String) {
@@ -70,52 +89,49 @@ class OfflineManagerTest : AppCenter() {
                 }
             )
         }
-        latch.await()
-    }
+        latch2.await()
 
-    @Test(timeout = 30_000)
-    fun c_listRegion() {
-        val latch = CountDownLatch(1)
+        // List regions (ensure merge yielded one region only)
+
+        val latch3 = CountDownLatch(1)
         rule.activity.runOnUiThread {
             OfflineManager.getInstance(context).listOfflineRegions(object : OfflineManager.ListOfflineRegionsCallback {
                 override fun onList(offlineRegions: Array<OfflineRegion>?) {
-                    assert(offlineRegions?.size == 1)
+                    Assert.assertEquals(1, offlineRegions?.size)
                     mergedRegion = offlineRegions!![0]
-                    latch.countDown()
+                    latch3.countDown()
                 }
 
                 override fun onError(error: String) {
-                    throw RuntimeException("Unable to merge external offline database. $error")
+                    throw RuntimeException("Unable to list regions in offline database. $error")
                 }
             })
         }
-        latch.await()
-    }
+        latch3.await()
 
-    @Test(timeout = 30_000)
-    fun d_invalidateRegion() {
-        val latch = CountDownLatch(1)
+        // Invalidate region
+
+        val latch4 = CountDownLatch(1)
         rule.activity.runOnUiThread {
             mergedRegion.invalidate(object : OfflineRegion.OfflineRegionInvalidateCallback {
                 override fun onInvalidate() {
-                    latch.countDown()
+                    latch4.countDown()
                 }
 
                 override fun onError(error: String) {
-                    throw RuntimeException("Unable to delete region")
+                    throw RuntimeException("Unable to invalidate region")
                 }
             })
         }
-        latch.await()
-    }
+        latch4.await()
 
-    @Test(timeout = 30_000)
-    fun e_deleteRegion() {
-        val latch = CountDownLatch(1)
+        // Delete region
+
+        val latch5 = CountDownLatch(1)
         rule.activity.runOnUiThread {
             mergedRegion.delete(object : OfflineRegion.OfflineRegionDeleteCallback {
                 override fun onDelete() {
-                    latch.countDown()
+                    latch5.countDown()
                 }
 
                 override fun onError(error: String) {
@@ -123,6 +139,23 @@ class OfflineManagerTest : AppCenter() {
                 }
             })
         }
-        latch.await()
+        latch5.await()
+
+        // List regions (ensure deletion was successful)
+
+        val latch6 = CountDownLatch(1)
+        rule.activity.runOnUiThread {
+            OfflineManager.getInstance(context).listOfflineRegions(object : OfflineManager.ListOfflineRegionsCallback {
+                override fun onList(offlineRegions: Array<OfflineRegion>?) {
+                    Assert.assertEquals(0, offlineRegions?.size)
+                    latch6.countDown()
+                }
+
+                override fun onError(error: String) {
+                    throw RuntimeException("Unable to list regions in offline database. $error")
+                }
+            })
+        }
+        latch6.await()
     }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt
index 1246b991b..ae333b000 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt
@@ -25,7 +25,7 @@ class FontUtilsTest {
 
     @Test
     fun testExtractedFontShouldBeNull() {
-        val actual = FontUtils.extractValidFont(null)
+        val actual = FontUtils.extractValidFont()
         Assert.assertNull(actual)
     }
 }