diff --git a/app/build.gradle b/app/build.gradle
index f78d18f..a1cab9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     / * Android Espresso */
     def testJunitVersion = "1.1.5"
     def testRunnerVersion = "1.5.2"
-    def espressoVersion = "3.5.1"
+    def espressoVersion = "3.5.0"
     androidTestImplementation "androidx.test.ext:junit:$testJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$espressoVersion"
diff --git a/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt b/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt
index 3ae0df5..3204a87 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt
@@ -27,7 +27,6 @@ open class FirebaseTest<T : BaseActivity<*>>(
         @JvmStatic
         @BeforeClass
         fun setupFirebase() {
-//            val localHost = if (BuildConfig.LocalState)  "10.0.2.2" else "127.0.0.53"
             val localHost = "10.0.2.2"
 
             FirebaseAuth.getInstance().useEmulator(localHost, 9099)
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt
index 4b77a23..62e41c3 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt
@@ -18,15 +18,10 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class RegisteredUserAuthenticationActivityTest : FirebaseTest<LoginActivity>(LoginActivity::class.java, registered = true, signedIn = false) {
 
-    @Before
-    fun waitForSplashScreen() {
-        waitFor(100)
-    }
-
     @Test
     fun verifyUserLogin_validUsernameAndPassword_loggedIn() {
         login {
-            println("lets get the email = ${getEmail()}")
+            waitFor(100)
             setEmail(getEmail())
             setPassword(USER_PASSWORD)
             clickLogin()
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt
index ddc7d76..5f15ef4 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt
@@ -18,14 +18,10 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class UserAuthenticationActivityTest : FirebaseTest<LoginActivity>(LoginActivity::class.java) {
 
-    @Before
-    fun waitForSplashScreen() {
-        waitFor(100)
-    }
-
     @Test
     fun verifyUserRegistration_validUsernameAndPassword_loggedIn() {
         login {
+            waitFor(100)
             clickRegister()
         }
         register {