Work on grunt.js and tests