RideMatchMaker fix, tests issues