fix tests after OC changes