Rename to group-with, add extra unit test