More hardening of tests