changed router unit tests+ some fixes