Implement further tests for grid