Fixed watcher and test