More fixes after refactor
Merge pull request #329 from owdqa/feature/OWD-33103-Refactor_Utils

More fixes after refactor