Merge grid_cell_test