More test fixes (see #1093)
Merge pull request #1095 from ahocevar/master

More test fixes (see #1093)