Fixing extended tests
Merge pull request #3830 from danmcp/master

Merged by openshift-bot