Reformatting
Added more tests for groups