Attempting to make unit tests more resilient