diff --git a/quartz/src/androidDeviceTest/AndroidManifest.xml b/quartz/src/androidInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from quartz/src/androidDeviceTest/AndroidManifest.xml
rename to quartz/src/androidInstrumentedTest/AndroidManifest.xml
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt
diff --git a/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
similarity index 100%
rename from quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
rename to quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
diff --git a/quartz/src/androidDeviceTest/resources/bip39.vectors.json b/quartz/src/androidInstrumentedTest/resources/bip39.vectors.json
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/bip39.vectors.json
rename to quartz/src/androidInstrumentedTest/resources/bip39.vectors.json
diff --git a/quartz/src/androidDeviceTest/resources/github_amethyst.html b/quartz/src/androidInstrumentedTest/resources/github_amethyst.html
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/github_amethyst.html
rename to quartz/src/androidInstrumentedTest/resources/github_amethyst.html
diff --git a/quartz/src/androidDeviceTest/resources/nip44.vectors.json b/quartz/src/androidInstrumentedTest/resources/nip44.vectors.json
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/nip44.vectors.json
rename to quartz/src/androidInstrumentedTest/resources/nip44.vectors.json
diff --git a/quartz/src/androidDeviceTest/resources/nostr_vitor_short.json b/quartz/src/androidInstrumentedTest/resources/nostr_vitor_short.json
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/nostr_vitor_short.json
rename to quartz/src/androidInstrumentedTest/resources/nostr_vitor_short.json
diff --git a/quartz/src/androidDeviceTest/resources/nostr_vitor_startup_data.json b/quartz/src/androidInstrumentedTest/resources/nostr_vitor_startup_data.json
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/nostr_vitor_startup_data.json
rename to quartz/src/androidInstrumentedTest/resources/nostr_vitor_startup_data.json
diff --git a/quartz/src/androidDeviceTest/resources/ovxxk2vz.jpg b/quartz/src/androidInstrumentedTest/resources/ovxxk2vz.jpg
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/ovxxk2vz.jpg
rename to quartz/src/androidInstrumentedTest/resources/ovxxk2vz.jpg
diff --git a/quartz/src/androidDeviceTest/resources/relayDB.txt b/quartz/src/androidInstrumentedTest/resources/relayDB.txt
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/relayDB.txt
rename to quartz/src/androidInstrumentedTest/resources/relayDB.txt
diff --git a/quartz/src/androidDeviceTest/resources/trouble_video b/quartz/src/androidInstrumentedTest/resources/trouble_video
similarity index 100%
rename from quartz/src/androidDeviceTest/resources/trouble_video
rename to quartz/src/androidInstrumentedTest/resources/trouble_video
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/lightning/Lud06Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/lightning/Lud06Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/lightning/Lud06Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/lightning/Lud06Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/BloomFilterMurMur3Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/BloomFilterMurMur3Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/BloomFilterMurMur3Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/BloomFilterMurMur3Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/MurMur3Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/MurMur3Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/MurMur3Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/MurMur3Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/relayDB.txt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/relayDB.txt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/relayDB.txt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/hints/relayDB.txt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/EventDeserializerTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/EventDeserializerTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/EventDeserializerTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/EventDeserializerTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/InliningTagArrayPrettyPrinterTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/InliningTagArrayPrettyPrinterTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/InliningTagArrayPrettyPrinterTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/InliningTagArrayPrettyPrinterTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/RelayUrlFormatterTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/RelayUrlFormatterTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/RelayUrlFormatterTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/RelayUrlFormatterTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventDbQueryAssemblerTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventDbQueryAssemblerTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventDbQueryAssemblerTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventDbQueryAssemblerTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip05DnsIdentifiers/Nip05Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip05DnsIdentifiers/Nip05Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip05DnsIdentifiers/Nip05Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip05DnsIdentifiers/Nip05Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/Nip30Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/Nip30Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/Nip30Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/Nip30Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerRequestTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerRequestTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerRequestTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerRequestTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip51Lists/TagArrayExt.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip51Lists/TagArrayExt.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip51Lists/TagArrayExt.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip51Lists/TagArrayExt.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip65RelayList/RelayListRecommendationProcessorTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip65RelayList/RelayListRecommendationProcessorTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip65RelayList/RelayListRecommendationProcessorTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip65RelayList/RelayListRecommendationProcessorTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip96FileStorage/Nip96Test.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip96FileStorage/Nip96Test.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/nip96FileStorage/Nip96Test.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/nip96FileStorage/Nip96Test.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/RuntimeExt.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/RuntimeExt.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/RuntimeExt.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/RuntimeExt.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/SignerUtils.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/SignerUtils.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/SignerUtils.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/SignerUtils.kt
diff --git a/quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/StringUtilsTest.kt b/quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/StringUtilsTest.kt
similarity index 100%
rename from quartz/src/androidHostTest/kotlin/com/vitorpamplona/quartz/utils/StringUtilsTest.kt
rename to quartz/src/androidUnitTest/kotlin/com/vitorpamplona/quartz/utils/StringUtilsTest.kt