Try to get testing more resilient
git issue #1 - better testing