Merge "fix test_compute_with_volumes"