Fix tests broken by refactor in last commit.