Merge pull request #17184 from cpuguy83/fix_external_volume_tests

Fix bug in volume driver test implementation