Cleanup DSL and add tests for Router.routes