Updated classes to use JDOM 2
Fixed tests
Formatted code