few router tests and fixes