Add `save`s in to fix failing CMS tests