Reordered grunt tasks
Fix taint testing