Always use _underscore variables and unset them all to not conflict with runtest.bat

2 files changed