Merge "Add new test case for volume retype"