Add routes and route tests