Adding proper mocking for unit tests