From d6ee1f7ff3cf62aef3718fcd397876db9e33bc6b Mon Sep 17 00:00:00 2001
From: Andhika Yuana <andhikayuana@gmail.com>
Date: Thu, 12 Dec 2024 15:46:46 +0700
Subject: [PATCH] Unit Test(s) Migration (#287)

* chore: [test] add BRConstantsTest for unitTest and deprecated ConstantsTests inside androidTest

* chore: [test] remove unused test files

* chore: [test] add todo to fill the tests and change package name

* chore: [test] add basic example

* chore: [test] integrate with ci/cd

* chore: [test][ci] fix Cannot find a definition for command named android/restore-gradle-cache

* chore: [test][ci] fix Cannot find a definition for command named android/run-tests

* chore: [test][ci] fix Unexpected argument(s): test-command

* chore: [test][ci] fix Cannot find a definition for executor named android/android-docker

* chore: [test][ci] add default for gradle.properties

* chore: [test][ci] avoid breaking in build.gradle

* chore: [test][ci] enable androidx and jetifier

* chore: [test][ci] init submodule

* chore: [test][ci] just using run command for execute unit test step

* chore: [test][ci] add env for google-services.json

* chore: [test][ci] add env for google-services.json

* chore: [test][ci] add env for google-services.json

* Major refactor of code to move classes to the ideal location

- Removed cruft
- Moved all tests to the unitTest directory
- Remove poorly placed tests into (AndroidTest)
- Commented  old code into the new Kotlin class(es)
- working in the first test of currency
- Removed the paymentRequest method
- Renamed Classes

* chore: resolve CurrencyTests

* Added notes

---------

Co-authored-by: Kerry Washington <mrkerrywashington@icloud.com>
---
 .circleci/config.yml                          |   46 +-
 .gitignore                                    |    1 +
 .idea/inspectionProfiles/Project_Default.xml  |    3 +
 app/build.gradle                              |    1 +
 .../java/com/litewallet/PaperKeyTests.java    |   81 --
 .../litewallet/analytics/ConstantsTests.java  |   79 --
 .../litewallet/database/DatabaseTests.java    |  160 ---
 .../com/litewallet/platform/KVStoreTests.java |  590 ---------
 .../litewallet/platform/PlatformTests.java    |   92 --
 .../activities/tests/MainActivityTest.java    |  132 --
 .../tests/CurrencyFormatterFixedTests.java    |  129 --
 .../tests/CurrencyFormatterTests.java         |  129 --
 .../litewallet/security/KeyStoreTests.java    |  322 -----
 .../litewallet/security/NewKeyStoreTests.java |  176 ---
 .../com/litewallet/wallet/WalletTests.java    |  115 --
 .../tools/sqlite/CurrencyDataSource.java      |    1 -
 .../com/litewallet/currency/CurrencyTests.kt  |  100 ++
 .../com/litewallet/example/ExampleTest.kt     |  125 ++
 .../tools/database/DatabaseTests.kt           |   85 ++
 .../database/TransactionDataSourceTest.kt     |    3 +
 .../tools/security/BRKeyStoreTest.kt          | 1059 +++++++++++++++++
 .../tools/security/NewKeyStoreTests.kt        |  190 +++
 .../tools/security/ReplicatedKVStoreTest.kt   |    4 +
 .../litewallet/tools/util/BRConstantsTest.kt  |  108 ++
 .../litewallet/tools/util/Bip39ReaderTest.kt  |    4 +
 .../tools/util/LocaleHelperTest.kt            |   13 +-
 .../litewallet/tools/util/SeedWordTests.kt    |   89 ++
 27 files changed, 1820 insertions(+), 2017 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/litewallet/PaperKeyTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/database/DatabaseTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/platform/KVStoreTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/platform/PlatformTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/presenter/activities/tests/MainActivityTest.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterFixedTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/security/KeyStoreTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/security/NewKeyStoreTests.java
 delete mode 100644 app/src/androidTest/java/com/litewallet/wallet/WalletTests.java
 create mode 100644 app/src/test/java/com/litewallet/currency/CurrencyTests.kt
 create mode 100644 app/src/test/java/com/litewallet/example/ExampleTest.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/database/DatabaseTests.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/database/TransactionDataSourceTest.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/security/BRKeyStoreTest.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/security/NewKeyStoreTests.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/security/ReplicatedKVStoreTest.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/util/BRConstantsTest.kt
 create mode 100644 app/src/test/java/com/litewallet/tools/util/Bip39ReaderTest.kt
 rename app/src/test/java/com/{breadwallet => litewallet}/tools/util/LocaleHelperTest.kt (83%)
 create mode 100644 app/src/test/java/com/litewallet/tools/util/SeedWordTests.kt

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6554e1f4e..4685ef3ef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,25 +2,51 @@
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
+orbs:
+  android: circleci/android@3.0.2
+
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  say-hello:
-    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    docker:
-      - image: cimg/base:stable
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+  unit-test:
+    executor:
+      name: android/android_machine
+      resource_class: large
+      tag: default
     steps:
       - checkout
       - run:
           name: "Say hello"
-          command: "echo Hello, World!"
+          command: "echo Hello, World! && ls"
+      - run:
+          name: "Default for gradle.properties"
+          command: "echo \"RELEASE_STORE_FILE=/\nRELEASE_STORE_PASSWORD=\nRELEASE_KEY_ALIAS=\nRELEASE_KEY_PASSWORD=\nandroid.useAndroidX=true\nandroid.enableJetifier=true\" >> gradle.properties && ls && cat gradle.properties"
+      - run:
+          name: "Initialize submodule"
+          command: "git submodule init && git submodule update --init --recursive"
+      - run:
+          name: "Copy google-services.json"
+          command: echo "$GOOGLE_SERVICES_JSON" | base64 --decode > app/google-services.json
+      - android/restore_gradle_cache
+      - run:
+          name: "Execute Unit Test"
+          command: ./gradlew testLitewalletDebugUnitTest
+      - android/save_gradle_cache
+      - run:
+          name: Save test results
+          command: |
+            mkdir -p ~/test-results/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/test-results
+      - store_artifacts:
+          path: ~/test-results/junit
+
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
-  say-hello-workflow:
+  test-and-build:
     jobs:
-      - say-hello
+      - unit-test
diff --git a/.gitignore b/.gitignore
index 87c9c4c0e..4a1b1f202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@ app/src/litewalletDebug/google-services.json
 /.idea/dictionaries/grunt.xml
 androidTestResultsUserPreferences.xml
 .idea/deploymentTargetSelector.xml
+.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ecd817f69..f7d4c3d75 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="IllegalIdentifier" enabled="true" level="ERROR" enabled_by_default="true">
+      <scope name="Tests" level="ERROR" enabled="false" />
+    </inspection_tool>
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
diff --git a/app/build.gradle b/app/build.gradle
index 3ffb7be47..44b1dc6d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -277,6 +277,7 @@ dependencies {
     implementation 'org.json:json:20231013'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.test.ext:junit-ktx:1.2.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1')
diff --git a/app/src/androidTest/java/com/litewallet/PaperKeyTests.java b/app/src/androidTest/java/com/litewallet/PaperKeyTests.java
deleted file mode 100644
index 184779db9..000000000
--- a/app/src/androidTest/java/com/litewallet/PaperKeyTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.litewallet;
-
-import android.util.Log;
-
-import com.breadwallet.tools.util.Bip39Reader;
-import com.breadwallet.wallet.BRWalletManager;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-
-public class PaperKeyTests {
-    private static final String TAG = PaperKeyTests.class.getName();
-    public static final List<String> PAPER_KEY_ENG =  Arrays.asList("stick","sword","keen","afraid","smile","sting","huge","relax","nominee","arena","area","gift");
-
-    @Test
-    public void testWordsValid() {
-        List<String> wordList = getAllWords();
-        Assert.assertEquals(wordList.size(), 2048);
-        Assert.assertSame(PAPER_KEY_ENG.containsAll(wordList),true);
-    }
-    @Test
-    public void testPaperKeyValidation() {
-        List<String> list = getAllWords();
-        assertThat(list.size(), is(2048));
-    }
-
-    private List<String> getAllWords() {
-        List<String> result = new ArrayList<>();
-        List<String> names = new ArrayList<>();
-        names.add("en-BIP39Words.txt");
-
-        for (String fileName : names) {
-            InputStream in = null;
-            try {
-                in = getClass().getResourceAsStream(fileName);
-                String str = IOUtils.toString(in);
-                String lines[] = str.split("\\r?\\n");
-                result.addAll(Arrays.asList(lines));
-            } catch (IOException e) {
-                Log.e(TAG, "getAllWords: " + fileName + ", ", e);
-            } finally {
-                if (in != null) try {
-                    in.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        List<String> cleanList = new ArrayList<>();
-        for (String s : result) {
-            String cleanWord = Bip39Reader.cleanWord(s);
-            cleanList.add(cleanWord);
-        }
-        assertThat(cleanList.size(), is(2048));
-        return cleanList;
-    }
-
-    private boolean isValid(String phrase, List<String> words) {
-
-        return BRWalletManager.getInstance().validateRecoveryPhrase((String[]) words.toArray(), phrase);
-    }
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java b/app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java
deleted file mode 100644
index befde8c11..000000000
--- a/app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.litewallet.analytics;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import android.util.Log;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-
-import com.breadwallet.presenter.activities.intro.IntroActivity;
-import com.breadwallet.tools.util.BRConstants;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.net.URI;
-
-@RunWith(AndroidJUnit4.class)
-public class ConstantsTests {
-    public static final String TAG = ConstantsTests.class.getName();
-   @Rule
-   public ActivityScenarioRule<IntroActivity> mActivityRule = new ActivityScenarioRule<>(IntroActivity.class);
-    @Before
-    public void setUp() {
-        Log.e(TAG, "setUp: ");
-    }
-
-    @After
-    public void tearDown() {
-    }
-    @Test
-    public void testLitecoinSymbolConstants() {
-        Assert.assertSame(BRConstants.litecoinLowercase,"ł");
-        Assert.assertSame(BRConstants.litecoinUppercase,"Ł");
-    }
-    @Test
-    public void testAppExternalURLConstants() {
-        Assert.assertSame(BRConstants.TWITTER_LINK,"https://twitter.com/Litewallet_App");
-        Assert.assertSame(BRConstants.INSTAGRAM_LINK,"https://www.instagram.com/litewallet.app");
-        Assert.assertSame(BRConstants.WEB_LINK,"https://litewallet.io");
-        Assert.assertSame(BRConstants.TOS_LINK,"https://litewallet.io/privacy");
-        Assert.assertSame(BRConstants.CUSTOMER_SUPPORT_LINK,"https://support.litewallet.io/hc/en-us/requests/new");
-        Assert.assertSame(BRConstants.BITREFILL_AFFILIATE_LINK,"https://www.bitrefill.com/");
-    }
-    @Test
-    public void testFirebaseAnalyticsConstants() {
-        Assert.assertSame(BRConstants._20191105_AL,"app_launched");
-        Assert.assertSame(BRConstants._20191105_VSC,"visit_send_controller");
-        Assert.assertSame(BRConstants._20202116_VRC,"visit_receive_controller");
-        Assert.assertSame(BRConstants._20191105_DSL,"did_send_ltc");
-        Assert.assertSame(BRConstants._20191105_DTBT,"did_tap_buy_tab");
-        Assert.assertSame(BRConstants._20200111_RNI,"rate_not_initialized");
-        Assert.assertSame(BRConstants._20200111_FNI,"feeperkb_not_initialized");
-        Assert.assertSame(BRConstants._20200111_TNI,"transaction_not_initialized");
-        Assert.assertSame(BRConstants._20200111_WNI,"wallet_not_initialized");
-        Assert.assertSame(BRConstants._20200111_PNI,"phrase_not_initialized");
-        Assert.assertSame(BRConstants._20200111_UTST,"unable_to_sign_transaction");
-        Assert.assertSame(BRConstants._20200112_ERR,"error");
-        Assert.assertSame(BRConstants._20200112_DSR,"did_start_resync");
-        Assert.assertSame(BRConstants._20200125_DSRR,"did_show_review_request");
-        Assert.assertSame(BRConstants._20201118_DTGS,"did_tap_get_support");
-        Assert.assertSame(BRConstants._20200217_DUWP,"did_unlock_with_pin");
-        Assert.assertSame(BRConstants._20200217_DUWB,"did_unlock_with_biometrics");
-        Assert.assertSame(BRConstants._20200301_DUDFPK,"did_use_default_fee_per_kb");
-        Assert.assertSame(BRConstants._20201121_SIL,"started_IFPS_lookup");
-        Assert.assertSame(BRConstants._20201121_DRIA,"did_resolve_IPFS_address");
-        Assert.assertSame(BRConstants._20201121_FRIA,"failed_resolve_IPFS_address");
-        Assert.assertSame(BRConstants._20200207_DTHB,"did_tap_header_balance");
-        Assert.assertSame(BRConstants._20210427_HCIEEH,"heartbeat_check_if_event_even_happens");
-        Assert.assertSame(BRConstants._20220822_UTOU,"user_tapped_on_ud");
-        Assert.assertSame(BRConstants._20230131_NENR,"no_error_nominal_response");
-        Assert.assertSame(BRConstants._20230407_DCS,"did_complete_sync");
-        Assert.assertSame(BRConstants._20240123_RAGI,"registered_android_general_interest");
-        Assert.assertSame(BRConstants._20231225_UAP,"user_accepted_push");
-        Assert.assertSame(BRConstants._20240101_US,"user_signup");
-        Assert.assertSame(BRConstants._20241006_DRR,"did_request_rating");
-        Assert.assertSame(BRConstants._20241006_UCR,"user_completed_rating");
-    }
-}
diff --git a/app/src/androidTest/java/com/litewallet/database/DatabaseTests.java b/app/src/androidTest/java/com/litewallet/database/DatabaseTests.java
deleted file mode 100644
index bee21429d..000000000
--- a/app/src/androidTest/java/com/litewallet/database/DatabaseTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.litewallet.database;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import android.util.Log;
-
-import com.breadwallet.presenter.activities.intro.IntroActivity;
-import com.breadwallet.presenter.entities.BRMerkleBlockEntity;
-import com.breadwallet.presenter.entities.BRPeerEntity;
-import com.breadwallet.presenter.entities.BRTransactionEntity;
-import com.breadwallet.presenter.entities.BlockEntity;
-import com.breadwallet.presenter.entities.CurrencyEntity;
-import com.breadwallet.presenter.entities.PeerEntity;
-import com.breadwallet.tools.sqlite.CurrencyDataSource;
-import com.breadwallet.tools.sqlite.MerkleBlockDataSource;
-import com.breadwallet.tools.sqlite.PeerDataSource;
-import com.breadwallet.tools.sqlite.TransactionDataSource;
-import com.breadwallet.tools.threads.BRExecutor;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-
-public class DatabaseTests {
-    public static final String TAG = DatabaseTests.class.getName();
-    final CountDownLatch signal = new CountDownLatch(1000);
-
-    @Rule
-    public ActivityTestRule<IntroActivity> mActivityRule = new ActivityTestRule<>(IntroActivity.class);
-
-    @Before
-    public void setUp() {
-        Log.e(TAG, "setUp: ");
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    @Test
-    public void testSetLocal() {
-        TransactionDataSource tds = TransactionDataSource.getInstance(mActivityRule.getActivity());
-        tds.putTransaction(new BRTransactionEntity(new byte[0], 1234, 4314123, "some hash"));
-        List<BRTransactionEntity> txs = tds.getAllTransactions();
-        Assert.assertNotNull(txs);
-        Assert.assertEquals(txs.size(), 1);
-        Assert.assertArrayEquals(txs.get(0).getBuff(), new byte[0]);
-        Assert.assertEquals(txs.get(0).getBlockheight(), 1234);
-        Assert.assertEquals(txs.get(0).getTimestamp(), 4314123);
-        Assert.assertEquals(txs.get(0).getTxHash(), "some hash");
-
-        MerkleBlockDataSource mds = MerkleBlockDataSource.getInstance(mActivityRule.getActivity());
-        mds.putMerkleBlocks(new BlockEntity[]{new BlockEntity("SOme cool stuff".getBytes(), 123343)});
-        List<BRMerkleBlockEntity> ms = mds.getAllMerkleBlocks();
-        Assert.assertNotNull(ms);
-        Assert.assertEquals(ms.size(), 1);
-        Assert.assertArrayEquals(ms.get(0).getBuff(), "SOme cool stuff".getBytes());
-        Assert.assertEquals(ms.get(0).getBlockHeight(), 123343);
-
-        PeerDataSource pds = PeerDataSource.getInstance(mActivityRule.getActivity());
-        pds.putPeers(new PeerEntity[]{new PeerEntity("someAddress".getBytes(), "somePort".getBytes(), "someTimestamp".getBytes())});
-        List<BRPeerEntity> ps = pds.getAllPeers();
-        Assert.assertNotNull(ps);
-        Assert.assertEquals(ps.size(), 1);
-        Assert.assertArrayEquals(ps.get(0).getAddress(), "someAddress".getBytes());
-        Assert.assertArrayEquals(ps.get(0).getPort(), "somePort".getBytes());
-        Assert.assertArrayEquals(ps.get(0).getTimeStamp(), "someTimestamp".getBytes());
-
-        CurrencyDataSource cds = CurrencyDataSource.getInstance(mActivityRule.getActivity());
-        List<CurrencyEntity> toInsert = new ArrayList<>();
-        CurrencyEntity ent = new CurrencyEntity();
-        ent.code = "OMG";
-        ent.name = "OmiseGo";
-        ent.rate = 8.43f;
-        toInsert.add(ent);
-        cds.putCurrencies(toInsert);
-        List<CurrencyEntity> cs = cds.getAllCurrencies();
-        Assert.assertNotNull(cs);
-        Assert.assertEquals(cs.size(), 1);
-        Assert.assertEquals(cs.get(0).name, "OmiseGo");
-        Assert.assertEquals(cs.get(0).code, "OMG");
-        Assert.assertEquals(cs.get(0).rate, 8.43f, 0);
-
-    }
-
-    private synchronized void done() {
-        signal.countDown();
-    }
-
-    @Test
-    public void testAsynchronousInserts() {
-        for (int i = 0; i < 1000; i++) {
-            final int finalI = i;
-            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
-                @Override
-                public void run() {
-                    TransactionDataSource tds = TransactionDataSource.getInstance(mActivityRule.getActivity());
-                    tds.putTransaction(new BRTransactionEntity(String.valueOf(finalI).getBytes(), finalI, finalI, String.valueOf(finalI)));
-                    done();
-                }
-            });
-        }
-        try {
-            signal.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        Log.e(TAG, "testAsynchronousInserts: Done waiting!");
-        TransactionDataSource tds = TransactionDataSource.getInstance(mActivityRule.getActivity());
-        List<BRTransactionEntity> txs = tds.getAllTransactions();
-        Assert.assertNotNull(txs);
-        Assert.assertEquals(txs.size(), 1000);
-
-
-//        MerkleBlockDataSource mds = MerkleBlockDataSource.getInstance(mActivityRule.getActivity());
-//        mds.putMerkleBlocks(new BlockEntity[]{new BlockEntity("SOme cool stuff".getBytes(), 123343)});
-//        List<BRMerkleBlockEntity> ms = mds.getAllMerkleBlocks();
-//        Assert.assertNotNull(ms);
-//        Assert.assertEquals(ms.size(), 1);
-//        Assert.assertArrayEquals(ms.get(0).getBuff(), "SOme cool stuff".getBytes());
-//        Assert.assertEquals(ms.get(0).getBlockHeight(), 123343);
-//
-//        PeerDataSource pds = PeerDataSource.getInstance(mActivityRule.getActivity());
-//        pds.putPeers(new PeerEntity[]{new PeerEntity("someAddress".getBytes(), "somePort".getBytes(), "someTimestamp".getBytes())});
-//        List<BRPeerEntity> ps = pds.getAllPeers();
-//        Assert.assertNotNull(ps);
-//        Assert.assertEquals(ps.size(), 1);
-//        Assert.assertArrayEquals(ps.get(0).getAddress(), "someAddress".getBytes());
-//        Assert.assertArrayEquals(ps.get(0).getPort(), "somePort".getBytes());
-//        Assert.assertArrayEquals(ps.get(0).getTimeStamp(), "someTimestamp".getBytes());
-//
-//        CurrencyDataSource cds = CurrencyDataSource.getInstance(mActivityRule.getActivity());
-//        List<CurrencyEntity> toInsert = new ArrayList<>();
-//        CurrencyEntity ent = new CurrencyEntity();
-//        ent.code = "OMG";
-//        ent.name = "OmiseGo";
-//        ent.rate = 8.43f;
-//        toInsert.add(ent);
-//        cds.putCurrencies(toInsert);
-//        List<CurrencyEntity> cs = cds.getAllCurrencies();
-//        Assert.assertNotNull(cs);
-//        Assert.assertEquals(cs.size(), 1);
-//        Assert.assertEquals(cs.get(0).name, "OmiseGo");
-//        Assert.assertEquals(cs.get(0).code, "OMG");
-//        Assert.assertEquals(cs.get(0).rate, 8.43f, 0);
-
-    }
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/platform/KVStoreTests.java b/app/src/androidTest/java/com/litewallet/platform/KVStoreTests.java
deleted file mode 100644
index cbb193773..000000000
--- a/app/src/androidTest/java/com/litewallet/platform/KVStoreTests.java
+++ /dev/null
@@ -1,590 +0,0 @@
-package com.litewallet.platform;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.breadwallet.presenter.activities.intro.WriteDownActivity;
-import com.breadwallet.tools.threads.BRExecutor;
-import com.breadwallet.tools.util.BRConstants;
-import com.platform.entities.TxMetaData;
-import com.platform.interfaces.KVStoreAdaptor;
-import com.platform.kvstore.CompletionObject;
-import com.platform.kvstore.ReplicatedKVStore;
-import com.platform.sqlite.KVItem;
-import com.platform.sqlite.PlatformSqliteHelper;
-import com.platform.tools.KVStoreManager;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class KVStoreTests {
-    public static final String TAG = KVStoreTests.class.getName();
-
-    @ClassRule
-    public static ActivityTestRule<WriteDownActivity> mActivityRule = new ActivityTestRule<>(WriteDownActivity.class);
-    private static KVStoreAdaptor remote = new MockUpAdapter();
-    private static ReplicatedKVStore store;
-
-    public static class MockUpAdapter implements KVStoreAdaptor {
-        public Map<String, KVItem> remoteKVs = new HashMap<>();
-
-        @Override
-        public CompletionObject ver(String key) {
-            KVItem result = remoteKVs.get(key);
-            return result == null ? new CompletionObject(CompletionObject.RemoteKVStoreError.notFound) : new CompletionObject(result.version, result.time, result.deleted == 0 ? null : CompletionObject.RemoteKVStoreError.tombstone);
-        }
-
-        @Override
-        public CompletionObject put(String key, byte[] value, long version) {
-            KVItem result = remoteKVs.get(key);
-            if (result == null) {
-                if (version != 1)
-                    return new CompletionObject(CompletionObject.RemoteKVStoreError.notFound);
-                KVItem newObj = new KVItem(1, -1, key, value, System.currentTimeMillis(), 0);
-                remoteKVs.put(key, newObj);
-                return new CompletionObject(1, newObj.time, null);
-            }
-            if (version != result.version)
-                return new CompletionObject(CompletionObject.RemoteKVStoreError.conflict);
-            KVItem newObj = new KVItem(result.version + 1, -1, key, value, System.currentTimeMillis(), 0);
-            remoteKVs.put(newObj.key, newObj);
-            return new CompletionObject(newObj.version, newObj.time, null);
-        }
-
-        @Override
-        public CompletionObject del(String key, long version) {
-            KVItem result = remoteKVs.get(key);
-            if (result == null)
-                return new CompletionObject(CompletionObject.RemoteKVStoreError.notFound);
-            if (result.version != version)
-                return new CompletionObject(CompletionObject.RemoteKVStoreError.conflict);
-            KVItem newObj = new KVItem(result.version + 1, -1, result.key, result.value, result.time, 1);
-            remoteKVs.put(newObj.key, newObj);
-            return new CompletionObject(newObj.version, newObj.time, null);
-        }
-
-        @Override
-        public CompletionObject get(String key, long version) {
-            KVItem result = remoteKVs.get(key);
-            if (result == null)
-                return new CompletionObject(CompletionObject.RemoteKVStoreError.notFound);
-            if (version != result.version)
-                return new CompletionObject(0, System.currentTimeMillis(), CompletionObject.RemoteKVStoreError.conflict);
-            return new CompletionObject(result.version, result.time, result.value, result.deleted == 0 ? null : CompletionObject.RemoteKVStoreError.tombstone);
-        }
-
-        @Override
-        public CompletionObject keys() {
-            List<KVItem> result = new ArrayList<>();
-            for (KVItem kv : remoteKVs.values()) {
-                if (kv.deleted != 0) kv.err = CompletionObject.RemoteKVStoreError.tombstone;
-                result.add(kv);
-            }
-            return new CompletionObject(result);
-        }
-
-        public void putKv(KVItem kv) {
-            remoteKVs.put(kv.key, kv);
-        }
-
-    }
-
-    @Before
-    public void setUp() {
-        BRConstants.PLATFORM_ON = false;
-        ((MockUpAdapter) remote).remoteKVs.clear();
-        ((MockUpAdapter) remote).putKv(new KVItem(1, 1, "hello", ReplicatedKVStore.encrypt("hello".getBytes(), mActivityRule.getActivity()), System.currentTimeMillis(), 0));
-        ((MockUpAdapter) remote).putKv(new KVItem(1, 1, "removed", ReplicatedKVStore.encrypt("removed".getBytes(), mActivityRule.getActivity()), System.currentTimeMillis(), 1));
-        for (int i = 0; i < 20; i++) {
-            ((MockUpAdapter) remote).putKv(new KVItem(1, 1, "testkey" + i, ReplicatedKVStore.encrypt(("testkey" + i).getBytes(), mActivityRule.getActivity()), System.currentTimeMillis(), 0));
-        }
-
-        store = ReplicatedKVStore.getInstance(mActivityRule.getActivity(), remote);
-        store.deleteAllKVs();
-        Assert.assertEquals(22, ((MockUpAdapter) remote).remoteKVs.size());
-    }
-
-    @After
-    public void tearDown() {
-        store.deleteAllKVs();
-        mActivityRule.getActivity().deleteDatabase(PlatformSqliteHelper.DATABASE_NAME);
-        ((MockUpAdapter) remote).remoteKVs.clear();
-    }
-
-    public void assertDatabasesAreSynced() {
-        Map<String, byte[]> remoteKV = new LinkedHashMap<>();
-        List<KVItem> kvs = new ArrayList<>(((MockUpAdapter) remote).remoteKVs.values());
-        for (KVItem kv : kvs) {
-            if (kv.deleted == 0)
-                remoteKV.put(kv.key, kv.value);
-        }
-
-        List<KVItem> allLocalKeys = store.getRawKVs();
-        Map<String, byte[]> localKV = new LinkedHashMap<>();
-
-        for (KVItem kv : allLocalKeys) {
-            if (kv.deleted == 0) {
-                CompletionObject object = store.get(kv.key, kv.version);
-//                KVItem tmpKv = object.kv;
-
-                localKV.put(kv.key, object.kv.value);
-            }
-        }
-
-        Assert.assertEquals(remoteKV.size(), localKV.size());
-
-        Iterator it = remoteKV.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
-            byte[] val = ReplicatedKVStore.decrypt((byte[]) pair.getValue(), mActivityRule.getActivity());
-            byte[] valToAssert = localKV.get((String) pair.getKey());
-            String valStr = new String(val);
-            String valToAssertStr = new String(valToAssert);
-            Assert.assertArrayEquals(val, valToAssert);
-        }
-
-        it = localKV.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
-            byte[] val = (byte[]) pair.getValue();
-            byte[] valToAssert = ReplicatedKVStore.decrypt(remoteKV.get((String) pair.getKey()), mActivityRule.getActivity());
-            Assert.assertArrayEquals(val, valToAssert);
-        }
-
-    }
-
-
-    @Test
-    public void testSetLocal() {
-        CompletionObject obj = store.set(0, 1, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        Assert.assertNull(obj.err);
-        store.set(0, 1, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        store.set(new KVItem(0, 1, "Key2", "Key2".getBytes(), System.currentTimeMillis(), 2));
-        store.set(new KVItem[]{
-                new KVItem(0, 4, "Key3", "Key3".getBytes(), System.currentTimeMillis(), 2),
-                new KVItem(0, 2, "Key4", "Key4".getBytes(), System.currentTimeMillis(), 0)});
-        store.set(Arrays.asList(new KVItem[]{
-                new KVItem(0, 4, "Key5", "Key5".getBytes(), System.currentTimeMillis(), 1),
-                new KVItem(0, 5, "Key6", "Key6".getBytes(), System.currentTimeMillis(), 5)}));
-        Assert.assertEquals(6, store.getRawKVs().size());
-    }
-
-    @Test
-    public void testDeleteAll() {
-        CompletionObject obj = store.set(0, 1, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        store.set(0, 1, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        store.set(new KVItem(0, 1, "Key2", "Key2".getBytes(), System.currentTimeMillis(), 2));
-        store.set(new KVItem[]{
-                new KVItem(0, 4, "Key3", "Key3".getBytes(), System.currentTimeMillis(), 2),
-                new KVItem(0, 2, "Key4", "Key4".getBytes(), System.currentTimeMillis(), 0)});
-        store.set(Arrays.asList(new KVItem[]{
-                new KVItem(0, 4, "Key5", "Key5".getBytes(), System.currentTimeMillis(), 1),
-                new KVItem(0, 5, "Key6", "Key6".getBytes(), System.currentTimeMillis(), 5)}));
-        List<KVItem> kvs = store.getRawKVs();
-        Assert.assertEquals(6, kvs.size());
-        store.deleteAllKVs();
-        kvs = store.getRawKVs();
-        Assert.assertEquals(0, kvs.size());
-
-    }
-
-    @Test
-    public void testSetLocalIncrementsVersion() {
-        store.deleteAllKVs();
-        CompletionObject obj = store.set(0, 0, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        Assert.assertNull(obj.err);
-        List<KVItem> test = store.getRawKVs();
-        Assert.assertEquals(1, test.size());
-        Assert.assertEquals(1, store.localVersion("Key1").version);
-    }
-
-    @Test
-    public void testMultithreadedInserts() {
-        final AtomicInteger count = new AtomicInteger();
-        for (int i = 0; i < 1000; i++) {
-            final int finalI = i;
-            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
-                @Override
-                public void run() {
-                    CompletionObject obj = store.set(0, 0, "Key" + finalI, "Key1".getBytes(), System.currentTimeMillis(), 0);
-                    Assert.assertNull(obj.err);
-                    Assert.assertEquals(obj.version, 1);
-                    count.incrementAndGet();
-                    CompletionObject remObj = store.delete("Key" + finalI, store.localVersion("Key" + finalI).version);
-                    Assert.assertNull(remObj.err);
-                    count.decrementAndGet();
-                }
-            });
-        }
-        try {
-            Thread.sleep(10000);
-            Assert.assertEquals(count.get(), 0);
-            List<KVItem> items = store.getRawKVs();
-            Assert.assertEquals(items.size(), 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Test
-    public void testSetThenGet() {
-        byte[] value = "hello".getBytes();
-        CompletionObject setObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        Assert.assertNull(setObj.err);
-        long v1 = setObj.version;
-        long t1 = setObj.time;
-        CompletionObject obj = store.get("hello", 0);
-        KVItem kvNoVersion = obj.kv;
-        obj = store.get("hello", 1);
-        KVItem kvWithVersion = obj.kv;
-        Assert.assertArrayEquals(value, kvNoVersion.value);
-        Assert.assertEquals(v1, kvNoVersion.version);
-        Assert.assertEquals(t1, kvNoVersion.time, 0.001);
-
-        Assert.assertNotNull(kvWithVersion);
-        Assert.assertArrayEquals(value, kvWithVersion.value);
-        Assert.assertEquals(v1, kvWithVersion.version);
-        Assert.assertEquals(t1, kvWithVersion.time, 0.001);
-
-    }
-
-    @Test
-    public void testSetThenSetIncrementsVersion() {
-        byte[] value = "hello".getBytes();
-        byte[] value2 = "hello2".getBytes();
-        CompletionObject setObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        CompletionObject setObj2 = store.set(setObj.version, 0, "hello", value2, System.currentTimeMillis(), 0);
-        Assert.assertEquals(setObj2.version, setObj.version + 1);
-    }
-
-    @Test
-    public void testSetThenDel() {
-        byte[] value = "hello".getBytes();
-        CompletionObject setObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        CompletionObject delObj = store.delete("hello", setObj.version);
-        Assert.assertNull(setObj.err);
-        Assert.assertNull(delObj.err);
-
-        Assert.assertEquals(delObj.version, setObj.version + 1);
-    }
-
-    @Test
-    public void testSetThenDelThenGet() {
-        byte[] value = "hello".getBytes();
-        CompletionObject setObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        CompletionObject delObj = store.delete("hello", setObj.version);
-        Assert.assertNull(setObj.err);
-        Assert.assertNull(delObj.err);
-
-        CompletionObject object = store.get("hello", 0);
-        KVItem getKv = object.kv;
-
-        Assert.assertEquals(delObj.version, setObj.version + 1);
-        Assert.assertEquals(getKv.version, setObj.version + 1);
-    }
-
-    @Test
-    public void testSetWithIncorrectFirstVersionFails() {
-        byte[] value = "hello".getBytes();
-        CompletionObject setObj = store.set(1, 0, "hello", value, System.currentTimeMillis(), 0);
-        Assert.assertNotNull(setObj.err);
-    }
-
-    @Test
-    public void testSetWithStaleVersionFails() {
-        byte[] value = "hello".getBytes();
-        CompletionObject setObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        CompletionObject setStaleObj = store.set(0, 0, "hello", value, System.currentTimeMillis(), 0);
-        Assert.assertNull(setObj.err);
-        Assert.assertEquals(CompletionObject.RemoteKVStoreError.conflict, setStaleObj.err);
-    }
-
-    @Test
-    public void testGetNonExistentKeyFails() {
-        CompletionObject object = store.get("hello", 0);
-        KVItem getKv = object.kv;
-        Assert.assertNull(getKv);
-    }
-
-    @Test
-    public void testGetNonExistentKeyVersionFails() {
-        CompletionObject object = store.get("hello", 1);
-        KVItem getKv = object.kv;
-
-        Assert.assertNull(getKv);
-    }
-
-    @Test
-    public void testGetAllKeys() {
-        byte[] value = "hello".getBytes();
-        long time = System.currentTimeMillis();
-        CompletionObject setObj = store.set(0, 0, "hello", value, time, 0);
-        List<KVItem> list = store.getRawKVs();
-
-        Assert.assertNotNull(list);
-        Assert.assertEquals(1, list.size());
-        Assert.assertEquals("hello", list.get(0).key);
-        Assert.assertEquals(setObj.version, list.get(0).version);
-        Assert.assertEquals(setObj.time, list.get(0).time, 0.001);
-        Assert.assertEquals(0, list.get(0).remoteVersion);
-        Assert.assertEquals(0, list.get(0).deleted);
-    }
-
-    @Test
-    public void testSetRemoteVersion() {
-        byte[] value = "hello".getBytes();
-        long time = System.currentTimeMillis();
-        CompletionObject setObj = store.set(0, 0, "hello", value, time, 0);
-        CompletionObject setRemoteVersionObj = store.setRemoteVersion("hello", setObj.version, 1);
-        Assert.assertEquals(setRemoteVersionObj.version, setObj.version + 1);
-        long remoteVer = store.remoteVersion("hello");
-        Assert.assertEquals(1, remoteVer);
-
-    }
-
-    @Test
-    public void testBasicSyncGetAllObjects() {
-        boolean success = store.syncAllKeys();
-        Assert.assertEquals(true, success);
-
-        List<KVItem> localKeys = store.getRawKVs();
-        Assert.assertEquals(((MockUpAdapter) remote).remoteKVs.size() - 1, localKeys.size());
-        assertDatabasesAreSynced();
-    }
-
-    @Test
-    public void testSyncTenTimes() {
-        int n = 10;
-        while (n > 0) {
-            boolean success = store.syncAllKeys();
-            Assert.assertTrue(success);
-            n--;
-        }
-        assertDatabasesAreSynced();
-    }
-
-    @Test
-    public void testSyncAddsLocalKeysToRemote() {
-        CompletionObject setObj = store.set(new KVItem(0, -1, "derp", "derp".getBytes(), System.currentTimeMillis(), 0));
-        Assert.assertNull(setObj.err);
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        CompletionObject obj = remote.get("derp", 1);
-        Assert.assertArrayEquals(ReplicatedKVStore.decrypt(obj.value, mActivityRule.getActivity()), "derp".getBytes());
-    }
-
-    @Test
-    public void testSyncSavesRemoteVersion() {
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        long ver = store.remoteVersion("hello");
-        Assert.assertEquals(((MockUpAdapter) remote).remoteKVs.get("hello").version, 1);
-        Assert.assertEquals(((MockUpAdapter) remote).remoteKVs.get("hello").version, ver);
-        assertDatabasesAreSynced();
-    }
-
-    @Test
-    public void testSyncPreventsAnotherConcurrentSync() {
-//        boolean success = store.syncAllKeys();
-//        new Thread(new Runnable() {
-//            @Override
-//            public void run() {
-//                boolean success = store.syncAllKeys();
-//                Assert.assertTrue(success);
-//                Assert.assertFalse(success);
-//            }
-//        }).start();
-//        Assert.assertTrue(success);
-    }
-
-    @Test
-    public void testLocalDeleteReplicates() {
-        CompletionObject setObj = store.set(new KVItem(0, 0, "goodbye_cruel_world", "goodbye_cruel_world".getBytes(), System.currentTimeMillis(), 0));
-        Assert.assertNull(setObj.err);
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        CompletionObject delObj = store.delete("goodbye_cruel_world", store.localVersion("goodbye_cruel_world").version);
-        Assert.assertNull(delObj.err);
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        KVItem kv = ((MockUpAdapter) remote).remoteKVs.get("goodbye_cruel_world");
-        Assert.assertTrue(kv.deleted > 0);
-
-    }
-
-    @Test
-    public void testLocalUpdateReplicates() {
-        CompletionObject setObj = store.set(new KVItem(0, -1, "goodbye_cruel_world", "goodbye_cruel_world".getBytes(), System.currentTimeMillis(), 0));
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        setObj = store.set(new KVItem(store.localVersion("goodbye_cruel_world").version, -1, "goodbye_cruel_world", "goodbye_cruel_world with some new info".getBytes(), System.currentTimeMillis(), 0));
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        Assert.assertArrayEquals("goodbye_cruel_world with some new info".getBytes(), ReplicatedKVStore.decrypt(remote.get("goodbye_cruel_world", store.remoteVersion("goodbye_cruel_world")).value, mActivityRule.getActivity()));
-
-    }
-
-    @Test
-    public void testRemoteDeleteReplicates() {
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        KVItem kv = ((MockUpAdapter) remote).remoteKVs.get("hello");
-        ((MockUpAdapter) remote).remoteKVs.put("hello", new KVItem(kv.version + 1, -1, kv.key, kv.value, System.currentTimeMillis(), 1));
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-        CompletionObject getObj = store.get("hello", 0);
-        Assert.assertNull(getObj.err);
-        Assert.assertTrue(getObj.kv.deleted > 0);
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-
-    }
-
-    @Test
-    public void testRemoteUpdateReplicates() {
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-
-        KVItem kv = ((MockUpAdapter) remote).remoteKVs.get("hello");
-        ((MockUpAdapter) remote).remoteKVs.put("hello", new KVItem(kv.version + 1, -1, kv.key, ReplicatedKVStore.encrypt("newVal".getBytes(), mActivityRule.getActivity()), System.currentTimeMillis(), 0));
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-
-        CompletionObject getObj = store.get("hello", 0);
-        Assert.assertNull(getObj.err);
-        Assert.assertArrayEquals(getObj.kv.value, "newVal".getBytes());
-        success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        assertDatabasesAreSynced();
-
-    }
-
-    @Test
-    public void testEnableEncryptedReplication() {
-        ((MockUpAdapter) remote).remoteKVs.clear();
-        CompletionObject setObj = store.set(new KVItem(0, 0, "derp", "derp".getBytes(), System.currentTimeMillis(), 0));
-        Assert.assertNull(setObj.err);
-        boolean success = store.syncAllKeys();
-        Assert.assertTrue(success);
-        CompletionObject obj = remote.get("derp", 1);
-        Assert.assertArrayEquals(ReplicatedKVStore.decrypt(obj.value, mActivityRule.getActivity()), "derp".getBytes());
-
-    }
-    @Test
-    public void testGetAllMds() {
-        store.set(0, 1, "Key1", "Key1".getBytes(), System.currentTimeMillis(), 0);
-        store.set(new KVItem(0, 1, "Key2", "Key2".getBytes(), System.currentTimeMillis(), 2));
-        store.set(new KVItem[]{
-                new KVItem(0, 4, "fdf-gsd34534", "second".getBytes(), System.currentTimeMillis(), 2),
-                new KVItem(0, 2, "fsdtxn2-fdslkjf34", "ignore".getBytes(), System.currentTimeMillis(), 0)});
-        store.set(Arrays.asList(new KVItem[]{
-                new KVItem(0, 4, "Key5", "Key5".getBytes(), System.currentTimeMillis(), 1),
-                new KVItem(0, 5, "Key6", "Key6".getBytes(), System.currentTimeMillis(), 5)}));
-        List<KVItem> kvs = store.getRawKVs();
-        Assert.assertEquals(kvs.size(), 6);
-
-        TxMetaData tx = new TxMetaData();
-        byte[] theHash = new byte[]{3, 5, 64, 2, 4, 5, 63, 7, 0, 56, 34};
-        tx.blockHeight = 123;
-        tx.classVersion = 3;
-        tx.comment = "hehey !";
-        tx.creationTime = 21324;
-        tx.deviceId = "someDevice2324";
-        tx.fee = 234;
-        tx.txSize = 23423;
-        tx.exchangeCurrency = "curr";
-        tx.exchangeRate = 23.4343;
-        KVStoreManager.getInstance().putTxMetaData(mActivityRule.getActivity(), tx, theHash);
-        List<KVItem> items = store.getRawKVs();
-        Assert.assertEquals(7, items.size());
-
-        Map<String, TxMetaData> mds = KVStoreManager.getInstance().getAllTxMD(mActivityRule.getActivity());
-        Assert.assertEquals(mds.size(), 1);
-
-//        Assert.assertEquals(mds.(0).blockHeight, 123);
-//        Assert.assertEquals(mds.get(0).classVersion, 3);
-//        Assert.assertEquals(mds.get(0).comment, "hehey !");
-//        Assert.assertEquals(mds.get(0).creationTime, 21324);
-//        Assert.assertEquals(mds.get(0).deviceId, "someDevice2324");
-//        Assert.assertEquals(mds.get(0).fee, 234);
-//        Assert.assertEquals(mds.get(0).txSize, 23423);
-//        Assert.assertEquals(mds.get(0).exchangeCurrency, "curr");
-//        Assert.assertEquals(mds.get(0).exchangeRate, 23.4343, 0);
-
-    }
-
-    @Test
-    public void testEncryptDecrypt() {
-        String data = "Ladies and Gentlemen of the class of '99: If I could offer you only one tip for the future, " +
-                "sunscreen would be it.";
-        byte[] encryptedData = ReplicatedKVStore.encrypt(data.getBytes(), mActivityRule.getActivity());
-
-        Assert.assertTrue(encryptedData != null && encryptedData.length > 0);
-
-        byte[] decryptedData = ReplicatedKVStore.decrypt(encryptedData, mActivityRule.getActivity());
-
-        Assert.assertNotEquals(encryptedData, decryptedData);
-
-        Assert.assertArrayEquals(decryptedData, data.getBytes());
-        Assert.assertEquals(new String(decryptedData), data);
-
-    }
-
-    @Test
-    public void testKVManager() {
-        TxMetaData tx = new TxMetaData();
-        byte[] theHash = new byte[]{3, 5, 64, 2, 4, 5, 63, 7, 0, 56, 34};
-        tx.blockHeight = 123;
-        tx.classVersion = 3;
-        tx.comment = "hehey !";
-        tx.creationTime = 21324;
-        tx.deviceId = "someDevice2324";
-        tx.fee = 234;
-        tx.txSize = 23423;
-        tx.exchangeCurrency = "curr";
-        tx.exchangeRate = 23.4343;
-        KVStoreManager.getInstance().putTxMetaData(mActivityRule.getActivity(), tx, theHash);
-        List<KVItem> items = store.getRawKVs();
-        Assert.assertEquals(1, items.size());
-
-        TxMetaData newTx = KVStoreManager.getInstance().getTxMetaData(mActivityRule.getActivity(), theHash);
-        Assert.assertEquals(newTx.blockHeight, 123);
-        Assert.assertEquals(newTx.classVersion, 3);
-        Assert.assertEquals(newTx.comment, "hehey !");
-        Assert.assertEquals(newTx.creationTime, 21324);
-        Assert.assertEquals(newTx.deviceId, "someDevice2324");
-        Assert.assertEquals(newTx.fee, 234);
-        Assert.assertEquals(newTx.txSize, 23423);
-        Assert.assertEquals(newTx.exchangeCurrency, "curr");
-        Assert.assertEquals(newTx.exchangeRate, 23.4343, 0);
-
-    }
-    //((MockUpAdapter) remote).remoteKVs.size()
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/platform/PlatformTests.java b/app/src/androidTest/java/com/litewallet/platform/PlatformTests.java
deleted file mode 100644
index 901d5aeb0..000000000
--- a/app/src/androidTest/java/com/litewallet/platform/PlatformTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.litewallet.platform;
-
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import android.util.Log;
-
-import com.breadwallet.BreadApp;
-import com.breadwallet.presenter.activities.BreadActivity;
-import com.breadwallet.tools.util.BRCompressor;
-import com.breadwallet.tools.util.BRConstants;
-import com.platform.APIClient;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-
-@RunWith(AndroidJUnit4.class)
-public class PlatformTests {
-    public static final String TAG = PlatformTests.class.getName();
-    @Rule
-    public ActivityTestRule<BreadActivity> mActivityRule = new ActivityTestRule<>(
-            BreadActivity.class);
-
-    // proto is the transport protocol to use for talking to the API (either http or https)
-    private static final String PROTO = "https";
-    // host is the server(s) on which the API is hosted
-    // convenience getter for the API endpoint
-    private static final String BASE_URL = PROTO + "://" + BreadApp.HOST;
-    //feePerKb url
-    private static final String FEE_PER_KB_URL = "/v1/fee-per-kb";
-    //token
-    private static final String TOKEN = "/token";
-    //me
-    private static final String ME = "/me";
-
-    private static final String GET = "GET";
-    private static final String POST = "POST";
-
-    //loading the native library
-    static {
-        System.loadLibrary(BRConstants.NATIVE_LIB_NAME);
-    }
-
-    @Test
-    public void testFeePerKbFetch() {
-        long fee = APIClient.getInstance(mActivityRule.getActivity()).feePerKb();
-        System.out.println("testFeePerKbFetch: fee: " + fee);
-        Assert.assertNotSame(fee, (long) 0);
-
-    }
-
-    @Test
-    public void testGZIP() {
-        String data = "Ladies and Gentlemen of the class of '99: If I could offer you only one tip 11111111for the future, " +
-                "sunscreen would be it.";
-        Assert.assertFalse(BRCompressor.isGZIPStream(data.getBytes()));
-        byte[] compressedData = BRCompressor.gZipCompress(data.getBytes());
-        Assert.assertTrue(BRCompressor.isGZIPStream(compressedData));
-        Log.e(TAG, "testGZIP: " + new String(compressedData));
-        Assert.assertNotNull(compressedData);
-        Assert.assertTrue(compressedData.length > 0);
-        byte[] decompressedData = BRCompressor.gZipExtract(compressedData);
-        Assert.assertFalse(BRCompressor.isGZIPStream(decompressedData));
-        Assert.assertNotNull(decompressedData);
-        Assert.assertEquals(new String(decompressedData), data);
-        Assert.assertNotEquals(compressedData.length, decompressedData.length);
-    }
-
-    @Test
-    public void testBZip2() {
-        String data = "Ladies and Gentlemen of the class of '99: If I could offer you only one tip 11111111for the future, " +
-                "sunscreen would be it.";
-        byte[] compressedData = new byte[0];
-        try {
-            compressedData = BRCompressor.bz2Compress(data.getBytes());
-        } catch (IOException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-        Assert.assertNotNull(compressedData);
-        Assert.assertTrue(compressedData.length > 0);
-        byte[] decompressedData = BRCompressor.bz2Extract(compressedData);
-        Assert.assertNotNull(decompressedData);
-        Assert.assertEquals(new String(decompressedData), data);
-        Assert.assertNotEquals(compressedData.length, decompressedData.length);
-    }
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/presenter/activities/tests/MainActivityTest.java b/app/src/androidTest/java/com/litewallet/presenter/activities/tests/MainActivityTest.java
deleted file mode 100644
index 548679734..000000000
--- a/app/src/androidTest/java/com/litewallet/presenter/activities/tests/MainActivityTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//package com.breadwallet.presenter.activities.tests;
-//
-//import android.support.test.rule.ActivityTestRule;
-//import android.support.test.runner.AndroidJUnit4;
-//
-//import com.breadwallet.R;
-//import com.breadwallet.presenter.activities.MainActivity;
-//import com.breadwallet.tools.adapter.CurrencyListAdapter;
-//
-//import org.junit.Rule;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//
-//import java.util.Random;
-//
-//import static android.support.test.espresso.Espresso.onData;
-//import static android.support.test.espresso.Espresso.onView;
-//import static android.support.test.espresso.Espresso.pressBack;
-//import static android.support.test.espresso.action.ViewActions.clearText;
-//import static android.support.test.espresso.action.ViewActions.click;
-//import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-//import static android.support.test.espresso.action.ViewActions.swipeLeft;
-//import static android.support.test.espresso.action.ViewActions.swipeRight;
-//import static android.support.test.espresso.action.ViewActions.typeText;
-//import static android.support.test.espresso.matcher.ViewMatchers.withId;
-//import static org.hamcrest.Matchers.hasToString;
-//import static org.hamcrest.Matchers.startsWith;
-//
-///**
-// * BreadWallet
-// * <p/>
-// * Created by Mihail on 7/7/15.
-// * Copyright (c) 2015 Mihail Gutan <mihail@breadwallet.com>
-// * <p/>
-// * Permission is hereby granted, free of charge, to any person obtaining a copy
-// * of this software and associated documentation files (the "Software"), to deal
-// * in the Software without restriction, including without limitation the rights
-// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// * copies of the Software, and to permit persons to whom the Software is
-// * furnished to do so, subject to the following conditions:
-// * <p/>
-// * The above copyright notice and this permission notice shall be included in
-// * all copies or substantial portions of the Software.
-// * <p/>
-// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// * THE SOFTWARE.
-// */
-//
-//@RunWith(AndroidJUnit4.class)
-//public class MainActivityTest {
-//
-//    @Rule
-//    public ActivityTestRule<MainActivity> mActivityRule =
-//            new ActivityTestRule<>(MainActivity.class);
-//
-//    @Test
-//    public void testCurrencyList() {
-//        onView(withId(R.id.main_button_burger)).perform(click());
-//        onView(withId(R.id.settings)).perform(click());
-//        onView(withId(R.id.local_currency)).perform(click());
-//        if (!CurrencyListAdapter.currencyListAdapter.isEmpty()) {
-//            Random r = new Random();
-//
-//            //click on random list item;
-//            int rand;
-//            rand = r.nextInt(CurrencyListAdapter.currencyListAdapter.getCount());
-//            onData(hasToString(startsWith("")))
-//                    .inAdapterView(withId(R.id.currency_list_view)).atPosition(rand)
-//                    .perform(click());
-//            rand = r.nextInt(CurrencyListAdapter.currencyListAdapter.getCount());
-//            onData(hasToString(startsWith("")))
-//                    .inAdapterView(withId(R.id.currency_list_view)).atPosition(rand)
-//                    .perform(click());
-//            rand = r.nextInt(CurrencyListAdapter.currencyListAdapter.getCount());
-//            onData(hasToString(startsWith("")))
-//                    .inAdapterView(withId(R.id.currency_list_view)).atPosition(rand)
-//                    .perform(click());
-//            rand = r.nextInt(CurrencyListAdapter.currencyListAdapter.getCount());
-//            onData(hasToString(startsWith("")))
-//                    .inAdapterView(withId(R.id.currency_list_view)).atPosition(rand)
-//                    .perform(click());
-//            rand = r.nextInt(CurrencyListAdapter.currencyListAdapter.getCount());
-//            onData(hasToString(startsWith("")))
-//                    .inAdapterView(withId(R.id.currency_list_view)).atPosition(rand)
-//                    .perform(click());
-//        }
-//        pressBack();
-//        pressBack();
-//        pressBack();
-//
-//    }
-//
-////    @Test
-////    public void testFragments() {
-////        onView(withId(R.id.main_button_burger)).perform(click());
-////        try {
-////            Thread.sleep(1000);
-////        } catch (InterruptedException e) {
-////            e.printStackTrace();
-////        }
-////        onView(withId(R.id.settings)).perform(click());
-////        onView(withId(R.id.start_recovery_wallet)).perform(click());
-////        pressBack();
-////        pressBack();
-////        onView(withId(R.id.about)).perform(click());
-////        onView(withId(R.id.main_button_burger)).perform(click());
-////        onView(withId(R.id.main_button_burger)).perform(click());
-////        onView(withId(R.id.main_button_burger)).perform(click());
-////        onView(withId(R.id.main_layout)).perform(swipeLeft());
-////        onView(withId(R.id.theAddressLayout)).perform(click());
-////        onView(withId(R.id.copy_address)).perform(click());
-////        onView(withId(R.id.main_layout)).perform(swipeRight());
-////        try {
-////            Thread.sleep(500);
-////        } catch (InterruptedException e) {
-////            e.printStackTrace();
-////        }
-////    }
-////
-////
-////    @Test
-////    public void testChangeText_sameActivity() {
-////        onView(withId(R.id.address_edit_text))
-////                .perform(clearText(), typeText("some testing text"), closeSoftKeyboard(), clearText());
-////
-////    }
-//}
diff --git a/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterFixedTests.java b/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterFixedTests.java
deleted file mode 100644
index 40b915d71..000000000
--- a/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterFixedTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//package com.breadwallet.presenter.currencyformatting.tests;
-//
-//import android.test.AndroidTestCase;
-//
-//import java.util.Locale;
-//
-//
-///**
-// * ISO 4217 currency codes can be found here:
-// * http://en.wikipedia.org/wiki/ISO_4217
-// */
-//
-//
-//public class CurrencyFormatterFixedTests extends AndroidTestCase {
-//    /**
-//     * These tests differ between Android <= 4.0, and >= 4.1.
-//     */
-//
-//    public void testJPY() {
-//        String expected = "￥15";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("ja", "JP"), "JPY", 15.00);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. (¥15.00)
-//        // 4.1 and above - Fails (¥15)
-//        // Yes, that is a different yen symbol to what we get with ja_JP locale (note
-//        // we're forcing en_US in the CurrencyFormatter).
-//    }
-//
-//    public void testNZDollarsInJapanLocale() {
-//        // New Zealand currency, but the device locale is ja_JP
-//        String expected = "NZ$16"; // Yen has no decimal units
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("ja", "JP"), "NZD", 15.50);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails (NZ$15.50).
-//    }
-//
-//    public void testCLP() {
-//        String expected = "$15"; // Chilean Peso has no decimal units.
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("es", "CL"), "CLP", 15.00);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. (CL$ 15,00)
-//        // 4.1 and above - Fails (CLP15).
-//    }
-//
-//    public void testNZDollarsInChileLocale() {
-//        // New Zealand currency, but the device locale is es_CL
-//        String expected = "NZ$16";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("es", "CL"), "NZD", 15.50);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. (NZ$15,50)
-//    }
-//
-//    public void testNZDollarsInAustralianLocale() {
-//        String expected = "NZ$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "AU"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testAustralianDollarsInNewZealandLocale() {
-//        String expected = "AU$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "NZ"), "AUD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testGBP() {
-//        String expected = "£15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "GB"), "GBP", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testNZD() {
-//        String expected = "$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "NZ"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//        // Fails - NZ$15.00
-//    }
-//
-//    public void testUSD() {
-//        String expected = "$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "US"), "USD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testNZDInUSLocale() {
-//        String expected = "NZ$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "US"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEURInFranceLocale() {
-//        String expected = "15,00 €";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("fr", "FR"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEURInRepublicOfIrelandLocale() {
-//        String expected = "€15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "IE"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testUSDollarsInCanadianLocale() {
-//        String expected = "US$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "CA"), "USD", 15.00);
-//        assertEquals(expected, actual);
-//        // Fails - $15.00
-//    }
-//
-//    public void testCanadianDollarsInUSLocale() {
-//        String expected = "CA$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "US"), "CAD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEurosInUnitedKingdomLocale() {
-//        String expected = "€15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("en", "GB"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testPoundsInFranceLocale() {
-//        String expected = "15,00 £UK";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringFixed(new Locale("fr", "FR"), "GBP", 15.00);
-//        assertEquals(expected, actual);
-//        // Fails - 15,00 £
-//    }
-//
-//
-//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterTests.java b/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterTests.java
deleted file mode 100644
index 30e09f0e5..000000000
--- a/app/src/androidTest/java/com/litewallet/presenter/currencyformatting/tests/CurrencyFormatterTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//package com.breadwallet.presenter.currencyformatting.tests;
-//
-//import android.test.AndroidTestCase;
-//
-//import java.util.Locale;
-//public class CurrencyFormatterTests extends AndroidTestCase {
-//    /**
-//     * These tests differ between Android <= 4.0, and >= 4.1.
-//     */
-//
-//    public void testJPY() {
-//        String expected = "￥15";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("ja", "JP"), "JPY", 15.00);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. (￥15.00)
-//        // 4.1 and above - Passes.
-//    }
-//
-//    public void testNZDollarsInJapanLocale() {
-//        // New Zealand currency, but the device locale is ja_JP
-//        String expected = "NZ$16"; // Yen has no decimal units
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("ja", "JP"), "NZD", 15.50);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. NZ$15.50.
-//        // 4.1 and above - Passes.
-//    }
-//
-//    public void testCLP() {
-//        String expected = "$15"; // Chilean Peso has no decimal units.
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("es", "CL"), "CLP", 15.00);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. (CL$ 15,00)
-//        // 4.1 and above - Passes.
-//    }
-//
-//    public void testNZDollarsInChileLocale() {
-//        // New Zealand currency, but the device locale is es_CL
-//        String expected = "NZ$16";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("es", "CL"), "NZD", 15.50);
-//        assertEquals(expected, actual);
-//        // 4.0 and below - Fails. NZD 15,50
-//        // 4.1 and above - Fails. NZD16
-//    }
-//
-//    /**
-//     * These tests fail, presumably because the formatting tables for the provided locales don't
-//     * have a custom currency unit for the supplied ISO currency code.
-//     */
-//
-//    public void testNZDollarsInAustralianLocale() {
-//        String expected = "NZ$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "AU"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//        // Fails. NZD15.00
-//    }
-//
-//    public void testAustralianDollarsInNewZealandLocale() {
-//        String expected = "AU$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "NZ"), "AUD", 15.00);
-//        assertEquals(expected, actual);
-//        // Fails. AUD15.00
-//    }
-//
-//    /**
-//     * These tests pass in all cases I've tested. (device version and locale variations)
-//     */
-//
-//    public void testGBP() {
-//        String expected = "£15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "GB"), "GBP", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testNZD() {
-//        String expected = "$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "NZ"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testUSD() {
-//        String expected = "$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "US"), "USD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testNZDInUSLocale() {
-//        String expected = "NZ$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "US"), "NZD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEURInFranceLocale() {
-//        String expected = "15,00 €";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("fr", "FR"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEURInRepublicOfIrelandLocale() {
-//        String expected = "€15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "IE"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testUSDollarsInCanadianLocale() {
-//        String expected = "US$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "CA"), "USD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testCanadianDollarsInUSLocale() {
-//        String expected = "CA$15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "US"), "CAD", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testEurosInUnitedKingdomLocale() {
-//        String expected = "€15.00";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("en", "GB"), "EUR", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//    public void testPoundsInFranceLocale() {
-//        String expected = "15,00 £UK";
-//        String actual = CurrencyFormatter.getFormattedCurrencyStringForLocale(new Locale("fr", "FR"), "GBP", 15.00);
-//        assertEquals(expected, actual);
-//    }
-//
-//
-//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/litewallet/security/KeyStoreTests.java b/app/src/androidTest/java/com/litewallet/security/KeyStoreTests.java
deleted file mode 100644
index 5de7a564f..000000000
--- a/app/src/androidTest/java/com/litewallet/security/KeyStoreTests.java
+++ /dev/null
@@ -1,322 +0,0 @@
-package com.litewallet.security;
-
-import android.security.keystore.UserNotAuthenticatedException;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.breadwallet.presenter.activities.settings.TestActivity;
-import com.breadwallet.tools.security.BRKeyStore;
-import com.breadwallet.tools.threads.BRExecutor;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-
-import static com.breadwallet.tools.security.BRKeyStore.aliasObjectMap;
-
-@RunWith(AndroidJUnit4.class)
-public class KeyStoreTests {
-    public static final String TAG = KeyStoreTests.class.getName();
-
-    @Rule
-    public ActivityTestRule<TestActivity> mActivityRule = new ActivityTestRule<>(TestActivity.class);
-
-    @Test
-    public void setGetPhrase() {
-        //set get phrase
-        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
-        try {
-            BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        assertFilesExist(BRKeyStore.PHRASE_ALIAS);
-
-        byte[] freshGet = new byte[0];
-        try {
-            freshGet = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-        }
-        Assert.assertArrayEquals(freshGet, phrase);
-
-        //set get Japaneese phrase
-        byte[] japPhrase = "こせき　ぎじにってい　けっこん　せつぞく　うんどう　ふこう　にっすう　こせい　きさま　なまみ　たきび　はかい".getBytes();
-        try {
-            BRKeyStore.putPhrase(japPhrase, mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        assertFilesExist(BRKeyStore.PHRASE_ALIAS);
-        byte[] freshJapGet = new byte[0];
-        try {
-            freshJapGet = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-        }
-        Assert.assertArrayEquals(freshJapGet, japPhrase);
-
-    }
-
-    @Test
-    public void setGetCanary() {
-        String canary = "canary";
-        try {
-            BRKeyStore.putCanary(canary, mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        assertFilesExist(BRKeyStore.CANARY_ALIAS);
-        String freshGet = "";
-        try {
-            freshGet = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-        }
-        Assert.assertEquals(freshGet, canary);
-    }
-
-    @Test
-    public void setGetMultiple() {
-        final String canary = "canary";
-        for (int i = 0; i < 100; i++) {
-            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        boolean b = BRKeyStore.putCanary(canary, mActivityRule.getActivity(), 0);
-                        Assert.assertTrue(b);
-                    } catch (UserNotAuthenticatedException e) {
-                        e.printStackTrace();
-                        Assert.fail();
-                    }
-                    try {
-                        String b = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
-                        Assert.assertEquals(b, canary);
-                    } catch (UserNotAuthenticatedException e) {
-                        e.printStackTrace();
-                        Assert.fail();
-                    }
-                }
-            });
-
-        }
-
-        assertFilesExist(BRKeyStore.CANARY_ALIAS);
-
-
-        for (int i = 0; i < 100; i++) {
-            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
-                @Override
-                public void run() {
-                    String freshGet = "";
-                    try {
-                        freshGet = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
-                    } catch (UserNotAuthenticatedException e) {
-                        e.printStackTrace();
-                    }
-                    Assert.assertEquals(freshGet, canary);
-                }
-            });
-
-        }
-        try {
-            Thread.sleep(10000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Test
-    public void setGetMasterPubKey() {
-        byte[] pubKey = "26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes();
-        BRKeyStore.putMasterPublicKey(pubKey, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PUB_KEY_ALIAS);
-        byte[] freshGet;
-        freshGet = BRKeyStore.getMasterPublicKey(mActivityRule.getActivity());
-        Assert.assertArrayEquals(freshGet, freshGet);
-    }
-
-
-    @Test
-    public void setGetAuthKey() {
-        byte[] authKey = "26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes();
-        BRKeyStore.putAuthKey(authKey, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.AUTH_KEY_ALIAS);
-        byte[] freshGet;
-        freshGet = BRKeyStore.getAuthKey(mActivityRule.getActivity());
-        Assert.assertArrayEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetWalletCreationTime() {
-        int time = 1479686841;
-        BRKeyStore.putWalletCreationTime(time, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.WALLET_CREATION_TIME_ALIAS);
-        int freshGet;
-        freshGet = BRKeyStore.getWalletCreationTime(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetPassCode() {
-        String passCode = "0124";
-        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
-        String freshGet;
-        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-
-        passCode = "0000";
-        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
-        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-
-        passCode = "9999";
-        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
-        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-
-        passCode = "9876";
-        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
-        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetFailCount() {
-        int failCount = 2;
-        BRKeyStore.putFailCount(failCount, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.FAIL_COUNT_ALIAS);
-        int freshGet;
-        freshGet = BRKeyStore.getFailCount(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetSpendLimit() {
-        long spendLimit = 100000;
-        BRKeyStore.putSpendLimit(spendLimit, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.SPEND_LIMIT_ALIAS);
-        long freshGet;
-        freshGet = BRKeyStore.getSpendLimit(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetSFailTimeStamp() {
-        long failTime = 1479686841;
-        BRKeyStore.putFailTimeStamp(failTime, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.FAIL_TIMESTAMP_ALIAS);
-        long freshGet;
-        freshGet = BRKeyStore.getFailTimeStamp(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void setGetLastPasscodeUsedTime() {
-        long time = 1479686841;
-        BRKeyStore.putLastPinUsedTime(time, mActivityRule.getActivity());
-        assertFilesExist(BRKeyStore.PASS_TIME_ALIAS);
-        long freshGet;
-        freshGet = BRKeyStore.getLastPinUsedTime(mActivityRule.getActivity());
-        Assert.assertEquals(freshGet, freshGet);
-    }
-
-    @Test
-    public void testClearKeyStore() {
-        try {
-            BRKeyStore.putPhrase("axis husband project any sea patch drip tip spirit tide bring belt".getBytes(), mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            BRKeyStore.putCanary("canary", mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        BRKeyStore.putMasterPublicKey("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
-        BRKeyStore.putAuthKey("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
-        BRKeyStore.putToken("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
-        BRKeyStore.putWalletCreationTime(1479686841, mActivityRule.getActivity());
-        BRKeyStore.putPinCode("0123", mActivityRule.getActivity());
-        BRKeyStore.putFailCount(3, mActivityRule.getActivity());
-        BRKeyStore.putFailTimeStamp(1479686841, mActivityRule.getActivity());
-        BRKeyStore.putSpendLimit(10000000, mActivityRule.getActivity());
-        BRKeyStore.putLastPinUsedTime(1479686841, mActivityRule.getActivity());
-        BRKeyStore.putTotalLimit(1479686841, mActivityRule.getActivity());
-
-        for (String a : aliasObjectMap.keySet()) {
-            assertFilesExist(a);
-        }
-
-        BRKeyStore.resetWalletKeyStore(mActivityRule.getActivity());
-
-        for (String a : aliasObjectMap.keySet()) {
-            assertFilesDontExist(a);
-        }
-
-
-        byte[] phrase = "some".getBytes();
-        try {
-            phrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-        }
-
-        String canary = "some";
-
-        try {
-            canary = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-        }
-
-        Assert.assertNull(phrase);
-        Assert.assertEquals(null, canary);
-        Assert.assertEquals(null, BRKeyStore.getMasterPublicKey(mActivityRule.getActivity()));
-        Assert.assertEquals(null, BRKeyStore.getAuthKey(mActivityRule.getActivity()));
-        Assert.assertEquals(null, BRKeyStore.getToken(mActivityRule.getActivity()));
-        Assert.assertEquals(0, BRKeyStore.getWalletCreationTime(mActivityRule.getActivity()));
-        Assert.assertEquals("", BRKeyStore.getPinCode(mActivityRule.getActivity()));
-        Assert.assertEquals(0, BRKeyStore.getFailCount(mActivityRule.getActivity()));
-        Assert.assertEquals(0, BRKeyStore.getFailTimeStamp(mActivityRule.getActivity()));
-        Assert.assertEquals(0, BRKeyStore.getSpendLimit(mActivityRule.getActivity()));
-        Assert.assertEquals(0, BRKeyStore.getLastPinUsedTime(mActivityRule.getActivity()));
-
-    }
-
-    @Test
-    public void testKeyStoreAuthTime() {
-        Assert.assertEquals(BRKeyStore.AUTH_DURATION_SEC, 300);
-    }
-
-    @Test
-    public void testKeyStoreAliasMap() {
-        Assert.assertNotNull(aliasObjectMap);
-        Assert.assertEquals(aliasObjectMap.size(), 12);
-    }
-
-    public void assertFilesExist(String alias) {
-        Assert.assertTrue(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).datafileName, mActivityRule.getActivity())).exists());
-        Assert.assertTrue(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).ivFileName, mActivityRule.getActivity())).exists());
-    }
-
-    public void assertFilesDontExist(String alias) {
-        Assert.assertFalse(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).datafileName, mActivityRule.getActivity())).exists());
-        Assert.assertFalse(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).ivFileName, mActivityRule.getActivity())).exists());
-    }
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/security/NewKeyStoreTests.java b/app/src/androidTest/java/com/litewallet/security/NewKeyStoreTests.java
deleted file mode 100644
index 5e1e9a64b..000000000
--- a/app/src/androidTest/java/com/litewallet/security/NewKeyStoreTests.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.litewallet.security;
-
-import android.app.Activity;
-import android.security.keystore.UserNotAuthenticatedException;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.breadwallet.presenter.activities.settings.TestActivity;
-import com.breadwallet.tools.security.BRKeyStore;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static com.breadwallet.tools.security.BRKeyStore.PHRASE_ALIAS;
-import static com.breadwallet.tools.security.BRKeyStore.aliasObjectMap;
-
-@RunWith(AndroidJUnit4.class)
-public class NewKeyStoreTests {
-    public static final String TAG = NewKeyStoreTests.class.getName();
-
-    @Rule
-    public ActivityTestRule<TestActivity> mActivityRule = new ActivityTestRule<>(TestActivity.class);
-
-    @Before
-    public void setup() {
-        BRKeyStore.resetWalletKeyStore(mActivityRule.getActivity());
-    }
-
-    @Test
-    public void testBase64() {
-        Activity app = mActivityRule.getActivity();
-        String temp = "here is some data to encrypt! @#$%^&*";
-        byte[] phrase = temp.getBytes();
-        BRKeyStore.storeEncryptedData(app, phrase, "phrase");
-        byte[] retrievedPhrase = BRKeyStore.retrieveEncryptedData(app, "phrase");
-        Assert.assertNotNull(retrievedPhrase);
-        Assert.assertArrayEquals("Oh no", phrase, retrievedPhrase);
-        String newTemp = new String(retrievedPhrase);
-        Assert.assertEquals(temp, newTemp);
-
-    }
-
-    @Test
-    public void setNewGetNew() {
-        //set get phrase
-        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
-        try {
-            boolean b = BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
-            Assert.assertEquals(true, b);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-            Assert.assertNotNull(getPhrase);
-            Assert.assertEquals(new String(getPhrase), new String(phrase));
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-    }
-
-    @Test
-    public void setOldSetNew() {
-        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
-        BRKeyStore.AliasObject obj = aliasObjectMap.get(PHRASE_ALIAS);
-        try {
-            boolean b = BRKeyStore._setOldData(mActivityRule.getActivity(), phrase, obj.alias, obj.datafileName, obj.ivFileName, 0, true);
-            Assert.assertEquals(true, b);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
-            Assert.assertNotNull(getPhrase);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-        try {
-            boolean b = BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
-            Assert.assertEquals(true, b);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-        try {
-            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
-            Assert.assertNull(getPhrase);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-        try {
-            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-            Assert.assertNotNull(getPhrase);
-            Assert.assertEquals(new String(getPhrase), new String(phrase));
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-    }
-
-    @Test
-    public void setOldGetNew() {
-
-        //set get phrase
-        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
-        BRKeyStore.AliasObject obj = aliasObjectMap.get(PHRASE_ALIAS);
-        try {
-            boolean s = BRKeyStore._setOldData(mActivityRule.getActivity(), phrase, obj.alias, obj.datafileName, obj.ivFileName, 0, true);
-            Assert.assertEquals(true, s);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-            Assert.assertNotNull(getPhrase);
-            Assert.assertEquals(new String(getPhrase), new String(phrase));
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-            Assert.assertNotNull(getPhrase);
-            Assert.assertEquals(new String(getPhrase), new String(phrase));
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
-            Assert.assertNull(getPhrase);
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-        try {
-            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
-            Assert.assertNotNull(getPhrase);
-            Assert.assertEquals(new String(getPhrase), new String(phrase));
-        } catch (UserNotAuthenticatedException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-
-    }
-
-    @Test
-    public void allMultiThreading() {
-        for (int i = 0; i < 10; i++) {
-            setup();
-            setNewGetNew();
-            setup();
-            setOldGetNew();
-            setup();
-            setOldSetNew();
-            setup();
-
-        }
-
-    }
-
-}
diff --git a/app/src/androidTest/java/com/litewallet/wallet/WalletTests.java b/app/src/androidTest/java/com/litewallet/wallet/WalletTests.java
deleted file mode 100644
index 3fa3b0a87..000000000
--- a/app/src/androidTest/java/com/litewallet/wallet/WalletTests.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.litewallet.wallet;
-
-import com.breadwallet.presenter.entities.RequestObject;
-import com.breadwallet.tools.security.BitcoinUrlHandler;
-import com.breadwallet.tools.util.BRConstants;
-
-
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.security.InvalidAlgorithmParameterException;
-
-import static org.junit.Assert.assertEquals;
-
-public class WalletTests {
-    public static final String TAG = WalletTests.class.getName();
-
-    static {
-        System.loadLibrary(BRConstants.NATIVE_LIB_NAME);
-    }
-
-    @Test
-    public void paymentRequestTest() throws InvalidAlgorithmParameterException {
-
-        RequestObject obj = BitcoinUrlHandler.getRequestFromString("n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals("n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi", obj.address);
-
-//        r = [BRPaymentRequest requestWithString:@"1BTCorgHwCg6u2YSAWKgS17qUad6kHmtQ"];
-//        XCTAssertFalse(r.isValid);
-//        XCTAssertEqualObjects(@"bitcoin:1BTCorgHwCg6u2YSAWKgS17qUad6kHmtQ", r.string,
-//        @"[BRPaymentRequest requestWithString:]");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=1");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        BigDecimal bigDecimal = new BigDecimal(obj.amount);
-        long amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "100000000");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=0.00000001");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        bigDecimal = new BigDecimal(obj.amount);
-        amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "1");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=21000000");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        bigDecimal = new BigDecimal(obj.amount);
-        amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "2100000000000000");
-
-        // test for floating point rounding issues, these values cannot be exactly represented with an IEEE 754 double
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=20999999.99999999");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        bigDecimal = new BigDecimal(obj.amount);
-        amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "2099999999999999");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=20999999.99999995");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        bigDecimal = new BigDecimal(obj.amount);
-        amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "2099999999999995");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=0.07433");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        bigDecimal = new BigDecimal(obj.amount);
-        amountAsLong = bigDecimal.longValue();
-        assertEquals(String.valueOf(amountAsLong), "7433000");
-
-        // invalid amount string
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?amount=foobar");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals(obj.amount, null);
-
-        // test correct encoding of '&' in argument value
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?label=foo%26bar");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals(obj.label, "foo");
-
-        // test handling of ' ' in label or message
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?label=foo bar&message=bar foo");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals(obj.label, "foo bar");
-        assertEquals(obj.message, "bar foo");
-
-        // test bip73
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi?r=https://foobar.com");
-        assertEquals(obj.address, "n2eMqTT929pb1RDNuqEnxdaLau1rxy3efi");
-        assertEquals(obj.r, "https://foobar.com");
-
-        obj = BitcoinUrlHandler.getRequestFromString("litecoin:?r=https://foobar.com");
-        assertEquals(obj.address, null);
-        assertEquals(obj.r, "https://foobar.com");
-    }
-
-    @Test
-    public void currencyManagerTests() {
-
-//        String amount;
-//        String result;
-
-//        MainActivity app = MainActivity.app;
-//        if (app != null) {
-//
-//            amount = "232432.42234";
-//            result = CurrencyManager.getInstance(app).getFormattedCurrencyString("USD", amount);
-//            assertEquals("$232432.42234", result);
-//        }
-    }
-
-
-}
diff --git a/app/src/main/java/com/breadwallet/tools/sqlite/CurrencyDataSource.java b/app/src/main/java/com/breadwallet/tools/sqlite/CurrencyDataSource.java
index 00d63cdac..83fca8593 100644
--- a/app/src/main/java/com/breadwallet/tools/sqlite/CurrencyDataSource.java
+++ b/app/src/main/java/com/breadwallet/tools/sqlite/CurrencyDataSource.java
@@ -16,7 +16,6 @@
 import timber.log.Timber;
 
 public class CurrencyDataSource implements BRDataSourceInterface {
-    private static final String TAG = CurrencyDataSource.class.getName();
     private SQLiteDatabase database;
     private final BRSQLiteHelper dbHelper;
 
diff --git a/app/src/test/java/com/litewallet/currency/CurrencyTests.kt b/app/src/test/java/com/litewallet/currency/CurrencyTests.kt
new file mode 100644
index 000000000..673c9ea02
--- /dev/null
+++ b/app/src/test/java/com/litewallet/currency/CurrencyTests.kt
@@ -0,0 +1,100 @@
+package com.litewallet.currency
+
+import android.content.Context
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import com.breadwallet.presenter.entities.CurrencyEntity
+import com.breadwallet.tools.sqlite.CurrencyDataSource
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.spyk
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+
+class CurrencyTests {
+
+    private lateinit var database: SQLiteDatabase
+    private var currencyDataSource: CurrencyDataSource? = null
+
+    @Before
+    fun setup() {
+        val context: Context = mockk(relaxed = true)
+        currencyDataSource = spyk(CurrencyDataSource.getInstance(context))
+
+        database = mockk<SQLiteDatabase>()
+        every { currencyDataSource?.openDatabase() } returns database
+    }
+
+    @After
+    fun tearDown() {
+        currencyDataSource?.closeDatabase()
+        currencyDataSource = null
+    }
+
+    @Test
+    fun `invoke CurrencyDataSource instance and getAllCurrencies, should return the correct number of currencies`() {
+        //The actual number of currencies is 174. The 0 is a placeholder and needs to be replaced with a db query.
+        mockCursorDataFromDatabase()
+        assertEquals(currencyDataSource?.allCurrencies?.count(), 0)
+    }
+
+    @Test
+    fun `invoke CurrencyDataSource instance and open database, then should validate database was not null`() {
+        val database = currencyDataSource?.openDatabase()
+        assertNotNull(database)
+    }
+
+    @Test
+    fun `invoke CurrencyDataSource instance database, should return currency by ISO`() {
+
+        val expected = CurrencyEntity("USD", "USD", 110.345f)
+        mockCursorDataFromDatabase(isEmpty = false, expected = expected)
+
+        val actual = currencyDataSource?.getCurrencyByIso("USD")
+        assertEquals(expected.code, actual?.code)
+        assertEquals(expected.name, actual?.name)
+        assertEquals(expected.rate, actual?.rate)
+    }
+
+    @Test
+    fun `invoke putCurrencies, then should save the CurrencyEntity into database`() {
+        val fetchedCurrencies = listOf(
+            CurrencyEntity("USD", "USD", 110.345f),
+            CurrencyEntity("IDR", "IDR", 1752020.9450135066f)
+        )
+
+        every { database.beginTransaction() } just Runs
+        fetchedCurrencies.forEachIndexed { index, currencyEntity ->
+            every { database.insertWithOnConflict(any(), any(), any(), any()) } returns (index + 1L)
+        }
+        every { database.setTransactionSuccessful() } just Runs
+        every { database.endTransaction() } just Runs
+
+        currencyDataSource?.putCurrencies(fetchedCurrencies)
+    }
+
+    private fun mockCursorDataFromDatabase(
+        isEmpty: Boolean = true,
+        expected: CurrencyEntity? = null
+    ) {
+        val cursor = mockk<Cursor>()
+        every { database.query(any(), any(), any(), any(), any(), any(), any()) } returns cursor
+        if (isEmpty) {
+            every { cursor.moveToFirst() } returns false
+            every { cursor.isAfterLast } returns true
+        } else {
+            every { cursor.getString(any()) } returns expected?.code
+            every { cursor.getString(any()) } returns expected?.name
+            every { cursor.getFloat(any()) } returns expected?.rate!!
+
+            every { cursor.moveToFirst() } returns true
+            every { cursor.isAfterLast } returns false
+        }
+        every { cursor.close() } just Runs
+    }
+}
diff --git a/app/src/test/java/com/litewallet/example/ExampleTest.kt b/app/src/test/java/com/litewallet/example/ExampleTest.kt
new file mode 100644
index 000000000..45a00b03f
--- /dev/null
+++ b/app/src/test/java/com/litewallet/example/ExampleTest.kt
@@ -0,0 +1,125 @@
+package com.litewallet.example
+
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ExampleTest {
+
+    @Test
+    fun `add invoked with valid mocked values , should return correct value as expected`() {
+        val dependencyOne = mockk<DependencyOne>()
+        val dependencyTwo = mockk<DependencyTwo>()
+
+        every { dependencyOne.value } returns 10
+        every { dependencyTwo.value } returns 3
+
+        val system = SystemUnderTest(dependencyOne, dependencyTwo)
+
+        val expected = 13
+        val result = system.add()
+        assertEquals(expected, result)
+        verify {
+            dependencyOne.value
+            dependencyTwo.value
+        }
+    }
+
+    @Test
+    fun `add invoked with valid mocked value for dependencyOne, should return correct value as expected`() {
+        val dependencyOne = mockk<DependencyOne>()
+        val dependencyTwo = mockk<DependencyTwo>(relaxed = true)
+
+        every { dependencyOne.value } returns 7
+
+        val system = SystemUnderTest(dependencyOne, dependencyTwo)
+
+        val expected = 7
+        val result = system.add()
+        assertEquals(expected, result)
+        verify {
+            dependencyOne.value
+            dependencyTwo.value
+        }
+    }
+
+    @Test
+    fun `add invoked with valid mocked value for dependencyOne and actual value for dependencyTwo , should return correct value as expected`() {
+        val dependencyOne = mockk<DependencyOne>()
+        val dependencyTwo = spyk(DependencyTwo(3))
+
+        every { dependencyOne.value } returns 7
+
+        val system = SystemUnderTest(dependencyOne, dependencyTwo)
+
+        val expected = 10
+        val result = system.add()
+        assertEquals(expected, result)
+        verify {
+            dependencyOne.value
+            dependencyTwo.value
+        }
+    }
+
+
+    @Test
+    fun `calc invoked with valid mocked values, should return correct value as expected and verify by order`() {
+        val dependencyOne = mockk<DependencyOne>()
+        val dependencyTwo = mockk<DependencyTwo>()
+
+        every { dependencyOne.value } returns 7
+        every { dependencyTwo.value } returns 4
+
+        val system = SystemUnderTest(dependencyOne, dependencyTwo)
+
+        val expected = 17
+        val result = system.calc()
+        assertEquals(expected, result)
+        verifyOrder {
+            system.multiply()
+            system.add()
+        }
+    }
+
+    @Test
+    fun `basic example coroutines`() = runBlocking {
+        val dependencyOne = mockk<DependencyOne>()
+        val dependencyTwo = mockk<DependencyTwo>()
+
+        every { dependencyOne.value } returns 9
+        every { dependencyTwo.value } returns 11
+
+        val system = SystemUnderTest(dependencyOne, dependencyTwo)
+
+        val expected = listOf(9, 11)
+        val result = system.fetch()
+        assertEquals(expected, result)
+        coVerify { system.fetch() }
+    }
+
+}
+
+class DependencyOne(val value: Int)
+class DependencyTwo(val value: Int)
+
+class SystemUnderTest(
+    private val dependencyOne: DependencyOne,
+    private val dependencyTwo: DependencyTwo
+) {
+    fun add(): Int = dependencyOne.value + dependencyTwo.value
+    fun multiply(): Int = dependencyOne.value * dependencyTwo.value
+
+    fun calc(): Int = multiply() - add()
+
+    suspend fun fetch(): List<Int> {
+        delay(3000)
+        return listOf(dependencyOne.value, dependencyTwo.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/litewallet/tools/database/DatabaseTests.kt b/app/src/test/java/com/litewallet/tools/database/DatabaseTests.kt
new file mode 100644
index 000000000..4c7a101aa
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/database/DatabaseTests.kt
@@ -0,0 +1,85 @@
+package com.litewallet.tools.database
+
+class DatabaseTests {
+}
+
+//package com.litewallet.analytics;
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//import android.util.Log;
+//import androidx.test.ext.junit.rules.ActivityScenarioRule;
+//
+//import com.breadwallet.presenter.activities.intro.IntroActivity;
+//import com.breadwallet.tools.util.BRConstants;
+//
+//import org.junit.After;
+//import org.junit.Assert;
+//import org.junit.Before;
+//import org.junit.Rule;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import java.net.URI;
+//
+//@Deprecated
+//@RunWith(AndroidJUnit4.class)
+//        public class ConstantsTests {
+//    public static final String TAG = ConstantsTests.class.getName();
+//    @Rule
+//    public ActivityScenarioRule<IntroActivity> mActivityRule = new ActivityScenarioRule<>(IntroActivity.class);
+//    @Before
+//    public void setUp() {
+//        Log.e(TAG, "setUp: ");
+//    }
+//
+//    @After
+//    public void tearDown() {
+//    }
+//    @Test
+//    public void testLitecoinSymbolConstants() {
+//        Assert.assertSame(BRConstants.litecoinLowercase,"ł");
+//        Assert.assertSame(BRConstants.litecoinUppercase,"Ł");
+//    }
+//    @Test
+//    public void testAppExternalURLConstants() {
+//        Assert.assertSame(BRConstants.TWITTER_LINK,"https://twitter.com/Litewallet_App");
+//        Assert.assertSame(BRConstants.INSTAGRAM_LINK,"https://www.instagram.com/litewallet.app");
+//        Assert.assertSame(BRConstants.WEB_LINK,"https://litewallet.io");
+//        Assert.assertSame(BRConstants.TOS_LINK,"https://litewallet.io/privacy");
+//        Assert.assertSame(BRConstants.CUSTOMER_SUPPORT_LINK,"https://support.litewallet.io/hc/en-us/requests/new");
+//        Assert.assertSame(BRConstants.BITREFILL_AFFILIATE_LINK,"https://www.bitrefill.com/");
+//    }
+//    @Test
+//    public void testFirebaseAnalyticsConstants() {
+//        Assert.assertSame(BRConstants._20191105_AL,"app_launched");
+//        Assert.assertSame(BRConstants._20191105_VSC,"visit_send_controller");
+//        Assert.assertSame(BRConstants._20202116_VRC,"visit_receive_controller");
+//        Assert.assertSame(BRConstants._20191105_DSL,"did_send_ltc");
+//        Assert.assertSame(BRConstants._20191105_DTBT,"did_tap_buy_tab");
+//        Assert.assertSame(BRConstants._20200111_RNI,"rate_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_FNI,"feeperkb_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_TNI,"transaction_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_WNI,"wallet_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_PNI,"phrase_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_UTST,"unable_to_sign_transaction");
+//        Assert.assertSame(BRConstants._20200112_ERR,"error");
+//        Assert.assertSame(BRConstants._20200112_DSR,"did_start_resync");
+//        Assert.assertSame(BRConstants._20200125_DSRR,"did_show_review_request");
+//        Assert.assertSame(BRConstants._20201118_DTGS,"did_tap_get_support");
+//        Assert.assertSame(BRConstants._20200217_DUWP,"did_unlock_with_pin");
+//        Assert.assertSame(BRConstants._20200217_DUWB,"did_unlock_with_biometrics");
+//        Assert.assertSame(BRConstants._20200301_DUDFPK,"did_use_default_fee_per_kb");
+//        Assert.assertSame(BRConstants._20201121_SIL,"started_IFPS_lookup");
+//        Assert.assertSame(BRConstants._20201121_DRIA,"did_resolve_IPFS_address");
+//        Assert.assertSame(BRConstants._20201121_FRIA,"failed_resolve_IPFS_address");
+//        Assert.assertSame(BRConstants._20200207_DTHB,"did_tap_header_balance");
+//        Assert.assertSame(BRConstants._20210427_HCIEEH,"heartbeat_check_if_event_even_happens");
+//        Assert.assertSame(BRConstants._20220822_UTOU,"user_tapped_on_ud");
+//        Assert.assertSame(BRConstants._20230131_NENR,"no_error_nominal_response");
+//        Assert.assertSame(BRConstants._20230407_DCS,"did_complete_sync");
+//        Assert.assertSame(BRConstants._20240123_RAGI,"registered_android_general_interest");
+//        Assert.assertSame(BRConstants._20231225_UAP,"user_accepted_push");
+//        Assert.assertSame(BRConstants._20240101_US,"user_signup");
+//        Assert.assertSame(BRConstants._20241006_DRR,"did_request_rating");
+//        Assert.assertSame(BRConstants._20241006_UCR,"user_completed_rating");
+//    }
+//}
diff --git a/app/src/test/java/com/litewallet/tools/database/TransactionDataSourceTest.kt b/app/src/test/java/com/litewallet/tools/database/TransactionDataSourceTest.kt
new file mode 100644
index 000000000..4e3ced570
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/database/TransactionDataSourceTest.kt
@@ -0,0 +1,3 @@
+package com.litewallet.tools.database
+
+class TransactionDataSourceTest {}
diff --git a/app/src/test/java/com/litewallet/tools/security/BRKeyStoreTest.kt b/app/src/test/java/com/litewallet/tools/security/BRKeyStoreTest.kt
new file mode 100644
index 000000000..8e84130ec
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/security/BRKeyStoreTest.kt
@@ -0,0 +1,1059 @@
+package com.litewallet.tools.security
+//
+//import com.breadwallet.presenter.activities.intro.WriteDownActivity
+//import com.breadwallet.tools.threads.BRExecutor
+//import com.breadwallet.tools.util.BRConstants
+//import com.litewallet.example.DependencyOne
+//import com.litewallet.example.DependencyTwo
+//import com.litewallet.example.SystemUnderTest
+//import com.platform.entities.TxMetaData
+//import com.platform.interfaces.KVStoreAdaptor
+//import com.platform.kvstore.CompletionObject
+//import com.platform.kvstore.ReplicatedKVStore
+//import com.platform.sqlite.KVItem
+//import com.platform.sqlite.PlatformSqliteHelper
+//import com.platform.tools.KVStoreManager
+//import org.junit.After
+//import org.junit.Assert
+//import org.junit.Before
+//import org.junit.ClassRule
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.util.Arrays
+//import java.util.concurrent.atomic.AtomicInteger
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+//
+class BRKeyStoreTest {
+
+}
+
+//  from com.litewallet.security;
+//package com.litewallet.security;
+//
+//import android.security.keystore.UserNotAuthenticatedException;
+//import androidx.test.rule.ActivityTestRule;
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//
+//import com.breadwallet.presenter.activities.settings.TestActivity;
+//import com.breadwallet.tools.security.BRKeyStore;
+//import com.breadwallet.tools.threads.BRExecutor;
+//
+//import org.junit.Assert;
+//import org.junit.Rule;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import java.io.File;
+//
+//import static com.breadwallet.tools.security.BRKeyStore.aliasObjectMap;
+//
+//@RunWith(AndroidJUnit4.class)
+//        public class KeyStoreTests {
+//    public static final String TAG = KeyStoreTests.class.getName();
+//
+//    @Rule
+//    public ActivityTestRule<TestActivity> mActivityRule = new ActivityTestRule<>(TestActivity.class);
+//
+//    @Test
+//    public void setGetPhrase() {
+//        //set get phrase
+//        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
+//        try {
+//            BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        assertFilesExist(BRKeyStore.PHRASE_ALIAS);
+//
+//        byte[] freshGet = new byte[0];
+//        try {
+//            freshGet = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//        }
+//        Assert.assertArrayEquals(freshGet, phrase);
+//
+//        //set get Japaneese phrase
+//        byte[] japPhrase = "こせき　ぎじにってい　けっこん　せつぞく　うんどう　ふこう　にっすう　こせい　きさま　なまみ　たきび　はかい".getBytes();
+//        try {
+//            BRKeyStore.putPhrase(japPhrase, mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        assertFilesExist(BRKeyStore.PHRASE_ALIAS);
+//        byte[] freshJapGet = new byte[0];
+//        try {
+//            freshJapGet = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//        }
+//        Assert.assertArrayEquals(freshJapGet, japPhrase);
+//
+//    }
+//
+//    @Test
+//    public void setGetCanary() {
+//        String canary = "canary";
+//        try {
+//            BRKeyStore.putCanary(canary, mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        assertFilesExist(BRKeyStore.CANARY_ALIAS);
+//        String freshGet = "";
+//        try {
+//            freshGet = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//        }
+//        Assert.assertEquals(freshGet, canary);
+//    }
+//
+//    @Test
+//    public void setGetMultiple() {
+//        final String canary = "canary";
+//        for (int i = 0; i < 100; i++) {
+//            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
+//                @Override
+//                public void run() {
+//                    try {
+//                        boolean b = BRKeyStore.putCanary(canary, mActivityRule.getActivity(), 0);
+//                        Assert.assertTrue(b);
+//                    } catch (UserNotAuthenticatedException e) {
+//                        e.printStackTrace();
+//                        Assert.fail();
+//                    }
+//                    try {
+//                        String b = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
+//                        Assert.assertEquals(b, canary);
+//                    } catch (UserNotAuthenticatedException e) {
+//                        e.printStackTrace();
+//                        Assert.fail();
+//                    }
+//                }
+//            });
+//
+//        }
+//
+//        assertFilesExist(BRKeyStore.CANARY_ALIAS);
+//
+//
+//        for (int i = 0; i < 100; i++) {
+//            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
+//                @Override
+//                public void run() {
+//                    String freshGet = "";
+//                    try {
+//                        freshGet = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
+//                    } catch (UserNotAuthenticatedException e) {
+//                        e.printStackTrace();
+//                    }
+//                    Assert.assertEquals(freshGet, canary);
+//                }
+//            });
+//
+//        }
+//        try {
+//            Thread.sleep(10000);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+//
+//    }
+//
+//    @Test
+//    public void setGetMasterPubKey() {
+//        byte[] pubKey = "26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes();
+//        BRKeyStore.putMasterPublicKey(pubKey, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PUB_KEY_ALIAS);
+//        byte[] freshGet;
+//        freshGet = BRKeyStore.getMasterPublicKey(mActivityRule.getActivity());
+//        Assert.assertArrayEquals(freshGet, freshGet);
+//    }
+//
+//
+//    @Test
+//    public void setGetAuthKey() {
+//        byte[] authKey = "26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes();
+//        BRKeyStore.putAuthKey(authKey, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.AUTH_KEY_ALIAS);
+//        byte[] freshGet;
+//        freshGet = BRKeyStore.getAuthKey(mActivityRule.getActivity());
+//        Assert.assertArrayEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetWalletCreationTime() {
+//        int time = 1479686841;
+//        BRKeyStore.putWalletCreationTime(time, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.WALLET_CREATION_TIME_ALIAS);
+//        int freshGet;
+//        freshGet = BRKeyStore.getWalletCreationTime(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetPassCode() {
+//        String passCode = "0124";
+//        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
+//        String freshGet;
+//        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//
+//        passCode = "0000";
+//        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
+//        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//
+//        passCode = "9999";
+//        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
+//        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//
+//        passCode = "9876";
+//        BRKeyStore.putPinCode(passCode, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PASS_CODE_ALIAS);
+//        freshGet = BRKeyStore.getPinCode(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetFailCount() {
+//        int failCount = 2;
+//        BRKeyStore.putFailCount(failCount, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.FAIL_COUNT_ALIAS);
+//        int freshGet;
+//        freshGet = BRKeyStore.getFailCount(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetSpendLimit() {
+//        long spendLimit = 100000;
+//        BRKeyStore.putSpendLimit(spendLimit, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.SPEND_LIMIT_ALIAS);
+//        long freshGet;
+//        freshGet = BRKeyStore.getSpendLimit(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetSFailTimeStamp() {
+//        long failTime = 1479686841;
+//        BRKeyStore.putFailTimeStamp(failTime, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.FAIL_TIMESTAMP_ALIAS);
+//        long freshGet;
+//        freshGet = BRKeyStore.getFailTimeStamp(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void setGetLastPasscodeUsedTime() {
+//        long time = 1479686841;
+//        BRKeyStore.putLastPinUsedTime(time, mActivityRule.getActivity());
+//        assertFilesExist(BRKeyStore.PASS_TIME_ALIAS);
+//        long freshGet;
+//        freshGet = BRKeyStore.getLastPinUsedTime(mActivityRule.getActivity());
+//        Assert.assertEquals(freshGet, freshGet);
+//    }
+//
+//    @Test
+//    public void testClearKeyStore() {
+//        try {
+//            BRKeyStore.putPhrase("axis husband project any sea patch drip tip spirit tide bring belt".getBytes(), mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            BRKeyStore.putCanary("canary", mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        BRKeyStore.putMasterPublicKey("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
+//        BRKeyStore.putAuthKey("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
+//        BRKeyStore.putToken("26wZYDdvpmCrYZeUcxgqd1KquN4o6wXwLomBW5SjnwUqG".getBytes(), mActivityRule.getActivity());
+//        BRKeyStore.putWalletCreationTime(1479686841, mActivityRule.getActivity());
+//        BRKeyStore.putPinCode("0123", mActivityRule.getActivity());
+//        BRKeyStore.putFailCount(3, mActivityRule.getActivity());
+//        BRKeyStore.putFailTimeStamp(1479686841, mActivityRule.getActivity());
+//        BRKeyStore.putSpendLimit(10000000, mActivityRule.getActivity());
+//        BRKeyStore.putLastPinUsedTime(1479686841, mActivityRule.getActivity());
+//        BRKeyStore.putTotalLimit(1479686841, mActivityRule.getActivity());
+//
+//        for (String a : aliasObjectMap.keySet()) {
+//            assertFilesExist(a);
+//        }
+//
+//        BRKeyStore.resetWalletKeyStore(mActivityRule.getActivity());
+//
+//        for (String a : aliasObjectMap.keySet()) {
+//            assertFilesDontExist(a);
+//        }
+//
+//
+//        byte[] phrase = "some".getBytes();
+//        try {
+//            phrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//        }
+//
+//        String canary = "some";
+//
+//        try {
+//            canary = BRKeyStore.getCanary(mActivityRule.getActivity(), 0);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//        }
+//
+//        Assert.assertNull(phrase);
+//        Assert.assertEquals(null, canary);
+//        Assert.assertEquals(null, BRKeyStore.getMasterPublicKey(mActivityRule.getActivity()));
+//        Assert.assertEquals(null, BRKeyStore.getAuthKey(mActivityRule.getActivity()));
+//        Assert.assertEquals(null, BRKeyStore.getToken(mActivityRule.getActivity()));
+//        Assert.assertEquals(0, BRKeyStore.getWalletCreationTime(mActivityRule.getActivity()));
+//        Assert.assertEquals("", BRKeyStore.getPinCode(mActivityRule.getActivity()));
+//        Assert.assertEquals(0, BRKeyStore.getFailCount(mActivityRule.getActivity()));
+//        Assert.assertEquals(0, BRKeyStore.getFailTimeStamp(mActivityRule.getActivity()));
+//        Assert.assertEquals(0, BRKeyStore.getSpendLimit(mActivityRule.getActivity()));
+//        Assert.assertEquals(0, BRKeyStore.getLastPinUsedTime(mActivityRule.getActivity()));
+//
+//    }
+//
+//    @Test
+//    public void testKeyStoreAuthTime() {
+//        Assert.assertEquals(BRKeyStore.AUTH_DURATION_SEC, 300);
+//    }
+//
+//    @Test
+//    public void testKeyStoreAliasMap() {
+//        Assert.assertNotNull(aliasObjectMap);
+//        Assert.assertEquals(aliasObjectMap.size(), 12);
+//    }
+//
+//    public void assertFilesExist(String alias) {
+//        Assert.assertTrue(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).datafileName, mActivityRule.getActivity())).exists());
+//        Assert.assertTrue(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).ivFileName, mActivityRule.getActivity())).exists());
+//    }
+//
+//    public void assertFilesDontExist(String alias) {
+//        Assert.assertFalse(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).datafileName, mActivityRule.getActivity())).exists());
+//        Assert.assertFalse(new File(BRKeyStore.getFilePath(aliasObjectMap.get(alias).ivFileName, mActivityRule.getActivity())).exists());
+//    }
+//
+//}
+
+
+//TODO: Transcode and add Kotlin tests.  Copied from legacy Java BRKeyStoreTest
+////@RunWith(androidx.test.ext.junit.runners.AndroidJUnit4::class)
+////@LargeTest
+//fun `add invoked with valid mocked values, should return correct value as expected`() {
+//    val dependencyOne = mockk<DependencyOne>()
+//    val dependencyTwo = mockk<DependencyTwo>()
+//
+//    every { dependencyOne.value } returns 10
+//    every { dependencyTwo.value } returns 3
+//
+//    val system = SystemUnderTest(dependencyOne, dependencyTwo)
+//
+//    val expected = 13
+//    val result = system.add()
+//    assertEquals(expected, result)
+//    verify {
+//        dependencyOne.value
+//        dependencyTwo.value
+//    }
+//}
+//
+//
+//    class MockUpAdapter : KVStoreAdaptor {
+//        var remoteKVs: MutableMap<String, KVItem> = HashMap()
+//
+//        override fun ver(key: String): CompletionObject {
+//            val result = remoteKVs[key]
+//            return if (result == null) CompletionObject(CompletionObject.RemoteKVStoreError.notFound) else CompletionObject(
+//                result.version,
+//                result.time,
+//                if (result.deleted == 0) null else CompletionObject.RemoteKVStoreError.tombstone
+//            )
+//        }
+//
+//        override fun put(key: String, value: ByteArray, version: Long): CompletionObject {
+//            val result = remoteKVs[key]
+//            if (result == null) {
+//                if (version != 1L) return CompletionObject(CompletionObject.RemoteKVStoreError.notFound)
+//                val newObj = KVItem(1, -1, key, value, System.currentTimeMillis(), 0)
+//                remoteKVs[key] = newObj
+//                return CompletionObject(1, newObj.time, null)
+//            }
+//            if (version != result.version) return CompletionObject(CompletionObject.RemoteKVStoreError.conflict)
+//            val newObj = KVItem(result.version + 1, -1, key, value, System.currentTimeMillis(), 0)
+//            remoteKVs[newObj.key] = newObj
+//            return CompletionObject(newObj.version, newObj.time, null)
+//        }
+//
+//        override fun del(key: String, version: Long): CompletionObject {
+//            val result = remoteKVs[key]
+//                ?: return CompletionObject(CompletionObject.RemoteKVStoreError.notFound)
+//            if (result.version != version) return CompletionObject(CompletionObject.RemoteKVStoreError.conflict)
+//            val newObj = KVItem(result.version + 1, -1, result.key, result.value, result.time, 1)
+//            remoteKVs[newObj.key] = newObj
+//            return CompletionObject(newObj.version, newObj.time, null)
+//        }
+//
+//        override fun get(key: String, version: Long): CompletionObject {
+//            val result = remoteKVs[key]
+//                ?: return CompletionObject(CompletionObject.RemoteKVStoreError.notFound)
+//            if (version != result.version) return CompletionObject(
+//                0,
+//                System.currentTimeMillis(),
+//                CompletionObject.RemoteKVStoreError.conflict
+//            )
+//            return CompletionObject(
+//                result.version,
+//                result.time,
+//                result.value,
+//                if (result.deleted == 0) null else CompletionObject.RemoteKVStoreError.tombstone
+//            )
+//        }
+//
+//        override fun keys(): CompletionObject {
+//            val result: MutableList<KVItem> = ArrayList()
+//            for (kv in remoteKVs.values) {
+//                if (kv.deleted != 0) kv.err = CompletionObject.RemoteKVStoreError.tombstone
+//                result.add(kv)
+//            }
+//            return CompletionObject(result)
+//        }
+//
+//        fun putKv(kv: KVItem) {
+//            remoteKVs[kv.key] = kv
+//        }
+//    }
+//
+//    @Before
+//    fun setUp() {
+//        BRConstants.PLATFORM_ON = false
+//        (remote as MockUpAdapter).remoteKVs.clear()
+//        remote.putKv(
+//            KVItem(
+//                1,
+//                1,
+//                "hello",
+//                ReplicatedKVStore.encrypt("hello".toByteArray(), mActivityRule.getActivity()),
+//                System.currentTimeMillis(),
+//                0
+//            )
+//        )
+//        remote.putKv(
+//            KVItem(
+//                1,
+//                1,
+//                "removed",
+//                ReplicatedKVStore.encrypt("removed".toByteArray(), mActivityRule.getActivity()),
+//                System.currentTimeMillis(),
+//                1
+//            )
+//        )
+//        for (i in 0..19) {
+//            remote.putKv(
+//                KVItem(
+//                    1,
+//                    1,
+//                    "testkey$i",
+//                    ReplicatedKVStore.encrypt(
+//                        ("testkey$i").toByteArray(),
+//                        mActivityRule.getActivity()
+//                    ),
+//                    System.currentTimeMillis(),
+//                    0
+//                )
+//            )
+//        }
+//
+//        store = ReplicatedKVStore.getInstance(mActivityRule.getActivity(), remote)
+//        store.deleteAllKVs()
+//        Assert.assertEquals(22, remote.remoteKVs.size.toLong())
+//    }
+//
+//    @After
+//    fun tearDown() {
+//        store!!.deleteAllKVs()
+//        mActivityRule.getActivity().deleteDatabase(PlatformSqliteHelper.DATABASE_NAME)
+//        (remote as MockUpAdapter).remoteKVs.clear()
+//    }
+//
+//    fun assertDatabasesAreSynced() {
+//        val remoteKV: MutableMap<String, ByteArray> = LinkedHashMap()
+//        val kvs: List<KVItem> = ArrayList((remote as MockUpAdapter).remoteKVs.values)
+//        for (kv in kvs) {
+//            if (kv.deleted == 0) remoteKV[kv.key] = kv.value
+//        }
+//
+//        val allLocalKeys = store!!.rawKVs
+//        val localKV: MutableMap<String, ByteArray> = LinkedHashMap()
+//
+//        for (kv in allLocalKeys) {
+//            if (kv.deleted == 0) {
+//                val `object` = store!![kv.key, kv.version]
+//
+//                //                KVItem tmpKv = object.kv;
+//                localKV[kv.key] = `object`.kv.value
+//            }
+//        }
+//
+//        Assert.assertEquals(remoteKV.size.toLong(), localKV.size.toLong())
+//
+//        var it: Iterator<*> = remoteKV.entries.iterator()
+//        while (it.hasNext()) {
+//            val pair = it.next() as Map.Entry<*, *>
+//            val `val` =
+//                ReplicatedKVStore.decrypt(pair.value as ByteArray?, mActivityRule.getActivity())
+//            val valToAssert = localKV[pair.key as String]
+//            val valStr = String(`val`!!)
+//            val valToAssertStr = String(valToAssert!!)
+//            Assert.assertArrayEquals(`val`, valToAssert)
+//        }
+//
+//        it = localKV.entries.iterator()
+//        while (it.hasNext()) {
+//            val pair = it.next() as Map.Entry<*, *>
+//            val `val` = pair.value as ByteArray
+//            val valToAssert =
+//                ReplicatedKVStore.decrypt(remoteKV[pair.key as String], mActivityRule.getActivity())
+//            Assert.assertArrayEquals(`val`, valToAssert)
+//        }
+//    }
+//
+//
+//    @Test
+//    fun testSetLocal() {
+//        val obj = store!!.set(0, 1, "Key1", "Key1".toByteArray(), System.currentTimeMillis(), 0)
+//        Assert.assertNull(obj.err)
+//        store!![0, 1, "Key1", "Key1".toByteArray(), System.currentTimeMillis()] =
+//            0
+//        store!!.set(KVItem(0, 1, "Key2", "Key2".toByteArray(), System.currentTimeMillis(), 2))
+//        store!!.set(
+//            arrayOf(
+//                KVItem(0, 4, "Key3", "Key3".toByteArray(), System.currentTimeMillis(), 2),
+//                KVItem(0, 2, "Key4", "Key4".toByteArray(), System.currentTimeMillis(), 0)
+//            )
+//        )
+//        store!!.set(
+//            Arrays.asList(
+//                *arrayOf(
+//                    KVItem(0, 4, "Key5", "Key5".toByteArray(), System.currentTimeMillis(), 1),
+//                    KVItem(0, 5, "Key6", "Key6".toByteArray(), System.currentTimeMillis(), 5)
+//                )
+//            )
+//        )
+//        Assert.assertEquals(6, store!!.rawKVs.size.toLong())
+//    }
+//
+//    @Test
+//    fun testDeleteAll() {
+//        val obj = store!!.set(0, 1, "Key1", "Key1".toByteArray(), System.currentTimeMillis(), 0)
+//        store!![0, 1, "Key1", "Key1".toByteArray(), System.currentTimeMillis()] =
+//            0
+//        store!!.set(KVItem(0, 1, "Key2", "Key2".toByteArray(), System.currentTimeMillis(), 2))
+//        store!!.set(
+//            arrayOf(
+//                KVItem(0, 4, "Key3", "Key3".toByteArray(), System.currentTimeMillis(), 2),
+//                KVItem(0, 2, "Key4", "Key4".toByteArray(), System.currentTimeMillis(), 0)
+//            )
+//        )
+//        store!!.set(
+//            Arrays.asList(
+//                *arrayOf(
+//                    KVItem(0, 4, "Key5", "Key5".toByteArray(), System.currentTimeMillis(), 1),
+//                    KVItem(0, 5, "Key6", "Key6".toByteArray(), System.currentTimeMillis(), 5)
+//                )
+//            )
+//        )
+//        var kvs = store!!.rawKVs
+//        Assert.assertEquals(6, kvs.size.toLong())
+//        store!!.deleteAllKVs()
+//        kvs = store!!.rawKVs
+//        Assert.assertEquals(0, kvs.size.toLong())
+//    }
+//
+//    @Test
+//    fun testSetLocalIncrementsVersion() {
+//        store!!.deleteAllKVs()
+//        val obj = store!!.set(0, 0, "Key1", "Key1".toByteArray(), System.currentTimeMillis(), 0)
+//        Assert.assertNull(obj.err)
+//        val test = store!!.rawKVs
+//        Assert.assertEquals(1, test.size.toLong())
+//        Assert.assertEquals(1, store!!.localVersion("Key1").version)
+//    }
+//
+//    @Test
+//    fun testMultithreadedInserts() {
+//        val count = AtomicInteger()
+//        for (i in 0..999) {
+//            val finalI = i
+//            BRExecutor.getInstance().forLightWeightBackgroundTasks().execute {
+//                val obj = store!!.set(
+//                    0, 0,
+//                    "Key$finalI", "Key1".toByteArray(), System.currentTimeMillis(), 0
+//                )
+//                Assert.assertNull(obj.err)
+//                Assert.assertEquals(obj.version, 1)
+//                count.incrementAndGet()
+//                val remObj = store!!.delete(
+//                    "Key$finalI", store!!.localVersion(
+//                        "Key$finalI"
+//                    ).version
+//                )
+//                Assert.assertNull(remObj.err)
+//                count.decrementAndGet()
+//            }
+//        }
+//        try {
+//            Thread.sleep(10000)
+//            Assert.assertEquals(count.get().toLong(), 0)
+//            val items = store!!.rawKVs
+//            Assert.assertEquals(items.size.toLong(), 1000)
+//        } catch (e: InterruptedException) {
+//            e.printStackTrace()
+//        }
+//    }
+//
+//    @Test
+//    fun testSetThenGet() {
+//        val value = "hello".toByteArray()
+//        val setObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        Assert.assertNull(setObj.err)
+//        val v1 = setObj.version
+//        val t1 = setObj.time
+//        var obj = store!!["hello", 0]
+//        val kvNoVersion = obj.kv
+//        obj = store!!["hello", 1]
+//        val kvWithVersion = obj.kv
+//        Assert.assertArrayEquals(value, kvNoVersion.value)
+//        Assert.assertEquals(v1, kvNoVersion.version)
+//        Assert.assertEquals(t1.toDouble(), kvNoVersion.time.toDouble(), 0.001)
+//
+//        Assert.assertNotNull(kvWithVersion)
+//        Assert.assertArrayEquals(value, kvWithVersion.value)
+//        Assert.assertEquals(v1, kvWithVersion.version)
+//        Assert.assertEquals(t1.toDouble(), kvWithVersion.time.toDouble(), 0.001)
+//    }
+//
+//    @Test
+//    fun testSetThenSetIncrementsVersion() {
+//        val value = "hello".toByteArray()
+//        val value2 = "hello2".toByteArray()
+//        val setObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        val setObj2 = store!!.set(setObj.version, 0, "hello", value2, System.currentTimeMillis(), 0)
+//        Assert.assertEquals(setObj2.version, setObj.version + 1)
+//    }
+//
+//    @Test
+//    fun testSetThenDel() {
+//        val value = "hello".toByteArray()
+//        val setObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        val delObj = store!!.delete("hello", setObj.version)
+//        Assert.assertNull(setObj.err)
+//        Assert.assertNull(delObj.err)
+//
+//        Assert.assertEquals(delObj.version, setObj.version + 1)
+//    }
+//
+//    @Test
+//    fun testSetThenDelThenGet() {
+//        val value = "hello".toByteArray()
+//        val setObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        val delObj = store!!.delete("hello", setObj.version)
+//        Assert.assertNull(setObj.err)
+//        Assert.assertNull(delObj.err)
+//
+//        val `object` = store!!["hello", 0]
+//        val getKv = `object`.kv
+//
+//        Assert.assertEquals(delObj.version, setObj.version + 1)
+//        Assert.assertEquals(getKv.version, setObj.version + 1)
+//    }
+//
+//    @Test
+//    fun testSetWithIncorrectFirstVersionFails() {
+//        val value = "hello".toByteArray()
+//        val setObj = store!!.set(1, 0, "hello", value, System.currentTimeMillis(), 0)
+//        Assert.assertNotNull(setObj.err)
+//    }
+//
+//    @Test
+//    fun testSetWithStaleVersionFails() {
+//        val value = "hello".toByteArray()
+//        val setObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        val setStaleObj = store!!.set(0, 0, "hello", value, System.currentTimeMillis(), 0)
+//        Assert.assertNull(setObj.err)
+//        Assert.assertEquals(CompletionObject.RemoteKVStoreError.conflict, setStaleObj.err)
+//    }
+//
+//    @Test
+//    fun testGetNonExistentKeyFails() {
+//        val `object` = store!!["hello", 0]
+//        val getKv = `object`.kv
+//        Assert.assertNull(getKv)
+//    }
+//
+//    @Test
+//    fun testGetNonExistentKeyVersionFails() {
+//        val `object` = store!!["hello", 1]
+//        val getKv = `object`.kv
+//
+//        Assert.assertNull(getKv)
+//    }
+//
+//    @Test
+//    fun testGetAllKeys() {
+//        val value = "hello".toByteArray()
+//        val time = System.currentTimeMillis()
+//        val setObj = store!!.set(0, 0, "hello", value, time, 0)
+//        val list = store!!.rawKVs
+//
+//        Assert.assertNotNull(list)
+//        Assert.assertEquals(1, list.size.toLong())
+//        Assert.assertEquals("hello", list[0].key)
+//        Assert.assertEquals(setObj.version, list[0].version)
+//        Assert.assertEquals(setObj.time.toDouble(), list[0].time.toDouble(), 0.001)
+//        Assert.assertEquals(0, list[0].remoteVersion)
+//        Assert.assertEquals(0, list[0].deleted.toLong())
+//    }
+//
+//    @Test
+//    fun testSetRemoteVersion() {
+//        val value = "hello".toByteArray()
+//        val time = System.currentTimeMillis()
+//        val setObj = store!!.set(0, 0, "hello", value, time, 0)
+//        val setRemoteVersionObj = store!!.setRemoteVersion("hello", setObj.version, 1)
+//        Assert.assertEquals(setRemoteVersionObj.version, setObj.version + 1)
+//        val remoteVer = store!!.remoteVersion("hello")
+//        Assert.assertEquals(1, remoteVer)
+//    }
+//
+//    @Test
+//    fun testBasicSyncGetAllObjects() {
+//        val success = store!!.syncAllKeys()
+//        Assert.assertEquals(true, success)
+//
+//        val localKeys = store!!.rawKVs
+//        Assert.assertEquals(
+//            ((remote as MockUpAdapter).remoteKVs.size - 1).toLong(),
+//            localKeys.size.toLong()
+//        )
+//        assertDatabasesAreSynced()
+//    }
+//
+//    @Test
+//    fun testSyncTenTimes() {
+//        var n = 10
+//        while (n > 0) {
+//            val success = store!!.syncAllKeys()
+//            Assert.assertTrue(success)
+//            n--
+//        }
+//        assertDatabasesAreSynced()
+//    }
+//
+//    @Test
+//    fun testSyncAddsLocalKeysToRemote() {
+//        val setObj =
+//            store!!.set(KVItem(0, -1, "derp", "derp".toByteArray(), System.currentTimeMillis(), 0))
+//        Assert.assertNull(setObj.err)
+//        val success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        val obj = remote["derp", 1]
+//        Assert.assertArrayEquals(
+//            ReplicatedKVStore.decrypt(obj.value, mActivityRule.getActivity()),
+//            "derp".toByteArray()
+//        )
+//    }
+//
+//    @Test
+//    fun testSyncSavesRemoteVersion() {
+//        val success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        val ver = store!!.remoteVersion("hello")
+//        Assert.assertEquals((remote as MockUpAdapter).remoteKVs["hello"]!!.version, 1)
+//        Assert.assertEquals(remote.remoteKVs["hello"]!!.version, ver)
+//        assertDatabasesAreSynced()
+//    }
+//
+//    @Test
+//    fun testSyncPreventsAnotherConcurrentSync() {
+////        boolean success = store.syncAllKeys();
+////        new Thread(new Runnable() {
+////            @Override
+////            public void run() {
+////                boolean success = store.syncAllKeys();
+////                Assert.assertTrue(success);
+////                Assert.assertFalse(success);
+////            }
+////        }).start();
+////        Assert.assertTrue(success);
+//    }
+//
+//    @Test
+//    fun testLocalDeleteReplicates() {
+//        val setObj = store!!.set(
+//            KVItem(
+//                0,
+//                0,
+//                "goodbye_cruel_world",
+//                "goodbye_cruel_world".toByteArray(),
+//                System.currentTimeMillis(),
+//                0
+//            )
+//        )
+//        Assert.assertNull(setObj.err)
+//        var success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        val delObj = store!!.delete(
+//            "goodbye_cruel_world",
+//            store!!.localVersion("goodbye_cruel_world").version
+//        )
+//        Assert.assertNull(delObj.err)
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        val kv = (remote as MockUpAdapter).remoteKVs["goodbye_cruel_world"]
+//        Assert.assertTrue(kv!!.deleted > 0)
+//    }
+//
+//    @Test
+//    fun testLocalUpdateReplicates() {
+//        var setObj = store!!.set(
+//            KVItem(
+//                0,
+//                -1,
+//                "goodbye_cruel_world",
+//                "goodbye_cruel_world".toByteArray(),
+//                System.currentTimeMillis(),
+//                0
+//            )
+//        )
+//        var success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        setObj = store!!.set(
+//            KVItem(
+//                store!!.localVersion("goodbye_cruel_world").version,
+//                -1,
+//                "goodbye_cruel_world",
+//                "goodbye_cruel_world with some new info".toByteArray(),
+//                System.currentTimeMillis(),
+//                0
+//            )
+//        )
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        Assert.assertArrayEquals(
+//            "goodbye_cruel_world with some new info".toByteArray(), ReplicatedKVStore.decrypt(
+//                remote["goodbye_cruel_world", store!!.remoteVersion("goodbye_cruel_world")].value,
+//                mActivityRule.getActivity()
+//            )
+//        )
+//    }
+//
+//    @Test
+//    fun testRemoteDeleteReplicates() {
+//        var success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        val kv = (remote as MockUpAdapter).remoteKVs["hello"]
+//        remote.remoteKVs["hello"] =
+//            KVItem(kv!!.version + 1, -1, kv.key, kv.value, System.currentTimeMillis(), 1)
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//        val getObj = store!!["hello", 0]
+//        Assert.assertNull(getObj.err)
+//        Assert.assertTrue(getObj.kv.deleted > 0)
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//    }
+//
+//    @Test
+//    fun testRemoteUpdateReplicates() {
+//        var success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//
+//        val kv = (remote as MockUpAdapter).remoteKVs["hello"]
+//        remote.remoteKVs["hello"] =
+//            KVItem(
+//                kv!!.version + 1,
+//                -1,
+//                kv.key,
+//                ReplicatedKVStore.encrypt("newVal".toByteArray(), mActivityRule.getActivity()),
+//                System.currentTimeMillis(),
+//                0
+//            )
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//
+//        val getObj = store!!["hello", 0]
+//        Assert.assertNull(getObj.err)
+//        Assert.assertArrayEquals(getObj.kv.value, "newVal".toByteArray())
+//        success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        assertDatabasesAreSynced()
+//    }
+//
+//    @Test
+//    fun testEnableEncryptedReplication() {
+//        (remote as MockUpAdapter).remoteKVs.clear()
+//        val setObj =
+//            store!!.set(KVItem(0, 0, "derp", "derp".toByteArray(), System.currentTimeMillis(), 0))
+//        Assert.assertNull(setObj.err)
+//        val success = store!!.syncAllKeys()
+//        Assert.assertTrue(success)
+//        val obj = remote["derp", 1]
+//        Assert.assertArrayEquals(
+//            ReplicatedKVStore.decrypt(obj.value, mActivityRule.getActivity()),
+//            "derp".toByteArray()
+//        )
+//    }
+//
+//    @Test
+//    fun testGetAllMds() {
+//        store!![0, 1, "Key1", "Key1".toByteArray(), System.currentTimeMillis()] =
+//            0
+//        store!!.set(KVItem(0, 1, "Key2", "Key2".toByteArray(), System.currentTimeMillis(), 2))
+//        store!!.set(
+//            arrayOf(
+//                KVItem(0, 4, "fdf-gsd34534", "second".toByteArray(), System.currentTimeMillis(), 2),
+//                KVItem(
+//                    0,
+//                    2,
+//                    "fsdtxn2-fdslkjf34",
+//                    "ignore".toByteArray(),
+//                    System.currentTimeMillis(),
+//                    0
+//                )
+//            )
+//        )
+//        store!!.set(
+//            Arrays.asList(
+//                *arrayOf(
+//                    KVItem(0, 4, "Key5", "Key5".toByteArray(), System.currentTimeMillis(), 1),
+//                    KVItem(0, 5, "Key6", "Key6".toByteArray(), System.currentTimeMillis(), 5)
+//                )
+//            )
+//        )
+//        val kvs = store!!.rawKVs
+//        Assert.assertEquals(kvs.size.toLong(), 6)
+//
+//        val tx = TxMetaData()
+//        val theHash = byteArrayOf(3, 5, 64, 2, 4, 5, 63, 7, 0, 56, 34)
+//        tx.blockHeight = 123
+//        tx.classVersion = 3
+//        tx.comment = "hehey !"
+//        tx.creationTime = 21324
+//        tx.deviceId = "someDevice2324"
+//        tx.fee = 234
+//        tx.txSize = 23423
+//        tx.exchangeCurrency = "curr"
+//        tx.exchangeRate = 23.4343
+//        KVStoreManager.getInstance().putTxMetaData(mActivityRule.getActivity(), tx, theHash)
+//        val items = store!!.rawKVs
+//        Assert.assertEquals(7, items.size.toLong())
+//
+//        val mds = KVStoreManager.getInstance().getAllTxMD(mActivityRule.getActivity())
+//        Assert.assertEquals(mds.size.toLong(), 1)
+//
+//        //        Assert.assertEquals(mds.(0).blockHeight, 123);
+////        Assert.assertEquals(mds.get(0).classVersion, 3);
+////        Assert.assertEquals(mds.get(0).comment, "hehey !");
+////        Assert.assertEquals(mds.get(0).creationTime, 21324);
+////        Assert.assertEquals(mds.get(0).deviceId, "someDevice2324");
+////        Assert.assertEquals(mds.get(0).fee, 234);
+////        Assert.assertEquals(mds.get(0).txSize, 23423);
+////        Assert.assertEquals(mds.get(0).exchangeCurrency, "curr");
+////        Assert.assertEquals(mds.get(0).exchangeRate, 23.4343, 0);
+//    }
+//
+//    @Test
+//    fun testEncryptDecrypt() {
+//        val data =
+//            "Ladies and Gentlemen of the class of '99: If I could offer you only one tip for the future, " +
+//                    "sunscreen would be it."
+//        val encryptedData =
+//            ReplicatedKVStore.encrypt(data.toByteArray(), mActivityRule.getActivity())
+//
+//        Assert.assertTrue(encryptedData != null && encryptedData.size > 0)
+//
+//        val decryptedData = ReplicatedKVStore.decrypt(encryptedData, mActivityRule.getActivity())
+//
+//        Assert.assertNotEquals(encryptedData, decryptedData)
+//
+//        Assert.assertArrayEquals(decryptedData, data.toByteArray())
+//        Assert.assertEquals(String(decryptedData!!), data)
+//    }
+//
+//    @Test
+//    fun testKVManager() {
+//        val tx = TxMetaData()
+//        val theHash = byteArrayOf(3, 5, 64, 2, 4, 5, 63, 7, 0, 56, 34)
+//        tx.blockHeight = 123
+//        tx.classVersion = 3
+//        tx.comment = "hehey !"
+//        tx.creationTime = 21324
+//        tx.deviceId = "someDevice2324"
+//        tx.fee = 234
+//        tx.txSize = 23423
+//        tx.exchangeCurrency = "curr"
+//        tx.exchangeRate = 23.4343
+//        KVStoreManager.getInstance().putTxMetaData(mActivityRule.getActivity(), tx, theHash)
+//        val items = store!!.rawKVs
+//        Assert.assertEquals(1, items.size.toLong())
+//
+//        val newTx = KVStoreManager.getInstance().getTxMetaData(mActivityRule.getActivity(), theHash)
+//        Assert.assertEquals(newTx.blockHeight.toLong(), 123)
+//        Assert.assertEquals(newTx.classVersion.toLong(), 3)
+//        Assert.assertEquals(newTx.comment, "hehey !")
+//        Assert.assertEquals(newTx.creationTime.toLong(), 21324)
+//        Assert.assertEquals(newTx.deviceId, "someDevice2324")
+//        Assert.assertEquals(newTx.fee, 234)
+//        Assert.assertEquals(newTx.txSize.toLong(), 23423)
+//        Assert.assertEquals(newTx.exchangeCurrency, "curr")
+//        Assert.assertEquals(newTx.exchangeRate, 23.4343, 0.0)
+//    } //((MockUpAdapter) remote).remoteKVs.size()
+//
+//    companion object {
+//        val TAG: String = KVStoreTests::class.java.name
+//
+//        @ClassRule
+//        var mActivityRule: ActivityTestRule<WriteDownActivity> =
+//            ActivityTestRule<WriteDownActivity>(
+//                WriteDownActivity::class.java
+//            )
+//        private val remote: KVStoreAdaptor = MockUpAdapter()
+//        private var store: ReplicatedKVStore? = null
+//    }
+//}
+//
+//}
\ No newline at end of file
diff --git a/app/src/test/java/com/litewallet/tools/security/NewKeyStoreTests.kt b/app/src/test/java/com/litewallet/tools/security/NewKeyStoreTests.kt
new file mode 100644
index 000000000..05181f696
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/security/NewKeyStoreTests.kt
@@ -0,0 +1,190 @@
+package com.litewallet.tools.security
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+class NewKeyStoreTests {
+}
+
+//package com.litewallet.security;
+//
+//import android.app.Activity;
+//import android.security.keystore.UserNotAuthenticatedException;
+//import androidx.test.rule.ActivityTestRule;
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//
+//import com.breadwallet.presenter.activities.settings.TestActivity;
+//import com.breadwallet.tools.security.BRKeyStore;
+//
+//import org.junit.Assert;
+//import org.junit.Before;
+//import org.junit.Rule;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import static com.breadwallet.tools.security.BRKeyStore.PHRASE_ALIAS;
+//import static com.breadwallet.tools.security.BRKeyStore.aliasObjectMap;
+//
+//@RunWith(AndroidJUnit4.class)
+//        public class NewKeyStoreTests {
+//    public static final String TAG = NewKeyStoreTests.class.getName();
+//
+//    @Rule
+//    public ActivityTestRule<TestActivity> mActivityRule = new ActivityTestRule<>(TestActivity.class);
+//
+//    @Before
+//    public void setup() {
+//        BRKeyStore.resetWalletKeyStore(mActivityRule.getActivity());
+//    }
+//
+//    @Test
+//    public void testBase64() {
+//        Activity app = mActivityRule.getActivity();
+//        String temp = "here is some data to encrypt! @#$%^&*";
+//        byte[] phrase = temp.getBytes();
+//        BRKeyStore.storeEncryptedData(app, phrase, "phrase");
+//        byte[] retrievedPhrase = BRKeyStore.retrieveEncryptedData(app, "phrase");
+//        Assert.assertNotNull(retrievedPhrase);
+//        Assert.assertArrayEquals("Oh no", phrase, retrievedPhrase);
+//        String newTemp = new String(retrievedPhrase);
+//        Assert.assertEquals(temp, newTemp);
+//
+//    }
+//
+//    @Test
+//    public void setNewGetNew() {
+//        //set get phrase
+//        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
+//        try {
+//            boolean b = BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
+//            Assert.assertEquals(true, b);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//            Assert.assertNotNull(getPhrase);
+//            Assert.assertEquals(new String(getPhrase), new String(phrase));
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//    }
+//
+//    @Test
+//    public void setOldSetNew() {
+//        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
+//        BRKeyStore.AliasObject obj = aliasObjectMap.get(PHRASE_ALIAS);
+//        try {
+//            boolean b = BRKeyStore._setOldData(mActivityRule.getActivity(), phrase, obj.alias, obj.datafileName, obj.ivFileName, 0, true);
+//            Assert.assertEquals(true, b);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
+//            Assert.assertNotNull(getPhrase);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//        try {
+//            boolean b = BRKeyStore.putPhrase(phrase, mActivityRule.getActivity(), 0);
+//            Assert.assertEquals(true, b);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//        try {
+//            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
+//            Assert.assertNull(getPhrase);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//        try {
+//            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//            Assert.assertNotNull(getPhrase);
+//            Assert.assertEquals(new String(getPhrase), new String(phrase));
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//    }
+//
+//    @Test
+//    public void setOldGetNew() {
+//
+//        //set get phrase
+//        byte[] phrase = "axis husband project any sea patch drip tip spirit tide bring belt".getBytes();
+//        BRKeyStore.AliasObject obj = aliasObjectMap.get(PHRASE_ALIAS);
+//        try {
+//            boolean s = BRKeyStore._setOldData(mActivityRule.getActivity(), phrase, obj.alias, obj.datafileName, obj.ivFileName, 0, true);
+//            Assert.assertEquals(true, s);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//            Assert.assertNotNull(getPhrase);
+//            Assert.assertEquals(new String(getPhrase), new String(phrase));
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//            Assert.assertNotNull(getPhrase);
+//            Assert.assertEquals(new String(getPhrase), new String(phrase));
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore._getOldData(mActivityRule.getActivity(), obj.alias, obj.datafileName, obj.ivFileName, 0);
+//            Assert.assertNull(getPhrase);
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//        try {
+//            byte[] getPhrase = BRKeyStore.getPhrase(mActivityRule.getActivity(), 0);
+//            Assert.assertNotNull(getPhrase);
+//            Assert.assertEquals(new String(getPhrase), new String(phrase));
+//        } catch (UserNotAuthenticatedException e) {
+//            e.printStackTrace();
+//            Assert.fail();
+//        }
+//
+//    }
+//
+//    @Test
+//    public void allMultiThreading() {
+//        for (int i = 0; i < 10; i++) {
+//            setup();
+//            setNewGetNew();
+//            setup();
+//            setOldGetNew();
+//            setup();
+//            setOldSetNew();
+//            setup();
+//
+//        }
+//
+//    }
+//
+//}
diff --git a/app/src/test/java/com/litewallet/tools/security/ReplicatedKVStoreTest.kt b/app/src/test/java/com/litewallet/tools/security/ReplicatedKVStoreTest.kt
new file mode 100644
index 000000000..058fa5a54
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/security/ReplicatedKVStoreTest.kt
@@ -0,0 +1,4 @@
+package com.litewallet.tools.security
+
+//TODO: pls fill this
+class ReplicatedKVStoreTest 
\ No newline at end of file
diff --git a/app/src/test/java/com/litewallet/tools/util/BRConstantsTest.kt b/app/src/test/java/com/litewallet/tools/util/BRConstantsTest.kt
new file mode 100644
index 000000000..ce7bf0bfe
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/util/BRConstantsTest.kt
@@ -0,0 +1,108 @@
+package com.litewallet.tools.util
+
+import com.breadwallet.tools.util.BRConstants
+import org.junit.Assert
+import org.junit.Assert.assertSame
+
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+//TODO: migrate from [com.litewallet.analytics.ConstantsTests]
+class BRConstantsTest {
+
+    @Test
+    fun `validate Litecoin symbol constant`() {
+        assertSame(BRConstants.litecoinLowercase,"ł")
+        assertSame(BRConstants.litecoinUppercase,"Ł")
+    }
+}
+
+
+//package com.litewallet.analytics;
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//import android.util.Log;
+//import androidx.test.ext.junit.rules.ActivityScenarioRule;
+//
+//import com.breadwallet.presenter.activities.intro.IntroActivity;
+//import com.breadwallet.tools.util.BRConstants;
+//
+//import org.junit.After;
+//import org.junit.Assert;
+//import org.junit.Before;
+//import org.junit.Rule;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import java.net.URI;
+//
+//@Deprecated
+//@RunWith(AndroidJUnit4.class)
+//        public class ConstantsTests {
+//    public static final String TAG = ConstantsTests.class.getName();
+//    @Rule
+//    public ActivityScenarioRule<IntroActivity> mActivityRule = new ActivityScenarioRule<>(IntroActivity.class);
+//    @Before
+//    public void setUp() {
+//        Log.e(TAG, "setUp: ");
+//    }
+//
+//    @After
+//    public void tearDown() {
+//    }
+//    @Test
+//    public void testLitecoinSymbolConstants() {
+//        Assert.assertSame(BRConstants.litecoinLowercase,"ł");
+//        Assert.assertSame(BRConstants.litecoinUppercase,"Ł");
+//    }
+//    @Test
+//    public void testAppExternalURLConstants() {
+//        Assert.assertSame(BRConstants.TWITTER_LINK,"https://twitter.com/Litewallet_App");
+//        Assert.assertSame(BRConstants.INSTAGRAM_LINK,"https://www.instagram.com/litewallet.app");
+//        Assert.assertSame(BRConstants.WEB_LINK,"https://litewallet.io");
+//        Assert.assertSame(BRConstants.TOS_LINK,"https://litewallet.io/privacy");
+//        Assert.assertSame(BRConstants.CUSTOMER_SUPPORT_LINK,"https://support.litewallet.io/hc/en-us/requests/new");
+//        Assert.assertSame(BRConstants.BITREFILL_AFFILIATE_LINK,"https://www.bitrefill.com/");
+//    }
+//    @Test
+//    public void testFirebaseAnalyticsConstants() {
+//        Assert.assertSame(BRConstants._20191105_AL,"app_launched");
+//        Assert.assertSame(BRConstants._20191105_VSC,"visit_send_controller");
+//        Assert.assertSame(BRConstants._20202116_VRC,"visit_receive_controller");
+//        Assert.assertSame(BRConstants._20191105_DSL,"did_send_ltc");
+//        Assert.assertSame(BRConstants._20191105_DTBT,"did_tap_buy_tab");
+//        Assert.assertSame(BRConstants._20200111_RNI,"rate_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_FNI,"feeperkb_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_TNI,"transaction_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_WNI,"wallet_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_PNI,"phrase_not_initialized");
+//        Assert.assertSame(BRConstants._20200111_UTST,"unable_to_sign_transaction");
+//        Assert.assertSame(BRConstants._20200112_ERR,"error");
+//        Assert.assertSame(BRConstants._20200112_DSR,"did_start_resync");
+//        Assert.assertSame(BRConstants._20200125_DSRR,"did_show_review_request");
+//        Assert.assertSame(BRConstants._20201118_DTGS,"did_tap_get_support");
+//        Assert.assertSame(BRConstants._20200217_DUWP,"did_unlock_with_pin");
+//        Assert.assertSame(BRConstants._20200217_DUWB,"did_unlock_with_biometrics");
+//        Assert.assertSame(BRConstants._20200301_DUDFPK,"did_use_default_fee_per_kb");
+//        Assert.assertSame(BRConstants._20201121_SIL,"started_IFPS_lookup");
+//        Assert.assertSame(BRConstants._20201121_DRIA,"did_resolve_IPFS_address");
+//        Assert.assertSame(BRConstants._20201121_FRIA,"failed_resolve_IPFS_address");
+//        Assert.assertSame(BRConstants._20200207_DTHB,"did_tap_header_balance");
+//        Assert.assertSame(BRConstants._20210427_HCIEEH,"heartbeat_check_if_event_even_happens");
+//        Assert.assertSame(BRConstants._20220822_UTOU,"user_tapped_on_ud");
+//        Assert.assertSame(BRConstants._20230131_NENR,"no_error_nominal_response");
+//        Assert.assertSame(BRConstants._20230407_DCS,"did_complete_sync");
+//        Assert.assertSame(BRConstants._20240123_RAGI,"registered_android_general_interest");
+//        Assert.assertSame(BRConstants._20231225_UAP,"user_accepted_push");
+//        Assert.assertSame(BRConstants._20240101_US,"user_signup");
+//        Assert.assertSame(BRConstants._20241006_DRR,"did_request_rating");
+//        Assert.assertSame(BRConstants._20241006_UCR,"user_completed_rating");
+//    }
+//}
diff --git a/app/src/test/java/com/litewallet/tools/util/Bip39ReaderTest.kt b/app/src/test/java/com/litewallet/tools/util/Bip39ReaderTest.kt
new file mode 100644
index 000000000..923a3b5d8
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/util/Bip39ReaderTest.kt
@@ -0,0 +1,4 @@
+package com.litewallet.tools.util
+
+//TODO: pls fill this
+class Bip39ReaderTest
\ No newline at end of file
diff --git a/app/src/test/java/com/breadwallet/tools/util/LocaleHelperTest.kt b/app/src/test/java/com/litewallet/tools/util/LocaleHelperTest.kt
similarity index 83%
rename from app/src/test/java/com/breadwallet/tools/util/LocaleHelperTest.kt
rename to app/src/test/java/com/litewallet/tools/util/LocaleHelperTest.kt
index 1e0a23747..78b2bfa99 100644
--- a/app/src/test/java/com/breadwallet/tools/util/LocaleHelperTest.kt
+++ b/app/src/test/java/com/litewallet/tools/util/LocaleHelperTest.kt
@@ -1,11 +1,22 @@
-package com.breadwallet.tools.util
+package com.litewallet.tools.util
 
 import android.content.Context
 import com.breadwallet.entities.Language
+import com.breadwallet.tools.util.LocaleHelper
 import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
+
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class LocaleHelperTest {
diff --git a/app/src/test/java/com/litewallet/tools/util/SeedWordTests.kt b/app/src/test/java/com/litewallet/tools/util/SeedWordTests.kt
new file mode 100644
index 000000000..e7f7c12a0
--- /dev/null
+++ b/app/src/test/java/com/litewallet/tools/util/SeedWordTests.kt
@@ -0,0 +1,89 @@
+package com.litewallet.tools.util
+
+
+class SeedWordTests {
+}
+
+//
+//
+//package com.litewallet;
+//
+//import android.util.Log;
+//
+//import com.breadwallet.tools.util.Bip39Reader;
+//import com.breadwallet.wallet.BRWalletManager;
+//
+//import org.apache.commons.io.IOUtils;
+//import org.junit.Assert;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import static org.hamcrest.Matchers.is;
+//import static org.hamcrest.Matchers.notNullValue;
+//import static org.junit.Assert.assertThat;
+//
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//import androidx.test.filters.LargeTest;
+//
+//@RunWith(AndroidJUnit4.class)
+//    @LargeTest
+//
+//    public class PaperKeyTests {
+//        private static final String TAG = PaperKeyTests.class.getName();
+//        public static final List<String> PAPER_KEY_ENG =  Arrays.asList("stick","sword","keen","afraid","smile","sting","huge","relax","nominee","arena","area","gift");
+//
+//        @Test
+//        public void testWordsValid() {
+//            List<String> wordList = getAllWords();
+//            Assert.assertEquals(wordList.size(), 2048);
+//            Assert.assertSame(PAPER_KEY_ENG.containsAll(wordList),true);
+//        }
+//        @Test
+//        public void testPaperKeyValidation() {
+//            List<String> list = getAllWords();
+//            assertThat(list.size(), is(2048));
+//        }
+//
+//        private List<String> getAllWords() {
+//            List<String> result = new ArrayList<>();
+//            List<String> names = new ArrayList<>();
+//            names.add("en-BIP39Words.txt");
+//
+//            for (String fileName : names) {
+//                InputStream in = null;
+//                try {
+//                    in = getClass().getResourceAsStream(fileName);
+//                    String str = IOUtils.toString(in);
+//                    String lines[] = str.split("\\r?\\n");
+//                    result.addAll(Arrays.asList(lines));
+//                } catch (IOException e) {
+//                    Log.e(TAG, "getAllWords: " + fileName + ", ", e);
+//                } finally {
+//                    if (in != null) try {
+//                        in.close();
+//                    } catch (IOException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//            }
+//            List<String> cleanList = new ArrayList<>();
+//            for (String s : result) {
+//                String cleanWord = Bip39Reader.cleanWord(s);
+//                cleanList.add(cleanWord);
+//            }
+//            assertThat(cleanList.size(), is(2048));
+//            return cleanList;
+//        }
+//
+//        private boolean isValid(String phrase, List<String> words) {
+//
+//            return BRWalletManager.getInstance().validateRecoveryPhrase((String[]) words.toArray(), phrase);
+//        }
+//
+//    }