Fixing the MessagingTest again, hopefully