Updated grid and tests