Many changes in grid and further tests