M/test fixes

and here