Merge "Add tests for ApiQueryWatchlist"