Change in test mock mapper definition
Refactoring in logger