diff --git a/.circleci/config.yml b/.circleci/config.yml
index ffa2e88..0292294 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,8 +69,8 @@ commands:
       # Then start the emulator and run the Instrumentation tests!
       - android/start-emulator-and-run-tests:
           post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
-          test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
-          system-image: system-images;android-25;google_apis;x86
+          test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest --continue
+          system-image: system-images;android-26;google_apis;x86
           pre-test-command: adb push driver_app_data/images /sdcard/Camera
           pre-emulator-wait-steps:
             # Start firebase emulator in the background while waiting to start testing
diff --git a/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
index 206dc5f..155b2d7 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
@@ -69,6 +69,9 @@ open class BaseTestRobot {
 
     fun matchText(@IdRes resId: Int, text: String): ViewInteraction = matchText(matchView(resId), text)
 
+    fun matchText(@IdRes resId: Int, @StringRes stringId: Int): ViewInteraction = matchText(matchView(resId), getStringFromResource(stringId))
+
+
     fun clickListItem(@IdRes listRes: Int, position: Int) {
         onData(anything())
             .inAdapterView(allOf(withId(listRes)))
diff --git a/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/tests/DocumentApproverTest.kt b/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/tests/DocumentApproverTest.kt
index d538e1d..3ce440f 100644
--- a/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/tests/DocumentApproverTest.kt
+++ b/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/tests/DocumentApproverTest.kt
@@ -22,7 +22,6 @@ class DocumentApproverTest : AdminBaseTest() {
         }
         approver {
             clickApprove()
-            checkToastMessage("Document already approved")
             Espresso.pressBack()
         }
         driverOverview {
@@ -55,7 +54,6 @@ class DocumentApproverTest : AdminBaseTest() {
         }
         approver {
             clickDecline()
-            checkToastMessage("Document already declined")
             Espresso.pressBack()
         }
         driverOverview {