Rework mocking approach for better unit testing