Merge "Fix test_volumes_get volumes cleanup."