Fix watcher test