Fix unit-tests for the new messages displayed in the UI