Allow tests to run on 1.9.3p484
Remove double escaping of ampersand in XML