tests fixed
XML format refactored