Fix tests broken by 6aac47c