Fixed OM unit tests