Bug 1008481 - More test diagnostics. r=me