Fixed OAM unit tests