Fix test by ensuring we close the watcher