ODM parser and test case update due to recent update of equivGen/Load