feature
fix-tests-stricter-xml
