Do not double encode XML entity

[Crypt0-M3lon]

XML Entity are wrongly double encoded when generating XML, the proposed fix create a valid XML entity and to not re-encode special char (&). I also fixed tests that created a malformed entity within XML value.