close #59 - Remove stubs and use mocks in the controller unit tests