Added Message-class
Added the Message-class
removed surplus implementations
changed the construction of the messages
removed ununsed AbstractMessageContentFactory
renamed variable
fixed broken test