MO class test fixes