Merge "Add unit test for volume availability zone client"