Make test cleanup less sensitive to skipped tests
Make test cleanup less sensitive to skipped tests

kapadia/rasterio,brendan-ward/rasterio,kapadia/rasterio,brendan-ward/rasterio,kapadia/rasterio,brendan-ward/rasterio