Changes to unblock obsolete tests
Merge pull request #491 from owdqa/feature/unblock_tests

Changes to unblock obsolete tests