On message, first tests
Refactor put message processing