Merge "Edit tests to adjust with changes in libxml2 upgrade" into main