Fix tests broken by previous commit