After a lot of refactoring, the code is cooling down :

unit tests:
757 tests, 2349 assertions, 0 failures, 0 errors