writing controller tests for groups and settlements
Merge branch 'master' into chris