Refactored mocking, by checking Winfred his branch