test runner global variables were set and some minor changes