Merge "Fix broken volume tests"