Fix OPM tests