Fix extended tests
Merge pull request #3894 from pmorie/dev/fix-tests

Merged by openshift-bot