Merge "Increase coverage for volume metadata tests"