Moved functionality to MessageProcessor
Fixed Tests