Clean up

Cleaning up all the testing stuff for Grunt