Added more tests for messaging system