Merge "Add test cases for volume-transfer"