Fix typos in some failed unit test messages and improve message layout