wrote test for json output, renamed user to group in group test
Merge remote-tracking branch 'origin/master'