Added tests for Util classes.
Slowly adding more Tests and cleaning up the JAXB classes.