fixes the MainViewTest
Merge branch 'origin/dev'