Fixup logging.

Commit 718f967 broke logging, so that no log files would be produced.
This commit amends this issue.
Merge branch 'logfix'
Fix broken UT.
Merge branch 'utfix'