Some change in XML Converter + unit tests
unit test