reverting parts of 8768b1 that caused broken XML
update integration test