Routes Refactor; Increase code coverage

- Refactor of routes to nested routes 
- Add missing tests (in progress)