Merge "OFP test adjustments"