Merged in debug improvement, debug is now passed on to the test execution