Fixing retry bug
Merge pull request #114 from danmcp/master

Merged by openshift-bot
Removing os specific logic from tests
Merge pull request #115 from danmcp/master

Merged by openshift-bot