Merge pull request #5312 from danmcp/master

Merged by openshift-bot
Adding test cases