Reference group name rather than group itself [MJ-426]

This solves the issue with referencing groups before they exist in exchange for possibly doing a few more database hits.

All tests pass and I can successfully recreate my local database.