Adding support for multiple runs in one test