FLUID-4907: added messages to builder

Added the construction of the messages grade to the builder. Expanded test coverage for this.