Refactor test; adding a test with more messages