Fix tests broken by #1565