ODM mapping and a few more tests