xml namespaces & unit tests fixed