Fixed some watcher tests. All tests are passing