Unreviewed, add extra test failure logging after r200971