Various tests and other updates for Grunt build file