Wrap the logging
Improve the test