Merge "Add test coverage for volume types"