Fix tests to run on dirty simulator.