More tests + revert previous refactoring (failing tests !)