Add grids and test cases for grids