Added tests
Merge pull request #19 from vania-pooh/master

Added tests