Introduced TypedMessageBuilder (#1683)

* Introduced TypedMessageBuilder

* Converted parts of the tests to use TypedMessageBuilder

* Fixed tests
2 files changed