Engine: Fixing content view tests refs #3585
Merge pull request #3325 from daviddavis/temp/20131106092704

Engine: Fixing content view tests refs #3585