Added tests
Merge pull request #2 from MiroHibler/master

Added tests