Add grp tests