Getting singleton tests in the right place
Merge pull request #102 from danmcp/master

Merged by openshift-bot
test case improvements
Merge pull request #103 from danmcp/master

Merged by openshift-bot