Adding more unit tests
Merge pull request #67 from gtrifonov/dev

Adding more unit tests