Fix router tests