more tweaks for diagnostic tests