Moved logic for converting String <-> Message to separate class (+ smoke unit test)