Fixed unit tests
Merge pull request #345 from mremi/fix-unit-tests

Fixed unit tests