Fixing tests (see #1093)
Merge pull request #1094 from ahocevar/master

Fixing tests (see #1093)