update tests for new BaseView
Merge branch 'master' into bullsfirst-changes