Several test fixes
Merge pull request #492 from owdqa/bug/misc_fixes

Several test fixes