CMS notification refactor and testing