Ported class tests to MO list