Really remove that file (silly Idea)
Make tests more resilient.