Fixed call in ElevatorTest and reduced code in advance()