diff --git a/.github/workflows/android-ubuntu-integration-test-actions.yaml b/.github/workflows/android-ubuntu-integration-test-actions.yaml
index dd98d3612..33bddaaa3 100644
--- a/.github/workflows/android-ubuntu-integration-test-actions.yaml
+++ b/.github/workflows/android-ubuntu-integration-test-actions.yaml
@@ -100,6 +100,7 @@ jobs:
     needs: android-ubuntu-integration-test-actions-avd-cache
     runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
         test: ["offline_testsuite", "execute_sync_from_seed", "execute_send_from_orchard", "execute_currentprice_and_value_transfers_from_seed", "execute_sapling_balance_from_seed"]
     env:
diff --git a/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap b/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap
index cbd99cd18..a4192c634 100644
--- a/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap
@@ -140,6 +140,7 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
         "maxHeight": "85%",
       }
     }
+    testID="syncreport.scroll-view"
   >
     <View>
       <View
diff --git a/app/LoadingApp/LoadingApp.tsx b/app/LoadingApp/LoadingApp.tsx
index 0307ad968..5b6bed47c 100644
--- a/app/LoadingApp/LoadingApp.tsx
+++ b/app/LoadingApp/LoadingApp.tsx
@@ -591,7 +591,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
             type: state.type,
             isConnectionExpensive: state.details && state.details.isConnectionExpensive,
           },
-          screen: screen !== 0 ? 1 : 0,
+          screen: screen === 3 ? 3 : screen !== 0 ? 1 : 0,
           actionButtonsDisabled: true,
         });
         if (isConnected !== state.isConnected) {
@@ -1316,7 +1316,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
                   {netInfo.isConnected && (
                     <View style={{ marginTop: 20, display: 'flex', alignItems: 'center' }}>
                       <Button
-                        testID="loadingapp.restorewalletseed"
+                        testID="loadingapp.restorewalletseedufvk"
                         type={ButtonTypeEnum.Secondary}
                         title={translate('loadingapp.restorewalletseedufvk') as string}
                         disabled={actionButtonsDisabled}
diff --git a/components/SyncReport/SyncReport.tsx b/components/SyncReport/SyncReport.tsx
index 7256523d0..5873b3eb2 100644
--- a/components/SyncReport/SyncReport.tsx
+++ b/components/SyncReport/SyncReport.tsx
@@ -232,6 +232,7 @@ const SyncReport: React.FunctionComponent<SyncReportProps> = ({ closeModal }) =>
       />
 
       <ScrollView
+        testID="syncreport.scroll-view"
         style={{ maxHeight: '85%' }}
         contentContainerStyle={{
           flexDirection: 'column',
@@ -444,7 +445,7 @@ const SyncReport: React.FunctionComponent<SyncReportProps> = ({ closeModal }) =>
                           margin: 5,
                         }}
                       />
-                      <Text style={{ color: colors.text }}>
+                      <Text testID="syncreport.wallettotalblocks" style={{ color: colors.text }}>
                         {serverWallet + (translate('report.blocks') as string)}
                       </Text>
                     </View>
diff --git a/e2e/change_custom_regtest_server.test.js b/e2e/change_custom_regtest_server.test.js
index d1f6b4c12..8e844f4c7 100644
--- a/e2e/change_custom_regtest_server.test.js
+++ b/e2e/change_custom_regtest_server.test.js
@@ -6,7 +6,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Change the Server.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('Go settings & change to a correct Testnet server URI.', async () => {
     //await sleep(4000);
 
diff --git a/e2e/change_custom_server.test.js b/e2e/change_custom_server.test.js
index b9b0b51e4..51e6c602e 100644
--- a/e2e/change_custom_server.test.js
+++ b/e2e/change_custom_server.test.js
@@ -1,4 +1,4 @@
-const { log, by, element } = require('detox');
+const { log, by, element, fail } = require('detox');
 
 import { loadTestWallet } from "./e2e-utils/loadTestWallet.js";
 
@@ -6,7 +6,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Change the Server.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('Go settings & change to a correct Mainnet server URI.', async () => {
     //await sleep(4000);
 
@@ -28,7 +28,7 @@ describe('Change the Server.', () => {
     // waiting for the custom server field
     await waitFor(element(by.id('settings.custom-server-field'))).toBeVisible()
           .whileElement(by.id('settings.scroll-view')).scroll(100, 'down');
-    await element(by.id("settings.custom-server-field")).replaceText('https://lwd1.zcash-infra.com:9067');
+    await element(by.id("settings.custom-server-field")).replaceText('https://lwd2.zcash-infra.com:9067');
 
     // waiting for the toggle, tap on mainnet
     await waitFor(element(by.id('settings.custom-server-chain.mainnet'))).toBeVisible()
@@ -65,7 +65,7 @@ describe('Change the Server.', () => {
 
     // the 2 blocks have to be greater then the 1 blocks
     if (!(blockssyncednowNum_2 > blockssyncednowNum_1)) {
-      fail('The sync process is not progressing.');
+      throw new Error('The sync process is not progressing.');
     }
   });
 });
diff --git a/e2e/change_custom_testnet_server.test.js b/e2e/change_custom_testnet_server.test.js
index 522915a59..d68649060 100644
--- a/e2e/change_custom_testnet_server.test.js
+++ b/e2e/change_custom_testnet_server.test.js
@@ -6,7 +6,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Change the Server.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('Go settings & change to a correct Testnet server URI.', async () => {
     //await sleep(4000);
 
diff --git a/e2e/change_server_from_list.test.js b/e2e/change_server_from_list.test.js
index eb96e2476..ff09c62e3 100644
--- a/e2e/change_server_from_list.test.js
+++ b/e2e/change_server_from_list.test.js
@@ -1,4 +1,4 @@
-const { log, by, element } = require('detox');
+const { log, by, element, fail } = require('detox');
 
 import { loadTestWallet } from "./e2e-utils/loadTestWallet.js";
 
@@ -6,7 +6,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Change the Server from the list.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('Go settings & change to an existent server in the list.', async () => {
     //await sleep(4000);
 
@@ -48,7 +48,7 @@ describe('Change the Server from the list.', () => {
     log.info('blocks 1:', blockssyncednowNum_1);
 
     // wait a little bit
-    await sleep(25000);
+    await sleep(40000);
 
     // getting blocks now synced from the screen
     const blockssyncednow_2 = element(by.id('syncreport.syncednow'));
@@ -59,7 +59,7 @@ describe('Change the Server from the list.', () => {
 
     // the 2 blocks have to be greater then the 1 blocks
     if (!(blockssyncednowNum_2 > blockssyncednowNum_1)) {
-      fail('The sync process is not progressing.');
+      throw new Error('The sync process is not progressing.');
     }
   });
 });
diff --git a/e2e/darkside_simple_sync.test.js b/e2e/darkside_simple_sync.test.js
index d32d1ce9f..28c799889 100644
--- a/e2e/darkside_simple_sync.test.js
+++ b/e2e/darkside_simple_sync.test.js
@@ -5,7 +5,7 @@ import { loadDarksideWallet } from "./e2e-utils/loadDarksideWallet.js";
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Syncs a darkside chain', () => {
-  it('loads the wallet', loadDarksideWallet);
+  it('loads the wallet', async () => await loadDarksideWallet());
   it('should sync the darkside chain', async () => {
     // wait for fully synced.
     //await sleep(4000);
diff --git a/e2e/e2e-utils/loadDarksideWallet.js b/e2e/e2e-utils/loadDarksideWallet.js
index 6d6187857..59320c0a7 100644
--- a/e2e/e2e-utils/loadDarksideWallet.js
+++ b/e2e/e2e-utils/loadDarksideWallet.js
@@ -4,7 +4,7 @@
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 let loadDarksideWallet = async () => {
-  await sleep(5000);
+  await sleep(2000);
   
   // the start always is like a fress install -> create a new wallet
   // go to setting modal screen
@@ -55,16 +55,16 @@ let loadDarksideWallet = async () => {
   await element(by.text('CONFIRM')).tap();
 
   // restore from seed
-  await waitFor(element(by.id('loadingapp.restorewalletseed'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("loadingapp.restorewalletseed")).tap();
-  await waitFor(element(by.id('seed.seedinput'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("seed.seedinput")).replaceText(
+  await waitFor(element(by.id('loadingapp.restorewalletseedufvk'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("loadingapp.restorewalletseedufvk")).tap();
+  await waitFor(element(by.id('import.seedufvkinput'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("import.seedufvkinput")).replaceText(
     'still champion voice habit trend flight survey between bitter process artefact blind carbon truly provide dizzy crush flush breeze blouse charge solid fish spread'
   );
-  await waitFor(element(by.id('seed.birthdayinput'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("seed.birthdayinput")).replaceText('0');
-  await waitFor(element(by.id('seed.button.ok'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id('seed.button.ok')).tap();
+  await waitFor(element(by.id('import.birthdayinput'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("import.birthdayinput")).replaceText('0');
+  await waitFor(element(by.id('import.button.ok'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id('import.button.ok')).tap();
 }
 
 export { loadDarksideWallet };
\ No newline at end of file
diff --git a/e2e/e2e-utils/loadRecipientWallet.js b/e2e/e2e-utils/loadRecipientWallet.js
index 926f9d8f2..10a7507aa 100644
--- a/e2e/e2e-utils/loadRecipientWallet.js
+++ b/e2e/e2e-utils/loadRecipientWallet.js
@@ -4,7 +4,7 @@
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 let loadRecipientWallet = async () => {
-  await sleep(5000);
+  await sleep(2000);
   
   // the start always is like a fress install -> create a new wallet
   // go to setting modal screen
@@ -54,18 +54,17 @@ let loadRecipientWallet = async () => {
   await waitFor(element(by.text('CONFIRM'))).toBeVisible().withTimeout(sync_timeout);
   await element(by.text('CONFIRM')).tap();
 
-
   // restore from seed
-  await waitFor(element(by.id('loadingapp.restorewalletseed'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("loadingapp.restorewalletseed")).tap();
-  await waitFor(element(by.id('seed.seedinput'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("seed.seedinput")).replaceText(
+  await waitFor(element(by.id('loadingapp.restorewalletseedufvk'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("loadingapp.restorewalletseedufvk")).tap();
+  await waitFor(element(by.id('import.seedufvkinput'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("import.seedufvkinput")).replaceText(
     'hospital museum valve antique skate museum unfold vocal weird milk scale social vessel identify crowd hospital control album rib bulb path oven civil tank'
   );
-  await waitFor(element(by.id('seed.birthdayinput'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id("seed.birthdayinput")).replaceText('1994579');
-  await waitFor(element(by.id('seed.button.ok'))).toBeVisible().withTimeout(sync_timeout);
-  await element(by.id('seed.button.ok')).tap();
+  await waitFor(element(by.id('import.birthdayinput'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id("import.birthdayinput")).replaceText('1994579');
+  await waitFor(element(by.id('import.button.ok'))).toBeVisible().withTimeout(sync_timeout);
+  await element(by.id('import.button.ok')).tap();
 }
 
 export { loadRecipientWallet };
\ No newline at end of file
diff --git a/e2e/e2e-utils/loadTestWallet.js b/e2e/e2e-utils/loadTestWallet.js
index a93a59614..d99801316 100644
--- a/e2e/e2e-utils/loadTestWallet.js
+++ b/e2e/e2e-utils/loadTestWallet.js
@@ -2,7 +2,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 let loadTestWallet = async () => {
   // waiting while app is detecting the best server
-  await sleep(5000);
+  await sleep(2000);
   
   // the start always is like a fresh install -> create a new wallet
   // go to setting modal screen
diff --git a/e2e/reload_while_tx_pending.test.js b/e2e/reload_while_tx_pending.test.js
index 014669d59..56c7ccd94 100644
--- a/e2e/reload_while_tx_pending.test.js
+++ b/e2e/reload_while_tx_pending.test.js
@@ -7,7 +7,7 @@ import { loadRecipientWallet } from "./e2e-utils/loadRecipientWallet.js";
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Maintains correct information while tx pending', () => {
-  it('loads the wallet', loadRecipientWallet);
+  it('loads the wallet', async () => await loadRecipientWallet());
   it('should send from orchard to sapling pool', async () => {
     // wait for fully synced.
     //await sleep(4000);
diff --git a/e2e/screen_awake.test.js b/e2e/screen_awake.test.js
index a049573b1..db973ee9b 100644
--- a/e2e/screen_awake.test.js
+++ b/e2e/screen_awake.test.js
@@ -1,4 +1,4 @@
-const { log, device, by, element } = require('detox');
+const { log, device, by, element, fail } = require('detox');
 const { spawnSync, execSync } = require('child_process');
 
 import { loadTestWallet } from "./e2e-utils/loadTestWallet.js";
@@ -7,7 +7,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Kepp the screen awake while syncing.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('When App is syncing -> The screen have to be awake all the time', async () => {
     //await sleep(4000);
     
@@ -18,7 +18,7 @@ describe('Kepp the screen awake while syncing.', () => {
     const resultSet = spawnSync('adb', ['-e', 'shell', 'settings', 'put', 'system', 'screen_off_timeout', '10000']);
 
     if (resultSet.status !== 0) {
-      fail(`Failed to execute SET command: ${resultSet.stderr}`);
+      throw new Error(`Failed to execute SET command: ${resultSet.stderr}`);
     }
 
     // put the App to sleep because we need some progress in the syncing for 20 seconds
@@ -30,21 +30,21 @@ describe('Kepp the screen awake while syncing.', () => {
 
     if (Number(t.toString().trim()) !== 10000) {
       spawnSync('adb', ['-e', 'shell', 'settings', 'put', 'system', 'screen_off_timeout', currentValue]);
-      fail('setting screen off timeout is not working, it is not 10000 (10 s.)');
+      throw new Error('setting screen off timeout is not working, it is not 10000 (10 s.)');
     }
 
     const resultGet = spawnSync('adb', ['-e', 'shell', 'dumpsys', 'power']);
 
     if (resultGet.status !== 0) {
       spawnSync('adb', ['-e', 'shell', 'settings', 'put', 'system', 'screen_off_timeout', currentValue]);
-      fail(`Failed to execute DUMPSYS POWER command: ${resultGet.stderr}`);
+      throw new Error(`Failed to execute DUMPSYS POWER command: ${resultGet.stderr}`);
     }
     const output = resultGet.stdout.toString();
     const isScreenAwake = output.includes('mWakefulness=Awake');
 
     if (!isScreenAwake) {
       spawnSync('adb', ['-e', 'shell', 'settings', 'put', 'system', 'screen_off_timeout', currentValue]);
-      fail('After 20 seconds (screen off timeout 10s) the screen is not awake.');
+      throw new Error('After 20 seconds (screen off timeout 10s) the screen is not awake.');
     }
     const r = spawnSync('adb', ['-e', 'shell', 'settings', 'put', 'system', 'screen_off_timeout', currentValue]);
     log.info(r);
diff --git a/e2e/send.test.js b/e2e/send.test.js
index 9e1a126cc..4f19d285a 100644
--- a/e2e/send.test.js
+++ b/e2e/send.test.js
@@ -1,25 +1,27 @@
 const { log, device, by, element, expect } = require('detox');
 
-import { loadTestWallet } from './e2e-utils/loadTestWallet.js';
+import { loadRecipientWallet } from './e2e-utils/loadRecipientWallet.js';
 
 const sleep = ms => new Promise(r => setTimeout(r, ms));
 
 describe('Renders wallet data correctly.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadRecipientWallet());
   it('adds return address to the memo if that option is selected, and correctly renders confirm screen', async () => {
     await element(by.text('SEND')).tap();
 
     await element(by.id('send.addressplaceholder')).replaceText(
       'u1lx7nlnqqqs7p4hcqz4hyjgnw7h8zskcgr2f8dfhm96np0gnfdzu7jtms7q2pxd7ufy96wxzdsdy65jvp3td7fj2ltcz0jpak86ddyszl9ykn5s86q3xataya5867z3tj2x8cw0ljyrenymr2gcqmjf50gmexqj233yn3kdaxn2yukwcx87emurufakf82wapgnu5h3fvae6aw9uus2r',
     );
-    await element(by.id('send.amount')).replaceText('0');
+    //await element(by.id('send.amount')).replaceText('0');
+    //await element(by.id('send.scroll-view')).scrollTo('bottom');
+    await waitFor(element(by.id('send.checkboxua'))).toBeVisible().withTimeout(sync_timeout);
     await element(by.id('send.checkboxua')).tap();
     await element(by.id('send.scroll-view')).scrollTo('bottom');
     await element(by.id('send.memo-field')).replaceText('1\n2\n3\n4\n5\n6\n7\n8');
     await element(by.id('send.scroll-view')).scrollTo('bottom');
 
-    await waitFor(element(by.id('send.button'))).toBeVisible();
+    await waitFor(element(by.id('send.button'))).toBeVisible().withTimeout(sync_timeout);
     await element(by.id('send.button')).tap();
 
     await expect(element(by.id('send.confirm.scroll-view'))).toExist();
diff --git a/e2e/sync_report.test.js b/e2e/sync_report.test.js
index db4126678..a39e5f860 100644
--- a/e2e/sync_report.test.js
+++ b/e2e/sync_report.test.js
@@ -1,4 +1,4 @@
-const { log, device, by, element } = require('detox');
+const { log, device, by, element, fail } = require('detox');
 
 import { loadTestWallet } from "./e2e-utils/loadTestWallet.js";
 
@@ -6,25 +6,27 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Renders Sync Report data (blocks & batches) correctly.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   it('When App go to background & back to foreground -> Report Screen: blocks & batches are aligned', async () => {
     //await sleep(4000);
 
-    await waitFor(element(by.id('header.drawmenu'))).toBeVisible().withTimeout(sync_timeout);
-    await element(by.id('header.drawmenu')).tap();
-    await waitFor(element(by.id('menu.syncreport'))).toBeVisible().withTimeout(sync_timeout);
-    await element(by.id('menu.syncreport')).tap();
+    // waiting for starting to sync and tap on play icon
+    await waitFor(element(by.id('header.playicon'))).toBeVisible().withTimeout(sync_timeout);
+    await element(by.id('header.playicon')).tap();
 
     // waiting for starting the sync process
     await waitFor(element(by.id('syncreport.currentbatch'))).toBeVisible().withTimeout(sync_timeout);
 
     // put the App in background
     await device.sendToHome();
-    // put the App to sleep because we need some progress in BS to reproduce the bug
-    await sleep(20000);
+    // put the App to sleep for a while
+    await sleep(5000);
     // put the App in foregroung again
     await device.launchApp({ newInstance: false });
-    await sleep(2000);
+    // we need some time to sync
+    await sleep(15000);
+
+    await element(by.id('syncreport.scroll-view')).scrollTo('bottom');
 
     // waiting for starting the sync process again
     await waitFor(element(by.id('syncreport.currentbatch'))).toBeVisible().withTimeout(sync_timeout);
@@ -35,18 +37,28 @@ describe('Renders Sync Report data (blocks & batches) correctly.', () => {
     const batchNum = Number(batches_attributes.text.split(':')[1].split('of')[0]);
     const batchesNum = Number(batches_attributes.text.split(':')[2]);
 
+    await waitFor(element(by.id('syncreport.syncednow'))).toBeVisible().withTimeout(sync_timeout);
+
     // getting blocks now synced from the screen
     const blockssyncednow = element(by.id('syncreport.syncednow'));
     const blockssyncednow_attributes = await blockssyncednow.getAttributes();
     const blockssyncednowNum = Number(blockssyncednow_attributes.text.split(' ')[0]);
 
+    await waitFor(element(by.id('syncreport.notyetsynced'))).toBeVisible().withTimeout(sync_timeout);
+
     // getting blocks not yet sync from the screen
     const blocksnotyetsynced = element(by.id('syncreport.notyetsynced'));
     const blocksnotyetsynced_attributes = await blocksnotyetsynced.getAttributes();
     const blocksnotyetsyncedNum = Number(blocksnotyetsynced_attributes.text.split(' ')[0]);
 
+    await waitFor(element(by.id('syncreport.wallettotalblocks'))).toBeVisible().withTimeout(sync_timeout);
+
     // calculating total blocks in this sync process
-    const blockstotalNum = blockssyncednowNum + blocksnotyetsyncedNum;
+    const blockstotal = element(by.id('syncreport.wallettotalblocks'));
+    const blockstotal_attributes = await blocksnotyetsynced.getAttributes();
+    const blockstotalNum = Number(blocksnotyetsynced_attributes.text.split(' ')[0]);
+
+    await waitFor(element(by.id('syncreport.blocksperbatch'))).toBeVisible().withTimeout(sync_timeout);
 
     // getting blocks per batch or batch size from the screen
     const batchsize = element(by.id('syncreport.blocksperbatch'));
@@ -64,11 +76,11 @@ describe('Renders Sync Report data (blocks & batches) correctly.', () => {
     // batch: 1  -> means blocks between 0 and 100
     // batch: 33 -> means blocks between 3200 and 3300
     if (blockssyncednowNum < (batchNum * batchsizeNum) - batchsizeNum || blockssyncednowNum > (batchNum * batchsizeNum)) {
-      fail('The synced blocks are not align with the synced batches');
+      throw new Error('The synced blocks are not align with the synced batches');
     }
     
     if (blockstotalNum < (batchesNum * batchsizeNum) - batchsizeNum || blockstotalNum > (batchesNum * batchsizeNum)) {
-      fail('The total blocks in this process are not align with the total of batches');
+      throw new Error('The total blocks in this process are not align with the total of batches');
     }
   });
 });
diff --git a/e2e/tex_send_address.test.js b/e2e/tex_send_address.test.js
index 7780b21ca..06d1b3ecc 100644
--- a/e2e/tex_send_address.test.js
+++ b/e2e/tex_send_address.test.js
@@ -5,7 +5,7 @@ import { loadRecipientWallet } from './e2e-utils/loadRecipientWallet.js';
 const sleep = ms => new Promise(r => setTimeout(r, ms));
 
 describe('Renders wallet data correctly.', () => {
-  it('loads a wallet', loadRecipientWallet());
+  it('loads a wallet', async () => await loadRecipientWallet());
   it('parses the TEX address and correctly renders the confirm screen', async () => {
     await waitFor(element(by.id('vt-1')))
       .toExist()
diff --git a/e2e/transaction_history.test.js b/e2e/transaction_history.test.js
index 067539c83..5446c88b8 100644
--- a/e2e/transaction_history.test.js
+++ b/e2e/transaction_history.test.js
@@ -6,7 +6,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 describe('Renders wallet data correctly.', () => {
   // i just pulled this seed out of thin air
-  it('loads a wallet', loadTestWallet);
+  it('loads a wallet', async () => await loadTestWallet());
   // there is a ValueTransfer in this plant at 1994580, 1 block after the "birthday". 
   it('synks 1 block and renders a ValueTransfer. this should take less than a minute, but will time out after 16 minutes', async () => {
     //await sleep(4000);