fix(tests): Fix watcher tests