Better test-mode diagnostics.