Fixed unittest that was dependent on map sorting.
Fixed unittest that was depending on Set-ordering in JAXB exception.