Modifications to fix tests
Merge pull request #423 from owdqa/bug/OWD-422-Fix_defects

Modifications to fix tests