PER-107: small cleanup in message mocks