updated Router
fixed tests