Fix tests to work with modified route generation