extra commits on Jaxb branch -> fix build issue + extra tests