fix UnitTests
Merge pull request #507 from olga-jane/UnitTests

fix UnitTests