Fix UTs
Merge pull request #452 from ovatsus/master

Fix UTs