Improve runner to combine tests