Added some message testing