Fixed watchlist tests

Change-Id: I5e7f244dad317959104ddf0f6b56297990e113ab
Feature: Manage Watchlist
Bug: 46922
Merge "Fixed watchlist tests"