Added grid tests