Refactors the group specs
Pending a sporadically, failing test