Since this is specific to running tests, can you add this as an option to `run-tests` and `test` simulator to how `freshSimulator` is done ?  I'm trying to limit the stuff in `Options` to only things that apply to everything.