Fixed OM unit tests, take 2