Added some grid tests