refactor tests, implement more robust route tests