Add tests for uncovered FileWatcher code