Merge "Fix volume XML tests"