test case improvements
Merge pull request #4131 from danmcp/master

Merged by openshift-bot