Revert "Fix all tests"

Need refactoring the code, not the etsts

This reverts commit 009f723a08f16c7375824f36104486e8eb4eca24.