Simplify the logic
Rewrite tests
0.3.0