Update Gruntfile to better work with test suite