Fix watch task
Fix module imports
Enable tests that now seem to pass in PhantomJS, newer version maybe?