Passing unit tests

:smile:
The bottom line: the less changes we do during the refactor the easier will be the testing...