Adding test coverage
Merge pull request #5304 from danmcp/master

Merged by openshift-bot