Improve routers test coverage