Switched GenericInterface/Mapping/Simple.pm to OM.
Switch GenericInterface/Mapping/Test.pm to OM.