Views code clean up.
Removed a test in ContentAccessTests
Fixed non-passing ContentModelTests