Rewrite the test using group_commands.

Rewrite the test using group_commands so not only is it easier to read,
it's easier to work with in the long-term.