Fix to XSD assert on matching methods and added/enabled corresponding tests