fixed broken tests related to xml structure change