Merge pull request #202 from opennode/oms-531

Oms 531
Merge remote-tracking branch 'origin/master'
Cleanup debugging code modifications + improve tests (OMS-531)