test and Group.php fixes