Fixing tests
Merge pull request #524 from emorency/master

Fixing tests