Refactor approach to mock view/controller
Restructure tests