M/test fixes

is the logging by intent?