Fix tests on J7.  Seems to be a code generation problem with latest JAXB