More fixed tests
Merge pull request #380 from owdqa/feature/OWD-33103-Refactor_Utils

More fixed tests