Fix tests broken by new schema.