Make OPM test suite pass