Merge "Improve isolatedZVolume test"