Change some logging to be more useful to analyzing test results