Update routes & tests