Fix tests so they use the newer routes