fixed failing test
fixed failing tests
Merge pull request #628 from hhovsepy/master

fixed failing tests