Added test cases for watcher