More tests
Merge pull request #3 from egelmex/master

More tests