Fix tests broken by the last commit