Content Views: Fixing existing tests
Merge pull request #3643 from daviddavis/temp/20140129102533

Content Views: Fixing existing tests