Adjust tests for utils refactor
Merge pull request #377 from owdqa/OWD-33103-Refactor_Utils

Adjust tests for utils refactor