Merge "Fix test_volume_services testcase"