Merge "Use common function create_volume to create test volume"