Test fixes for messages.