Fix some applications
Changes to fix some tests
Changes from Pull request 324
Merge pull request #324 from owdqa/feature/OWD-33103-Refactor_Utils

Fix some applications