More test hardening