Fixed failing tests (OMS-631)