Fixed uuit tests
Merge pull request #38 from phmLabs/master

Fixed unit tests