RHC tests fixes
Merge pull request #46 from kraman/f18_fixes

Merged by openshift-bot