fix router and route
fix router test