diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index b011e6181d..8be03fb467 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -74,7 +74,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             selectFolder("Desktop Bookmarks")
@@ -112,7 +112,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             verifyBookmarkedURL(defaultWebPage.url.toString())
@@ -126,7 +126,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             clickAddFolderButton()
@@ -159,7 +159,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickEdit {
@@ -185,7 +185,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickCopy {
@@ -202,7 +202,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickShare {
@@ -222,7 +222,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInNewTab {
@@ -241,7 +241,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInPrivateTab {
@@ -260,7 +260,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
             IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
@@ -279,13 +279,17 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
+            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
         }.clickDelete {
             verifyUndoDeleteSnackBarButton()
             clickUndoDeleteButton()
             verifySnackBarHidden()
+            bookmarksListIdlingResource =
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
+            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
             verifyBookmarkedURL(defaultWebPage.url.toString())
         }
     }
@@ -299,7 +303,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             longTapSelectItem(defaultWebPage.url)
@@ -329,7 +333,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             longTapSelectItem(defaultWebPage.url)
@@ -352,7 +356,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             longTapSelectItem(defaultWebPage.url)
@@ -377,7 +381,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             longTapSelectItem(firstWebPage.url)
@@ -404,7 +408,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
 
             longTapSelectItem(defaultWebPage.url)
@@ -460,7 +464,7 @@ class BookmarksTest {
         }.openThreeDotMenu {
         }.openBookmarks {
             bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
             IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
index ea6f88a165..8267e85be9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -84,7 +84,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             verifyHistoryMenuView()
             verifyVisitedTimeTitle()
@@ -104,7 +104,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickCopy {
@@ -123,7 +123,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickShare {
@@ -145,7 +145,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickOpenInNormalTab {
@@ -166,7 +166,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickOpenInPrivateTab {
@@ -187,7 +187,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
             IdlingRegistry.getInstance().unregister(historyListIdlingResource!!)
@@ -208,7 +208,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             clickDeleteHistoryButton()
             IdlingRegistry.getInstance().unregister(historyListIdlingResource!!)
@@ -230,7 +230,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             longTapSelectItem(firstWebPage.url)
         }
@@ -260,7 +260,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             longTapSelectItem(firstWebPage.url)
             openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
@@ -284,7 +284,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             longTapSelectItem(firstWebPage.url)
             openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
@@ -311,7 +311,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 2)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             longTapSelectItem(firstWebPage.url)
             longTapSelectItem(secondWebPage.url)
@@ -339,7 +339,7 @@ class HistoryTest {
         }.openHistory {
             verifyHistoryListExists()
             historyListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list))
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1)
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
             longTapSelectItem(firstWebPage.url)
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
index b21e7044e7..5345f38cb1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
@@ -10,7 +10,6 @@ import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.FenixApplication
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 772e7765f3..97ca48e725 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -296,7 +296,7 @@ class SmokeTest {
             searchSuggestionsIdlingResource =
                 RecyclerViewIdlingResource(awesomeBarView as RecyclerView, 1)
             IdlingRegistry.getInstance().register(searchSuggestionsIdlingResource!!)
-            verifySearchSuggestionsAreMoreThan(1)
+            verifySearchSuggestionsAreMoreThan(0)
             IdlingRegistry.getInstance().unregister(searchSuggestionsIdlingResource!!)
         }.goBack {
         }.openThreeDotMenu {