more scenarios in content views
fixed failures
Merge pull request #309 from hhovsepy/master

some refactorings and fixes