Adding unit tests for watcher