Fix broken tests due to changes in routes