diff --git a/squarenotsquare/__mock__/mockKeyStore.js b/squarenotsquare/__mock__/mockKeyStore.js
index 4f681f4..60369e3 100644
--- a/squarenotsquare/__mock__/mockKeyStore.js
+++ b/squarenotsquare/__mock__/mockKeyStore.js
@@ -1,32 +1,29 @@
-class MockKeyStore {
-  async remove(key) {
-    if (key === 'notakey') {
-      throw ('Key not found');
-    }
-    return true;
+
+export async function resetInternetCredentials(key) {
+  if (key === 'notakey') {
+    throw ('Key not found');
   }
+  return true;
+}
   
-  async set(key, value) {
-    if (key === 'savefailed'){
-      throw ('Failed to save key');
-    }
-    return true;
+export async function setInternetCredentials(key, value, placeholder) {
+  if (key === 'savefailed'){
+    throw ('Failed to save key');
   }
-  
-  async get(key) {
-    if (key === 'isNull'){
-      return null;
-    } else if (key === 'negTest') {
-      return '-1';
-    } else if (key === 'notakey') {
-      throw ('Key not found');
-    } else {
-      return '1234567890';
-    }
-  } 
+  return true;
 }
 
-export default RNSecureKeyStore = new MockKeyStore();
+export async function getInternetCredentials(key) {
+  if (key === 'isNull'){
+    return false;
+  } else if (key === 'negTest') {
+    return {username: '-1'};
+  } else if (key === 'notakey') {
+    throw ('Key not found');
+  } else {
+    return {username: '1234567890'};
+  }
+} 
 
 export const ACCESSIBLE = {
   AFTER_FIRST_UNLOCK :'AccessibleAfterFirstUnlock',
diff --git a/squarenotsquare/jest.config.js b/squarenotsquare/jest.config.js
index 9e0fac9..3b8666c 100644
--- a/squarenotsquare/jest.config.js
+++ b/squarenotsquare/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
   moduleDirectories: ['node_modules', 'src'],
   moduleNameMapper: {
     // '@react-native-firebase/messaging: '<rootDir>/__mock__/mockFirebase.js',
-    'react-native-secure-key-store': '<rootDir>/__mock__/mockKeyStore.js',
+    'react-native-keychain': '<rootDir>/__mock__/mockKeyStore.js',
     '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/__mock__/file.js',
     '^(realm)': '<rootDir>/__mock__/mockRealmObject'
   },
diff --git a/squarenotsquare/src/realm/DbInit.js b/squarenotsquare/src/realm/DbInit.js
index d0ceb7a..d67ac30 100644
--- a/squarenotsquare/src/realm/DbInit.js
+++ b/squarenotsquare/src/realm/DbInit.js
@@ -22,14 +22,14 @@ export async function initDB(dbKeyRef = 'squareDB', dbLocation = Realm.defaultPa
   try {
     let fromStore = await KeyStore.getKey(dbKeyRef);
 
-    if (fromStore === null) {
+    if (fromStore === false) {
       let newKey = generateKey();
       await KeyStore.setKey(dbKeyRef, newKey);
-      fromStore = await KeyStore.getKey(dbKeyRef);
+      fromStore = newKey;
     }
 
     let dbKey = new Uint8Array(64);
-    if (fromStore !== null){
+    if (fromStore !== false){
       for (let i = 0; i < 64; ++i){
         dbKey[i] = fromStore.charAt(i);
       }
diff --git a/squarenotsquare/src/services/Keystore.js b/squarenotsquare/src/services/Keystore.js
index 6b5f696..32d4f37 100644
--- a/squarenotsquare/src/services/Keystore.js
+++ b/squarenotsquare/src/services/Keystore.js
@@ -39,7 +39,11 @@ export async function getKey(key) {
   let value = null;
   await getInternetCredentials(key).then(
     (res) => {
-      value = res.username;
+      if (res === false) {
+        value = false;
+      } else {
+        value = res.username;
+      }
     },
     (err) => {
       value = null;