Fixing tests.
Merge pull request #265 from okin/master

Fixing failing tests