Removed mocks from unit tests