Fix watch.coffee
Update for latest packages
Fix watch script
Add tests