Added some unit tests
Merge pull request #4 from ZorGleH/master

Added some unit tests