fixed failing test from issue 269
fixed failing tests
Merge pull request #281 from hhovsepy/master

fixed failing tests