Added test_grid