Fixing one side of the problem. The other side is working ok :)
Refactored and fixed al the test cases until now... Time to start adding crazy tests. And of course long refactor comming ahead
Refactoring test file
Now everything working just a few more tests to say, challenge achieved