Merge "Fix DeprecationWarning in test_volume_pools.py"