o Fixed OAM unit tests