Safer tests