Add GRG(S) tests and improve existing GRG tests