Fix group tests