M/test fixes

same here