diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModelTest.kt
index b2b1bd54d6..333c6b3156 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModelTest.kt
@@ -22,6 +22,7 @@ import android.app.Application
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.net.NetworkCapabilities.TRANSPORT_WIFI
+import android.os.Build
 import com.jraska.livedata.test
 import io.mockk.clearAllMocks
 import io.mockk.every
@@ -139,7 +140,12 @@ class ZimManageViewModelTest {
     every { newLanguagesDao.languages() } returns languages
     every { fat32Checker.fileSystemStates } returns fileSystemStates
     every { connectivityBroadcastReceiver.networkStates } returns networkStates
-    every { application.registerReceiver(any(), any(), any()) } returns mockk()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      every { application.registerReceiver(any(), any(), any()) } returns mockk()
+    } else {
+      @Suppress("UnspecifiedRegisterReceiverFlag")
+      every { application.registerReceiver(any(), any()) } returns mockk()
+    }
     every { dataSource.booksOnDiskAsListItems() } returns booksOnDiskListItems
     every {
       connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
@@ -167,8 +173,15 @@ class ZimManageViewModelTest {
   inner class Context {
     @Test
     fun `registers broadcastReceiver in init`() {
-      verify {
-        application.registerReceiver(connectivityBroadcastReceiver, any(), any())
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        verify {
+          application.registerReceiver(connectivityBroadcastReceiver, any(), any())
+        }
+      } else {
+        @Suppress("UnspecifiedRegisterReceiverFlag")
+        verify {
+          application.registerReceiver(connectivityBroadcastReceiver, any())
+        }
       }
     }
 
diff --git a/core/src/main/res/layout/dialog_navigation_history.xml b/core/src/main/res/layout/dialog_navigation_history.xml
index c8f65ca302..153001b263 100644
--- a/core/src/main/res/layout/dialog_navigation_history.xml
+++ b/core/src/main/res/layout/dialog_navigation_history.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Kiwix Android
   ~ Copyright (c) 2023 Kiwix <android.kiwix.org>
   ~ This program is free software: you can redistribute it and/or modify
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
index e72e764edf..79bdb6ae08 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
@@ -24,7 +24,6 @@ import io.mockk.clearAllMocks
 import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.mockk
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
@@ -35,6 +34,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
@@ -99,7 +99,7 @@ internal class SearchViewModelTest {
     Dispatchers.resetMain()
     Dispatchers.setMain(testDispatcher)
     clearAllMocks()
-    recentsFromDb = Channel(kotlinx.coroutines.channels.Channel.UNLIMITED)
+    recentsFromDb = Channel(Channel.UNLIMITED)
     every { zimReaderContainer.zimFileReader } returns zimFileReader
     coEvery {
       searchResultGenerator.generateSearchResults("", zimFileReader)
@@ -241,11 +241,18 @@ internal class SearchViewModelTest {
       action: Action,
       vararg effects: SideEffect<*>
     ) {
-      viewModel.effects
-        .test(this)
-        .also { viewModel.actions.trySend(action).isSuccess }
-        .assertValues(*effects)
-        .finish()
+      if (effects.size > 1) return
+      val collectedEffects = mutableListOf<SideEffect<*>>()
+      val job = launch {
+        viewModel.effects.collect {
+          collectedEffects.add(it)
+        }
+      }
+
+      viewModel.actions.trySend(action).isSuccess
+      advanceUntilIdle()
+      assertThat(collectedEffects).containsExactlyElementsOf(effects.toList())
+      job.cancel()
     }
   }
 
@@ -269,34 +276,51 @@ internal class SearchViewModelTest {
   }
 }
 
-fun <T> Flow<T>.test(scope: CoroutineScope) = TestObserver(scope, this)
+fun <T> Flow<T>.test(scope: TestScope): TestObserver<T> {
+  val observer = TestObserver(scope, this)
+  scope.launch { observer.startCollecting() }
+  return observer
+}
 
 class TestObserver<T>(
-  scope: CoroutineScope,
-  flow: Flow<T>
+  private val scope: TestScope,
+  private val flow: Flow<T>
 ) {
   private val values = mutableListOf<T>()
-  private val job: Job = scope.launch {
-    flow.collect {
-      values.add(it)
+  private val completionChannel = Channel<Unit>()
+  private var job: Job? = null
+
+  suspend fun startCollecting() {
+    job = scope.launch {
+      flow.collect {
+        values.add(it)
+      }
     }
+    completionChannel.send(Unit)
+  }
+
+  private suspend fun awaitCompletion() {
+    completionChannel.receive()
   }
 
-  fun assertValues(vararg values: T): TestObserver<T> {
+  suspend fun assertValues(vararg values: T): TestObserver<T> {
+    awaitCompletion()
     assertThat(values.toList()).containsExactlyElementsOf(this.values)
     return this
   }
 
-  fun assertValue(value: T): TestObserver<T> {
+  suspend fun assertValue(value: T): TestObserver<T> {
+    awaitCompletion()
     assertThat(values.last()).isEqualTo(value)
     return this
   }
 
   fun finish() {
-    job.cancel()
+    job?.cancel()
   }
 
-  fun assertValue(value: (T) -> Boolean): TestObserver<T> {
+  suspend fun assertValue(value: (T) -> Boolean): TestObserver<T> {
+    awaitCompletion()
     assertThat(values.last()).satisfies({ value(it) })
     return this
   }