This refactoring allowed to correct several bugs.
TODO: non-blocking I/O
TODO: other tests for the next part of the TP