Decoupled xml management into new XmlManager class.  Created dependency Injection for XmlManager.  Reorganized Interfaces into separate namespace. Fixed majority of unit tests (still more to be evaluated for relevance with new design).