Diagnosis test fixes.