Improve the generation of Junit XML tests