Change signatures and fix tests
fix tests
Merge pull request #3 from fedesilva/add-tests

Change signatures and fix tests