Fix integration tests.
Message bufferizer - WIP