Add routes
Add tests
Linting fixes