diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 79b54ba..266254f 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -93,29 +93,47 @@
     }
 
     private int getWidgetsScroll() {
-        return mLauncher.getTestInfo(
-                TestProtocol.REQUEST_WIDGETS_SCROLL_Y)
+        return mLauncher.getTestInfo(TestProtocol.REQUEST_WIDGETS_SCROLL_Y)
                 .getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
-    public Widget getWidget(String labelText) {
+    /**
+     * Gets the desired widget by first expanding the header using test package name
+     * and then picking the widget itself using widgetName
+     */
+    public Widget getWidget(String widgetName) {
+        return getWidget(widgetName, mLauncher.getContext().getPackageName());
+    }
+
+    /**
+     * Gets the desired widget by first expanding the header using widgetListHeaderTitle
+     * and then picking the widget itself using widgetName
+     */
+    public Widget getWidget(String widgetName, String widgetListHeaderTitle) {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
-                     "getting widget " + labelText + " in widgets list")) {
+                     "getting widget " + widgetName + " in widgets list")) {
             final UiObject2 searchBar = findSearchBar();
             final int searchBarHeight = searchBar.getVisibleBounds().height();
             final UiObject2 fullWidgetsPicker = verifyActiveContainer();
             mLauncher.assertTrue("Widgets container didn't become scrollable",
                     fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
 
-            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer();
+            final UiObject2 widgetsContainer =
+                    findTestAppWidgetsTableContainer(widgetListHeaderTitle);
+
             mLauncher.assertTrue("Can't locate widgets list for the test app: "
                             + mLauncher.getLauncherPackageName(),
                     widgetsContainer != null);
-            final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
+
+            final BySelector labelSelector =
+                    By.clazz("android.widget.TextView").text(widgetName);
+
             final BySelector previewSelector = By.res(mLauncher.getLauncherPackageName(),
-                    "widget_preview");
+                    "widget_preview_container");
+
             final int bottomGestureStartOnScreen = mLauncher.getBottomGestureStartOnScreen();
+
             int i = 0;
             for (; ; ) {
                 final Collection<UiObject2> tableRows = mLauncher.getChildren(widgetsContainer);
@@ -165,13 +183,13 @@
     }
 
     /** Finds the widgets list of this test app from the collapsed full widgets picker. */
-    private UiObject2 findTestAppWidgetsTableContainer() {
+    private UiObject2 findTestAppWidgetsTableContainer(String widgetListHeaderTitle) {
         final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_list_header");
         final BySelector widgetPickerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "container");
         final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
-                mLauncher.getContext().getPackageName());
+                widgetListHeaderTitle);
         final BySelector widgetsContainerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_table");