refactor variables and ensure that *-test.xml files are created even if no problems found >> master