Keep message log
Fix failing tests