Fix and test watcher