Fixed CMS tests