Merge "Make assertions of log messages better"