Fixed unittests
Merge pull request #5 from jaytaph/ut

Fixed unittests