Fix failing tests related to new grid.