Fixed unit tests
Merge pull request #2 from zunkree/unittest

Fixed unit tests