Fix for extended tests and thresholds