Merge "Add assertions to attached volume retype test"