Adding tests
Merge pull request #26 from vladikoff/tests

Adding tests