Addng some tests
Merge pull request #2 from egelmex/master

Tests.