Merge "Add volume cleanup to test_volume_transfer test"