Fix test cases
Merge pull request #4537 from danmcp/master

Merged by openshift-bot