Fixing Gruntfile, make tests pass