Engine: Fixing content view definition model tests, refs #3585
Merge pull request #3332 from daviddavis/engine-fix-cvd-test

Engine: Content View Definition model tests