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

Merged by openshift-bot