separate passenger and passengerService, modify tests