Route service

- Fixing unit tests
- Finishing route query
- Refactor