Fixed Watchlist tests

Bug: 46922
Change-Id: Id353d9014ba9fdc33d08da5db1eb8c941391b972