Controller tests separation from base controller

- Added missing mocks for using base controller functionality in normal
controller's tests.