Adding grid tests