Updated unittests for xml