Added a few more tests to grid.