Improved GIS migration test cleanup; refs #23504.