Switch to a custom logger (having problems with the other one)

Implemented upstream

More tests