updated message tests, as per discussion.