More fixes to enable multiple runs in one test