M: XmlParser: refactoring. +tests