Unit test robustness fix
Merge pull request #34 from BoykoAlex/master

Unit test robustness fix