Misc test fixes
Merge pull request #495 from owdqa/bug/mix_fixes

Misc test fixes