Merge "Refactor test_volume_backup due to leftovers"