simplifying the grid setup and tests