Minor fixes for tests
Merge pull request #424 from owdqa/bug/OWD-422-Fix_defects

Minor fixes for tests