test: fix style
test: use more explicit route path
Router: fix style
Router: add comments
Router: move handler checking inline
Router: support path+regex concat and fix regex params