rework watcher tests