Small changes.
First error free (part core) refactoring result (combining messages with
process steps)
BaseMessageTest is working now