Fix CMS tests