Replace xml-escape
Add tests for xml-escaping