Come back to a good point

Signed-off-by: Fabien Crassat <fabien@crassat.com>
Revert "fix unit tests"

This reverts commit f7fc78f15e24ed256c958324cc8153b822e03fc2.
Revert "review codes"

This reverts commit 6de3c99860f4342eea4126fb6df1732e819f2197.
Revert "Review some long methods"

This reverts commit 06489a8405b0bb64a4c72f574dbd84e62e05bbf8.