Fixed dianostic tests