added xmlunit
code cleanup