fix tests after OC changes
Merge remote-tracking branch 'origin/release'