grouper tests (more to come)
Merge remote-tracking branch 'origin/master'