Multiple test fixes
Change for pull request
Merge pull request #485 from owdqa/bug/fix_public_tests

Multiple test fixes