Add more diagnostics for failing test