added group model and removed unnecessary pending tests
fixed merge conflict with factories