Finish ODM tests, fixes #74