- Added more lib/router tests
- Fixed broken unit tests