revert ODM namespace & fix tests