organization_id X organization.id and minor test fix/workaround