Added extra test diagnoses