refactor test
fix potential NPE
clarify log message
Merge pull request #1633 from jbertram/group-fix

Couple of fixes