Remove initial group creation and add  unit tests