More test fixes
Merge pull request #396 from ovatsus/master

More test fixes