More unit tests + fix optionals in Xml provider

There was a typo in the XmlProvider in the place where we're using the dynamic operator: Option instead of Optional