M/test fixes

getClass().getName() is evaluated all the time :(