Fix unit tests that broke with the watcher changes