Watcher tests
More watcher tests