diff --git a/app/src/test/kotlin/com/tangem/tap/common/analytics/appsflyer/AppsFlyerReferralParamsHandlerTest.kt b/app/src/test/kotlin/com/tangem/tap/common/analytics/appsflyer/AppsFlyerReferralParamsHandlerTest.kt
index c2a6c12ac1..385abb101c 100644
--- a/app/src/test/kotlin/com/tangem/tap/common/analytics/appsflyer/AppsFlyerReferralParamsHandlerTest.kt
+++ b/app/src/test/kotlin/com/tangem/tap/common/analytics/appsflyer/AppsFlyerReferralParamsHandlerTest.kt
@@ -8,7 +8,7 @@ import com.tangem.domain.wallets.models.AppsFlyerConversionData
 import com.tangem.feature.referral.domain.SetShouldShowMobileWalletPromoUseCase
 import com.tangem.test.core.ProvideTestModels
 import arrow.core.right
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import io.mockk.clearMocks
 import io.mockk.coEvery
 import io.mockk.coVerify
diff --git a/app/src/test/kotlin/com/tangem/tap/domain/DefaultUserWalletSelectedHandlerTest.kt b/app/src/test/kotlin/com/tangem/tap/domain/DefaultUserWalletSelectedHandlerTest.kt
index ee434cb45c..84272b9c7b 100644
--- a/app/src/test/kotlin/com/tangem/tap/domain/DefaultUserWalletSelectedHandlerTest.kt
+++ b/app/src/test/kotlin/com/tangem/tap/domain/DefaultUserWalletSelectedHandlerTest.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.domain
 
 import com.google.common.truth.Truth.assertThat
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.domain.card.MockScanResponseFactory
 import com.tangem.common.test.domain.wallet.MockUserWalletFactory
 import com.tangem.core.analytics.utils.TrackingContextProxy
diff --git a/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt b/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
index 1dfc937810..bb98272eef 100644
--- a/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
@@ -335,7 +335,10 @@ class DefaultWalletAccountsFetcherTest {
                     body = SaveWalletAccountsResponse(savedAccountsResponse.accounts),
                 )
                 eTagsStore.clear(userWalletId, ETagsStore.Key.WalletAccounts)
-                userTokensSaver.push(userWalletId = userWalletId, response = savedAccountsResponse.toUserTokensResponse())
+                userTokensSaver.push(
+                    userWalletId = userWalletId,
+                    response = savedAccountsResponse.toUserTokensResponse(),
+                )
                 tokensMigration.migrate(userWalletId)
             }
         }
diff --git a/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsCRUDRepositoryTest.kt b/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsCRUDRepositoryTest.kt
index 17a2f87acb..0adcc20b4a 100644
--- a/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsCRUDRepositoryTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsCRUDRepositoryTest.kt
@@ -19,7 +19,6 @@ import com.tangem.datasource.api.tangemTech.models.account.WalletAccountDTO
 import com.tangem.datasource.local.datastore.RuntimeStateStore
 import com.tangem.domain.account.models.AccountList
 import com.tangem.domain.account.models.ArchivedAccount
-import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.account.Account.CryptoPortfolio
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.account.AccountName
diff --git a/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsExpandedRepositoryTest.kt b/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsExpandedRepositoryTest.kt
index 78c1e93de4..876bc8b018 100644
--- a/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsExpandedRepositoryTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/repository/DefaultAccountsExpandedRepositoryTest.kt
@@ -2,7 +2,7 @@ package com.tangem.data.account.repository
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.domain.account.models.AccountExpandedState
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.account.DerivationIndex
@@ -21,7 +21,7 @@ class DefaultAccountsExpandedRepositoryTest {
     @Test
     fun `expandedAccounts emits updated state when store changes`() = runTest {
         val dataStore = MockStateDataStore<Map<String, Set<AccountsExpandedDTO>>>(
-            default = emptyMap()
+            default = emptyMap(),
         )
 
         val repository = DefaultAccountsExpandedRepository(dataStore)
@@ -37,9 +37,9 @@ class DefaultAccountsExpandedRepositoryTest {
                     walletId.stringValue to setOf(
                         AccountsExpandedDTO(
                             accountId = mainAccountId.value,
-                            isExpanded = true
-                        )
-                    )
+                            isExpanded = true,
+                        ),
+                    ),
                 )
             }
 
@@ -60,14 +60,14 @@ class DefaultAccountsExpandedRepositoryTest {
     @Test
     fun `expandedAccounts emits when update is called`() = runTest {
         val dataStore = MockStateDataStore<Map<String, Set<AccountsExpandedDTO>>>(
-            default = emptyMap()
+            default = emptyMap(),
         )
 
         val repository = DefaultAccountsExpandedRepository(dataStore)
 
         val state = AccountExpandedState(
             accountId = mainAccountId,
-            isExpanded = true
+            isExpanded = true,
         )
 
         repository.expandedAccounts.test {
@@ -94,9 +94,9 @@ class DefaultAccountsExpandedRepositoryTest {
             mapOf(
                 walletId.stringValue to setOf(
                     AccountsExpandedDTO(mainAccountId.value, true),
-                    AccountsExpandedDTO(secondAccountId.value, false)
-                )
-            )
+                    AccountsExpandedDTO(secondAccountId.value, false),
+                ),
+            ),
         )
 
         val repository = DefaultAccountsExpandedRepository(dataStore)
@@ -109,7 +109,7 @@ class DefaultAccountsExpandedRepositoryTest {
             // when
             repository.syncStore(
                 walletId = walletId,
-                existAccounts = setOf(mainAccountId) // without secondAccountId
+                existAccounts = setOf(mainAccountId), // without secondAccountId
             )
 
             // then
diff --git a/data/account/src/test/java/com/tangem/data/account/store/AccountsResponseStoreFactoryTest.kt b/data/account/src/test/java/com/tangem/data/account/store/AccountsResponseStoreFactoryTest.kt
index f0fa74d20a..d165678e16 100644
--- a/data/account/src/test/java/com/tangem/data/account/store/AccountsResponseStoreFactoryTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/store/AccountsResponseStoreFactoryTest.kt
@@ -3,7 +3,7 @@ package com.tangem.data.account.store
 import android.content.Context
 import com.google.common.truth.Truth
 import com.squareup.moshi.Moshi
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.domain.models.wallet.UserWalletId
 import io.mockk.clearMocks
 import io.mockk.mockk
diff --git a/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt b/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
index 5b1401f2b3..145fea8456 100644
--- a/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
@@ -1,7 +1,7 @@
 package com.tangem.data.account.token
 
 import arrow.core.right
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.data.account.converter.createGetWalletAccountsResponse
 import com.tangem.data.account.converter.createWalletAccountDTO
 import com.tangem.data.account.store.AccountsResponseStore
diff --git a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt
index f355cc27c1..e096d2417f 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusFetcherTest.kt
@@ -40,7 +40,12 @@ internal class DefaultMultiNetworkStatusFetcherTest {
 
     @BeforeEach
     fun resetMocks() {
-        clearMocks(networksStatusesStore, cardCryptoCurrencyFactory, commonNetworkStatusFetcher, dynamicAddressesInitializer)
+        clearMocks(
+            networksStatusesStore,
+            cardCryptoCurrencyFactory,
+            commonNetworkStatusFetcher,
+            dynamicAddressesInitializer,
+        )
         // No dynamic addresses restore by default
         coEvery { dynamicAddressesInitializer.getXpubs(any(), any()) } returns emptyMap()
     }
diff --git a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusProducerTest.kt b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusProducerTest.kt
index 4b35a6fa71..b57c4b4559 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusProducerTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/multi/DefaultMultiNetworkStatusProducerTest.kt
@@ -66,7 +66,7 @@ internal class DefaultMultiNetworkStatusProducerTest {
         val networksStatusesFlow = flowOf(simpleStatuses)
 
         every { networksStatusesStore.get(params.userWalletId) } returns networksStatusesFlow
-                val userWalletsFlow = MutableStateFlow(listOf(userWallet))
+        val userWalletsFlow = MutableStateFlow(listOf(userWallet))
 
         every { userWalletsListRepository.userWallets } returns userWalletsFlow
 
@@ -132,7 +132,7 @@ internal class DefaultMultiNetworkStatusProducerTest {
 
         // region every
         every { networksStatusesStore.get(params.userWalletId) } returns networksStatusesFlow
-                val userWalletsFlow = MutableStateFlow(listOf(userWallet))
+        val userWalletsFlow = MutableStateFlow(listOf(userWallet))
 
         every { userWalletsListRepository.userWallets } returns userWalletsFlow
         every {
@@ -235,7 +235,7 @@ internal class DefaultMultiNetworkStatusProducerTest {
 
         // region every
         every { networksStatusesStore.get(params.userWalletId) } returns networksStatusesFlow
-                val userWalletsFlow = MutableStateFlow(listOf(userWallet))
+        val userWalletsFlow = MutableStateFlow(listOf(userWallet))
 
         every { userWalletsListRepository.userWallets } returns userWalletsFlow
 
@@ -319,7 +319,7 @@ internal class DefaultMultiNetworkStatusProducerTest {
 
         // region every
         every { networksStatusesStore.get(params.userWalletId) } returns networksStatusesFlow
-                val userWalletsFlow = MutableStateFlow(listOf(userWallet))
+        val userWalletsFlow = MutableStateFlow(listOf(userWallet))
 
         every { userWalletsListRepository.userWallets } returns userWalletsFlow
         every {
@@ -407,7 +407,7 @@ internal class DefaultMultiNetworkStatusProducerTest {
         val networksStatusesFlow = flowOf(simpleStatuses)
 
         every { networksStatusesStore.get(params.userWalletId) } returns networksStatusesFlow
-                val userWalletsFlow = MutableStateFlow(listOf(userWallet))
+        val userWalletsFlow = MutableStateFlow(listOf(userWallet))
 
         every { userWalletsListRepository.userWallets } returns userWalletsFlow
         coEvery { networkFactory.create(networkId = any(), any(), any()) } returns null
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/GetTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/GetTest.kt
index 1408149256..48c34c3692 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/GetTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/GetTest.kt
@@ -2,8 +2,8 @@ package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/InitializationTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/InitializationTest.kt
index c28121a1f5..b2106a44fc 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/InitializationTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/InitializationTest.kt
@@ -2,8 +2,8 @@ package com.tangem.data.networks.store
 
 import androidx.datastore.core.DataStore
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreStatusTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreStatusTest.kt
index 84b5a3d6bb..d67c77ce0e 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreStatusTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreStatusTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreSuccessTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreSuccessTest.kt
index 513a4c0b55..3469d2c4d6 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreSuccessTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreSuccessTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreTest.kt
index 543ab9a7c6..cabf2a0429 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/ParameterizedStoreTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsCacheTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsCacheTest.kt
index 405cbcf352..61cd40c387 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsCacheTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsCacheTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.toSimple
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsOnlyCacheTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsOnlyCacheTest.kt
index df2021163d..4fd930c0cb 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsOnlyCacheTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/SetSourceAsOnlyCacheTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.toSimple
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/StoreAdaptiveThrottleTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/StoreAdaptiveThrottleTest.kt
index 719df24b15..5a1168243a 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/StoreAdaptiveThrottleTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/StoreAdaptiveThrottleTest.kt
@@ -27,7 +27,6 @@ internal class StoreAdaptiveThrottleTest {
         val upstream = MutableSharedFlow<Set<Int>>()
 
         upstream.adaptiveThrottle().test {
-
             upstream.emit(setOf(1, 2))
             assertThat(awaitItem()).isEqualTo(setOf(1, 2))
 
@@ -44,7 +43,6 @@ internal class StoreAdaptiveThrottleTest {
         val upstream = MutableSharedFlow<Set<Int>>()
 
         upstream.adaptiveThrottle().test {
-
             upstream.emit(setOf(1, 2))
             awaitItem()
 
@@ -64,7 +62,6 @@ internal class StoreAdaptiveThrottleTest {
         val upstream = MutableSharedFlow<Set<Int>>()
 
         upstream.adaptiveThrottle().test {
-
             upstream.emit(setOf(1, 2))
             awaitItem()
 
@@ -88,7 +85,6 @@ internal class StoreAdaptiveThrottleTest {
         val upstream = MutableSharedFlow<Set<Int>>()
 
         upstream.adaptiveThrottle().test {
-
             upstream.emit(setOf(1, 2))
             awaitItem()
 
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/StoreStatusTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/StoreStatusTest.kt
index 52d06670d9..729ed8dfc8 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/StoreStatusTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/StoreStatusTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/StoreSuccessTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/StoreSuccessTest.kt
index 40bdcbcad4..7c3f64c17d 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/StoreSuccessTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/StoreSuccessTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/StoreTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/StoreTest.kt
index b0bd11e6a7..99142f1fbd 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/StoreTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/StoreTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.toDataModel
diff --git a/data/networks/src/test/java/com/tangem/data/networks/store/UpdateStatusSourceTest.kt b/data/networks/src/test/java/com/tangem/data/networks/store/UpdateStatusSourceTest.kt
index 703466e756..c948521963 100644
--- a/data/networks/src/test/java/com/tangem/data/networks/store/UpdateStatusSourceTest.kt
+++ b/data/networks/src/test/java/com/tangem/data/networks/store/UpdateStatusSourceTest.kt
@@ -1,8 +1,8 @@
 package com.tangem.data.networks.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.TestAppCoroutineScope
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.common.test.domain.network.MockNetworkStatusFactory
 import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
 import com.tangem.data.networks.models.SimpleNetworkStatus
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/converter/QuoteStatusConverterTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/converter/QuoteStatusConverterTest.kt
index a22d7c9513..78be747549 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/converter/QuoteStatusConverterTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/converter/QuoteStatusConverterTest.kt
@@ -97,7 +97,7 @@ internal class QuoteStatusConverterTest {
                     priceChange24h = BigDecimal.ONE,
                     priceChange1w = null,
                     priceChange30d = null,
-                    priceUsd = BigDecimal.ONE
+                    priceUsd = BigDecimal.ONE,
                 ),
             ),
             expected = QuoteStatus(
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
index bc4e500fc0..edd20cc28d 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
@@ -240,6 +240,7 @@ internal class DefaultMultiQuoteStatusFetcherTest {
             ),
         )
 
-        val fields = setOf(QuotesFetcher.Field.PRICE, QuotesFetcher.Field.PRICE_CHANGE_24H, QuotesFetcher.Field.PRICE_USD)
+        val fields =
+            setOf(QuotesFetcher.Field.PRICE, QuotesFetcher.Field.PRICE_CHANGE_24H, QuotesFetcher.Field.PRICE_USD)
     }
 }
\ No newline at end of file
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusUpdaterTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusUpdaterTest.kt
index 4126c45425..b20a7047ec 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusUpdaterTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusUpdaterTest.kt
@@ -2,7 +2,7 @@ package com.tangem.data.quotes.multi
 
 import arrow.core.right
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.data.quotes.store.QuotesStatusesStore
 import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
 import com.tangem.datasource.appcurrency.AppCurrencyResponseStore
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreExtTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreExtTest.kt
index 1d187c765b..f0f6841eaa 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreExtTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreExtTest.kt
@@ -1,10 +1,10 @@
 package com.tangem.data.quotes.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.data.quote.MockQuoteResponseFactory
 import com.tangem.common.test.data.quote.toDomain
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.datasource.local.datastore.RuntimeSharedStore
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.currency.CryptoCurrency
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreTest.kt
index 67df2cab9e..ecfad01352 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/store/QuotesStatusesStoreTest.kt
@@ -2,10 +2,10 @@ package com.tangem.data.quotes.store
 
 import androidx.datastore.core.DataStore
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.data.quote.MockQuoteResponseFactory
 import com.tangem.common.test.data.quote.toDomain
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.datasource.local.datastore.RuntimeSharedStore
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.currency.CryptoCurrency
diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreGetMethodTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreGetMethodTest.kt
index ff524dd229..f96b520f23 100644
--- a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreGetMethodTest.kt
+++ b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreGetMethodTest.kt
@@ -1,9 +1,9 @@
 package com.tangem.data.staking.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.data.staking.MockYieldBalanceWrapperDTOFactory
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.data.staking.toDomain
 import com.tangem.datasource.local.datastore.RuntimeSharedStore
 import com.tangem.domain.models.staking.StakingBalance
diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreInitializationTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreInitializationTest.kt
index 32884813fa..8dc68af0d9 100644
--- a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreInitializationTest.kt
+++ b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreInitializationTest.kt
@@ -2,9 +2,9 @@ package com.tangem.data.staking.store
 
 import androidx.datastore.core.DataStore
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.data.staking.MockYieldBalanceWrapperDTOFactory
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.data.staking.toDomain
 import com.tangem.datasource.local.datastore.RuntimeSharedStore
 import com.tangem.domain.models.staking.StakingBalance
diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreUpdateMethodsTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreUpdateMethodsTest.kt
index 7f9ae0cdba..2b4d5b6f0f 100644
--- a/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreUpdateMethodsTest.kt
+++ b/data/staking/src/test/kotlin/com/tangem/data/staking/store/StakingBalancesStoreUpdateMethodsTest.kt
@@ -1,9 +1,9 @@
 package com.tangem.data.staking.store
 
 import com.google.common.truth.Truth
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.common.test.data.staking.MockYieldBalanceWrapperDTOFactory
-import com.tangem.common.test.datastore.MockStateDataStore
+import com.tangem.test.core.datastore.MockStateDataStore
 import com.tangem.data.staking.toDomain
 import com.tangem.datasource.api.stakekit.models.response.model.YieldBalanceWrapperDTO
 import com.tangem.datasource.local.datastore.RuntimeSharedStore
diff --git a/data/visa/build.gradle.kts b/data/visa/build.gradle.kts
index 386c70565f..a9611b372b 100644
--- a/data/visa/build.gradle.kts
+++ b/data/visa/build.gradle.kts
@@ -85,6 +85,5 @@ dependencies {
 
     /** Test */
     testRuntimeOnly(deps.test.junit5.engine)
-    testImplementation(projects.common.test)
     testImplementation(projects.test.core)
 }
\ No newline at end of file
diff --git a/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultTangemPayWithdrawRepositoryTest.kt b/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultTangemPayWithdrawRepositoryTest.kt
index 1fa6e31cbd..eb7b4a94b3 100644
--- a/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultTangemPayWithdrawRepositoryTest.kt
+++ b/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultTangemPayWithdrawRepositoryTest.kt
@@ -2,7 +2,7 @@ package com.tangem.data.pay.repository
 
 import arrow.core.left
 import arrow.core.right
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.data.common.quote.QuotesFetcher
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
diff --git a/domain/visa/build.gradle.kts b/domain/visa/build.gradle.kts
index 4ec426e295..2f953d6aee 100644
--- a/domain/visa/build.gradle.kts
+++ b/domain/visa/build.gradle.kts
@@ -46,5 +46,5 @@ dependencies {
     testImplementation(deps.test.mockk)
     testImplementation(deps.test.coroutine)
     testImplementation(deps.test.truth)
-    testImplementation(projects.common.test)
+    testImplementation(projects.test.core)
 }
\ No newline at end of file
diff --git a/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/ChangeCardFrozenStateUseCaseTest.kt b/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/ChangeCardFrozenStateUseCaseTest.kt
index fba4d82e50..87d91a7123 100644
--- a/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/ChangeCardFrozenStateUseCaseTest.kt
+++ b/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/ChangeCardFrozenStateUseCaseTest.kt
@@ -3,7 +3,7 @@ package com.tangem.domain.pay.usecase
 import arrow.core.left
 import arrow.core.right
 import com.google.common.truth.Truth.assertThat
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.domain.models.pay.TangemPayCardFrozenState
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.pay.model.OrderStatus
diff --git a/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/CloseTangemPayCardUseCaseTest.kt b/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/CloseTangemPayCardUseCaseTest.kt
index ebb9347195..22d2c58fe4 100644
--- a/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/CloseTangemPayCardUseCaseTest.kt
+++ b/domain/visa/src/test/kotlin/com/tangem/domain/pay/usecase/CloseTangemPayCardUseCaseTest.kt
@@ -3,7 +3,7 @@ package com.tangem.domain.pay.usecase
 import arrow.core.left
 import arrow.core.right
 import com.google.common.truth.Truth.assertThat
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.pay.flow.PaymentAccountStatusFetcher
 import com.tangem.domain.pay.model.OrderStatus
diff --git a/domain/yield-supply/build.gradle.kts b/domain/yield-supply/build.gradle.kts
index a5e443e7c3..9a0616fb71 100644
--- a/domain/yield-supply/build.gradle.kts
+++ b/domain/yield-supply/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     implementation(deps.arrow.core)
 
     /** tests */
-    testImplementation(projects.common.test)
+    testImplementation(projects.test.core)
     testImplementation(deps.test.junit5)
     testRuntimeOnly(deps.test.junit5.engine)
     testImplementation(deps.test.coroutine)
diff --git a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyPendingTrackerTest.kt b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyPendingTrackerTest.kt
index 81fa8b8a84..8548fedfed 100644
--- a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyPendingTrackerTest.kt
+++ b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyPendingTrackerTest.kt
@@ -2,7 +2,7 @@ package com.tangem.domain.yield.supply.usecase
 
 import arrow.core.Either
 import com.google.common.truth.Truth.assertThat
-import com.tangem.common.test.TestAppCoroutineScope
+import com.tangem.test.core.TestAppCoroutineScope
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWalletId
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 38e75470f6..75cdb56597 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -170,6 +170,7 @@ lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", v
 lifecycle-viewModel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }
 lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "compose-lifecycle-runtime" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
+androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "androidx-datastore" }
 androidx-workmanager = { module = "androidx.work:work-runtime", version.ref = "androidxWorkManager" }
 hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt-work" }
 # region AndroidX
diff --git a/test/core/build.gradle.kts b/test/core/build.gradle.kts
index ad834bcedb..80f849d6e0 100644
--- a/test/core/build.gradle.kts
+++ b/test/core/build.gradle.kts
@@ -4,8 +4,10 @@ plugins {
 }
 
 dependencies {
+    implementation(projects.core.utils)
     implementation(deps.arrow.core)
 
+    api(deps.androidx.datastore.core)
     api(deps.test.coroutine)
     api(deps.test.junit5)
     api(deps.test.mockk)
diff --git a/common/test/src/main/java/com/tangem/common/test/TestAppCoroutineScope.kt b/test/core/src/main/java/com/tangem/test/core/TestAppCoroutineScope.kt
similarity index 92%
rename from common/test/src/main/java/com/tangem/common/test/TestAppCoroutineScope.kt
rename to test/core/src/main/java/com/tangem/test/core/TestAppCoroutineScope.kt
index 5baa3c239d..1b978333f5 100644
--- a/common/test/src/main/java/com/tangem/common/test/TestAppCoroutineScope.kt
+++ b/test/core/src/main/java/com/tangem/test/core/TestAppCoroutineScope.kt
@@ -1,4 +1,4 @@
-package com.tangem.common.test
+package com.tangem.test.core
 
 import com.tangem.utils.coroutines.AppCoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/common/test/src/main/java/com/tangem/common/test/datastore/MockStateDataStore.kt b/test/core/src/main/java/com/tangem/test/core/datastore/MockStateDataStore.kt
similarity index 91%
rename from common/test/src/main/java/com/tangem/common/test/datastore/MockStateDataStore.kt
rename to test/core/src/main/java/com/tangem/test/core/datastore/MockStateDataStore.kt
index 2fc75fe7f1..d747aa91c9 100644
--- a/common/test/src/main/java/com/tangem/common/test/datastore/MockStateDataStore.kt
+++ b/test/core/src/main/java/com/tangem/test/core/datastore/MockStateDataStore.kt
@@ -1,4 +1,4 @@
-package com.tangem.common.test.datastore
+package com.tangem.test.core.datastore
 
 import androidx.datastore.core.DataStore
 import kotlinx.coroutines.flow.Flow