Fix broken test and clean up formatting of message.