Major refactoring & bugfixing

+ tests refactoring and increase in complexity
version 0.0.4