Improved test diagnostics.