DnD tests: fix xml problems, pylint checks