Merge "Improve tests for test_volume_basic_crud.py"