Modified and test watcher @ various