Corrected grunt tasks and tests