Updated simulator to use in specs