Updated to include JUnit for xml parsing
Cleanup import statements
Cleanup import statements