Passenger can top up; wrote more tests