Fixed testers not exiting correctly - regression from 0913cae149e3268ab433c969303eeea251551fef