Unit test updates for CMS PR