Fix tests broken by integration commits.