fixed tests
Merge branch 'with-watch-fs'