Use baseClass instead of full alias for the mock
Make sure the mocked objects are really mocks
Merge pull request #5212 from berrygoudswaard/fix-controller-mock

Fix controller mock