Logging changes and unit tests

No match.