Merge "Fix "Incorrect watchlist token provided" unit test errors"