Fixed test
Added XmlElementWrapper to all lists