diff --git a/app/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt b/core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
similarity index 100%
rename from app/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
rename to core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/InstantExecutorExtension.kt b/core/src/test/java/org/kiwix/kiwixmobile/InstantExecutorExtension.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/InstantExecutorExtension.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/InstantExecutorExtension.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/TestUtilitiyFunctions.kt b/core/src/test/java/org/kiwix/kiwixmobile/TestUtilitiyFunctions.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/TestUtilitiyFunctions.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/TestUtilitiyFunctions.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/downloader/ChunkUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/downloader/ChunkUtilsTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/downloader/ChunkUtilsTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/downloader/ChunkUtilsTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntityTest.java b/core/src/test/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntityTest.java
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntityTest.java
rename to core/src/test/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntityTest.java
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/settings/StorageCalculatorTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/settings/StorageCalculatorTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/settings/StorageCalculatorTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/settings/StorageCalculatorTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/utils/BookUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/utils/BookUtilsTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/utils/BookUtilsTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/utils/BookUtilsTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/utils/NetworkUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/utils/NetworkUtilsTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/utils/NetworkUtilsTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/utils/NetworkUtilsTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/utils/files/FileUtilsTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileUtilsTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/utils/files/FileUtilsTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/LanguageTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/zim_manager/LanguageTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/zim_manager/LanguageTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/zim_manager/LanguageTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt
similarity index 100%
rename from app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt
rename to core/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt