added more tests to improve coverage
Merge pull request #3272 from lnader/master

Merged by openshift-bot