Added routing tests and pass all