Merge "Fixes volume client in volume tests"