XmlAdapter now passes all current unit tests