Tests updated and route fixes