Update the ODM Adapter and test case to remove EquivGen/Load