Fixed group unit tests