ClientTestRunner improved