revert ODM namespace & fix tests
Merge pull request #14 from iampersistent/master

revert ODM namespace & fix tests