Update router, routeRule. Added tests for router