Merge branch 'file-watcher' into tests
Add tests for file-watcher