Fixes failing CMS acceptance tests