Cleanup of grunt tasks, tests integrated. (rev1)