Add tests for watcher