Fix unit tests (OMS-497)