Merge pull request #488 from hhovsepy/master

fixed failing tests, removed unnecessary code