fixed failing tests
Merge pull request #350 from hhovsepy/master

fixed failing tests