[cleanup] added missing assertions, cleaned up test and helper methods
Merge pull request #54 from tkrille/OSNG-239

[cleanup] added missing assertions, cleaned up test and helper methods