Tests for Directory Watcher; changes to WatchRunners