diff --git a/app/src/androidTest/java/com/alphawallet/app/TransferTest.java b/app/src/androidTest/java/com/alphawallet/app/AATransferTest.java
similarity index 95%
rename from app/src/androidTest/java/com/alphawallet/app/TransferTest.java
rename to app/src/androidTest/java/com/alphawallet/app/AATransferTest.java
index 15efc458e7..53e6eb4c5c 100644
--- a/app/src/androidTest/java/com/alphawallet/app/TransferTest.java
+++ b/app/src/androidTest/java/com/alphawallet/app/AATransferTest.java
@@ -15,13 +15,14 @@
 import android.os.Build;
 
 import com.alphawallet.app.util.Helper;
+import static androidx.test.espresso.Espresso.pressBack;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class TransferTest extends BaseE2ETest
+public class AATransferTest extends BaseE2ETest
 {
     // On CI server, run tests on different API levels concurrently may cause failure: Replacement transaction underpriced.
     // Use different wallet to transfer token from can avoid this error
@@ -62,6 +63,7 @@ public void should_transfer_from_an_account_to_another()
 
         sendBalanceTo("GETH", "0.001", newWalletAddress);
         ensureTransactionConfirmed();
+        pressBack();
         switchToWallet(newWalletAddress);
         assertBalanceIs("0.001");
     }
diff --git a/app/src/androidTest/java/com/alphawallet/app/AAATokenScriptCertificateTest.java b/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java
similarity index 98%
rename from app/src/androidTest/java/com/alphawallet/app/AAATokenScriptCertificateTest.java
rename to app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java
index d1814a020d..2c2412346d 100644
--- a/app/src/androidTest/java/com/alphawallet/app/AAATokenScriptCertificateTest.java
+++ b/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java
@@ -39,7 +39,7 @@
 /**
  * Created by JB on 1/09/2022.
  */
-public class AAATokenScriptCertificateTest extends BaseE2ETest
+public class TokenScriptCertificateTest extends BaseE2ETest
 {
     private String doorContractAddress;
     private final String contractOwnerPk = "0x69c22d654be7fe75e31fbe26cb56c93ec91144fab67cb71529c8081971635069";
@@ -58,7 +58,7 @@ public class AAATokenScriptCertificateTest extends BaseE2ETest
         }
     };
 
-    public AAATokenScriptCertificateTest()
+    public TokenScriptCertificateTest()
     {
         int apiLevel = Build.VERSION.SDK_INT;
         String[] array = WALLETS_ON_GANACHE.get(String.valueOf(apiLevel));
diff --git a/app/src/androidTest/java/com/alphawallet/app/AATransferERC20Test.java b/app/src/androidTest/java/com/alphawallet/app/TransferERC20Test.java
similarity index 98%
rename from app/src/androidTest/java/com/alphawallet/app/AATransferERC20Test.java
rename to app/src/androidTest/java/com/alphawallet/app/TransferERC20Test.java
index a15cf94fad..dc65ac75e6 100644
--- a/app/src/androidTest/java/com/alphawallet/app/AATransferERC20Test.java
+++ b/app/src/androidTest/java/com/alphawallet/app/TransferERC20Test.java
@@ -31,7 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class AATransferERC20Test extends BaseE2ETest
+public class TransferERC20Test extends BaseE2ETest
 {
     private String contractAddress;
     private final String contractOwnerPk = "0x69c22d654be7fe75e31fbe26cb56c93ec91144fab67cb71529c8081971635069";
diff --git a/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java b/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java
index 55747bda91..96ad8a1c5a 100644
--- a/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java
+++ b/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java
@@ -140,6 +140,7 @@ public static void assertBalanceIs(String balanceStr)
 
     public static void ensureTransactionConfirmed()
     {
+        Helper.wait(6);
 //        onView(withText(R.string.rate_no_thanks)).perform(click());
         // now this view goes straight to activity pane
         shouldSee("Activity");