Fixed content-view tests

Covering issues: #853 and #852