Improvement for test runners