Adding Test and support for multiple messages