rewrite test spec code in terms of groups
2 files changed