refactor mocking
remove whole load of console logs