TRUNK-3569: Unit test with Mock Message Service