Unbreak acceptance tests in the cms.

Acceptance tests pass in cms and lms.