I suggest getting in touch with your local Optimizely office so a Customer Sucess Manager can discuss your requirements:
If customers buy commerce they automatically get CMS or they can buy CMS on their own. Should be noted the cloud offering (DXP) is not sold based on server licences any more but on consumption instead.
Old A/B testing is a free add on.
The current plans are
Content Cloud (Old CMS)
Content Commerce (E-Commerce)
Intelligence Cloud (Old A/B Testing?)
Im guessing just like before, having Content cloud and Content commerce requires 2 licenses, no matter on 1 or 2 servers? Or does IC also require a license file now?
Or has there been any updates to licenses with the cloud changes?