Watchlist Test and some more modifications