added back the router, it is need, tests need to be adjusted in orer to pass