Fixing the tests now I've fiddled with the routing