EDP parser fixes and test file