Fixed bug in XML parsing regexes
Fixed tests to work with new definition of recode method