Test: Add more diagnostics