Tweaked grunt file and fixed test