some mo test fixes