Make more use of test suite in the runner