fix(route) working on fleshing out tests and refactoring structure