Updating tests and file watcher code