NOJIRA: Updated xml-mapping , test still fails, needs to be updated