Fixed unit tests
Merge pull request #596 from bvssvni/master

Fixed unit tests