Fix test
fix router