refactoring routes
add named helper for rout
fix tests