Fix unit tests
Logging