[bug fix] Partial fix -- 2 messages OK.

So added tests for 4 messages. That's not OK.