Fix routing and test suite