Added diagnostic output to two junits that commonly fail on me.