Test more stuff for content view. Small refactor