Refactor for test run re-use