More test sensitivity fixes.