diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 381a92a17..3ff4e180f 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -61,10 +61,9 @@ kotlin {
                 implementation(devNpm("copy-webpack-plugin", "9.1.0"))
             }
         }
-        val commonTest by getting {
-            dependencies {
-                implementation(libs.kotlin.test)
-            }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+            implementation(libs.kotlinx.coroutines.test)
         }
     }
 }
diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt
index a2764afa5..3f619f8b2 100644
--- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt
+++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt
@@ -23,6 +23,7 @@ import com.google.samples.apps.nowinandroid.core.database.NiaDatabase
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceFtsEntity
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 
 /**
  * DAO for [NewsResourceFtsEntity] access.
@@ -45,9 +46,10 @@ class NewsResourceFtsDao(db: NiaDatabase, private val dispatcher: CoroutineDispa
             .mapToList(dispatcher)
     }
 
-    fun getCount(): Flow<Long> {
+    fun getCount(): Flow<Int> {
         return dbQuery.getCount()
             .asFlow()
             .mapToOneNotNull(dispatcher)
+            .map { it.toInt() }
     }
 }
diff --git a/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/DriverModule.kt b/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/DriverModule.kt
index 2a2eeb977..cdb3a75bb 100644
--- a/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/DriverModule.kt
+++ b/core/database/src/nativeMain/kotlin/com/google/samples/apps/nowinandroid/core/database/DriverModule.kt
@@ -24,7 +24,6 @@ import app.cash.sqldelight.driver.native.NativeSqliteDriver
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 
-@Component
 actual class DriverModule {
 
     @Provides