Merge "Add resource cleanup in volume snapshots tests"