Merge "Use wrapper create_volume() in volume tests"