Merge pull request #8 from itavero/unit-tests

Improved unit tests