refactor(routing): Cleaned up routing and updated tests, release 1.1.5