Add group, covers tags and more tests