Made the test more resilient