Broke up grants into their own tests