route & tests fixes