Fix Unit test failures
Merge pull request #33 from BoykoAlex/master

Fix Unit test failures