Cleanup grunt file + tests