BS-9870, fix XSD definition and add unit test