Updated routing, tests