Further bug fixes for test_delete_volume_with_dependent_snapshot