Clean up grid-tests