Fix up the grunt tasks, and add some for testing…