*8888* Fix functional tests for OMP master