Fix tests broken by bad rebase.