Fix tests after last commit
Merge pull request #388 from eile/master

Fix tests after last commit