Improve unit testing and functionality of the XML Handler class and adding tests to make functionality work