It turns out that the ordering of the fields in the <*ItemType> is important. Update the schema from <choice> to <sequence> to make the ordering matter, and allow the unit tests to enforce/check this.