Changes to fix tests
Merge pull request #425 from owdqa/bug/fix_tests

Changes to fix tests