wip
fix tests
Merge pull request #3 from carlos8f/overhaul

Overhaul