updated version of Group, and JUnit testing