Improve test
Rename file
Update dependencies
Improve watcher