Simplifying code
Updating test
Merge branch 'feature/server_router' of github.com:cleandart/clean_router into feature/server_router