Changes for multiple fixes
Merge pull request #472 from owdqa/bug/fix_public_tests

Changes for multiple fixes