Fixing the diagnostic tests