Trying to fix intermittently stuck unit tests