Fixing tests
Merge pull request #552 from danmcp/master

Merged by openshift-bot