OAT-21

Group extension quality, unit tests