#85 fixed all SimulatorTest