Channel view tests and a little test helper rearranging.
Merge branch 'develop-frontend' into feature/issue-423-channel-view-tests