Adding tests for MessageBuilder and related enhancements