Minor cleanups in grid_test demo