fix failing unit tests on OC6

cc @PVince81 @DeepDiver1975