More resilient tests (again)