Fixing performance of test runner, particularly when rerunning tests