fix routes, work on tests