Merge "Correct policy names for volume metadata tests"