Fixed the use of mocks in preperation to integrate with the capapp