Added tests
Merge pull request #7 from mateoi/mateo

Added tests