Add group/1 and tests