Make tests safer