Various fixes for issues found while developing integration tests (OMS-167)
Merge pull request #24 from opennode/oms-167

Various fixes for issues found while developing integration tests (OMS-1...