Refactor tests
Add route and helper tests