Routing works

not good . Fixed failed test also.