Update routes
Finish some tests